From 10b5a6c96c24a77c2d0a83281cde2820be9cef2b Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 30 Sep 2025 17:06:30 +0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(persetujuan-penawaran):=20Tambah=20fi?= =?UTF-8?q?tur=20tampilan=20file=20dan=20perbaiki=20logika=20persetujuan?= =?UTF-8?q?=20penawaran?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Menambahkan auto-fill nominal_bayar dengan nilai biaya_final pada create persetujuan - Memperbaiki query datatables dengan filter status penawaran lebih spesifik - Menambahkan whereHas untuk memastikan hanya status 'persetujuan-penawaran' yang ditampilkan - Menambahkan preview file upload (persetujuan_penawaran, surat_representasi, bukti_bayar) - Menggunakan Storage::url() untuk generate URL file dengan keamanan optimal - Menambahkan ikon eye dan badge untuk tampilan preview file - Memperbaiki fallback nominal_bayar agar otomatis menggunakan biaya_final - Merapikan struktur HTML dan urutan class Tailwind CSS di index dan form blade - Mengoptimalkan AJAX request structure dan error handling agar lebih stabil --- .../PersetujuanPenawaranController.php | 15 +- .../persetujuan_penawaran/form.blade.php | 33 +- .../persetujuan_penawaran/index.blade.php | 333 +++++++++--------- 3 files changed, 214 insertions(+), 167 deletions(-) diff --git a/app/Http/Controllers/PersetujuanPenawaranController.php b/app/Http/Controllers/PersetujuanPenawaranController.php index 3838167..271697d 100644 --- a/app/Http/Controllers/PersetujuanPenawaranController.php +++ b/app/Http/Controllers/PersetujuanPenawaranController.php @@ -40,6 +40,7 @@ $validated = $request->validated(); $validated['created_by'] = Auth::id(); $validated['status'] = '0'; + $validated['nominal_bayar'] = $validated['biaya_final']; $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate( ['penawaran_id' => $validated['penawaran_id']], @@ -71,7 +72,7 @@ // Save NOC try { - $noc = Noc::updateOrCreate([ + Noc::updateOrCreate([ 'permohonan_id' => $persetujuanPenawaran->permohonan_id, 'persetujuan_penawaran_id' => $persetujuanPenawaran->id ],[ @@ -179,8 +180,8 @@ public function edit($id) { $permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id); - - return view('lpj::persetujuan_penawaran.form', compact('permohonan')); + $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first(); + return view('lpj::persetujuan_penawaran.form', compact('permohonan', 'persetujuanPenawaran')); } /** @@ -201,8 +202,12 @@ } // Retrieve data from the database - $query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']); - + //$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']); + $query = Permohonan::query() + ->where(['status' => 'persetujuan-penawaran']) + ->whereHas('penawaranTender', function ($q) { + $q->where('status', 'persetujuan-penawaran'); + }); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); diff --git a/resources/views/persetujuan_penawaran/form.blade.php b/resources/views/persetujuan_penawaran/form.blade.php index 2666607..79fd23c 100644 --- a/resources/views/persetujuan_penawaran/form.blade.php +++ b/resources/views/persetujuan_penawaran/form.blade.php @@ -60,6 +60,17 @@ + + @if (isset($persetujuanPenawaran->file_persetujuan_penawaran) && + !empty($persetujuanPenawaran->file_persetujuan_penawaran)) +
+ + Lihat File + +
+ @endif + @error('file_persetujuan_penawaran') {{ $message }} @enderror @@ -74,6 +85,16 @@ + + @if (isset($persetujuanPenawaran->surat_representasi) && !empty($persetujuanPenawaran->surat_representasi)) +
+ + Lihat File + +
+ @endif + @error('surat_representasi') {{ $message }} @enderror @@ -87,7 +108,7 @@
@error('nominal_bayar') {{ $message }} @@ -103,6 +124,16 @@ + + @if (isset($persetujuanPenawaran->bukti_bayar) && !empty($persetujuanPenawaran->bukti_bayar)) +
+ + Lihat File + +
+ @endif + @error('bukti_bayar') {{ $message }} @enderror diff --git a/resources/views/persetujuan_penawaran/index.blade.php b/resources/views/persetujuan_penawaran/index.blade.php index 3c15f74..95118a7 100644 --- a/resources/views/persetujuan_penawaran/index.blade.php +++ b/resources/views/persetujuan_penawaran/index.blade.php @@ -5,9 +5,11 @@ @endsection @section('content') -
-
-
+
+
+

Daftar Persetujuan Penawaran KJPP

@@ -27,57 +29,58 @@
- +
- - - - - - - - - - - - + + + + + + + + + + + +
- - - Nomor Registrasi - - - Nama Debitur - - - Nomor Proposal - - - Tanggal Proposal - - - Dokumen Persetujuan - - - Biaya Final - - - Nominal Bayar - - - Catatan - - Action
+ + + Nomor Registrasi + + + Nama Debitur + + + Nomor Proposal + + + Tanggal Proposal + + + Dokumen Persetujuan + + + Biaya Final + + + Nominal Bayar + + + Catatan + + Action
-
+ class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm"> +
Show - per + per page
-
+
@@ -85,135 +88,143 @@
- @endsection + @endsection - @push('scripts') - - $.ajax(`persetujuan-penawaran/${data}`, { - type: 'GET', - data: {'status': 'tender'} - }).then((response) => { - swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang', 'success').then(() => { - window.location.reload(); - }); - }).catch((error) => { - console.error('Error:', error); - Swal.fire('Error!', 'An error occurred while deleting the file.', 'error'); - }); - } - }) - } - + + let dataTable = new KTDataTable(element, dataTableOptions); + // Custom search functionality + searchInput.addEventListener('input', function() { + const searchValue = this.value.trim(); + dataTable.search(searchValue, true); + }); + @endpush