diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index da0a192..6194a90 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -24,7 +24,8 @@ public function pembayaran() { $persetujuanPenawarans = PersetujuanPenawaran::all(); - return view('lpj::noc.pembayaran', compact('persetujuanPenawarans')); + $jenisPenilaians = JenisPenilaian::get(); + return view('lpj::noc.pembayaran', compact('persetujuanPenawarans', 'jenisPenilaians')); } public function penyelesaian() @@ -239,7 +240,8 @@ if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { - $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%'); }); } @@ -285,6 +287,7 @@ 'nominal_diterima' => currencyFormat( $persetujuanPenawaran->noc->nominal_bayar ?? 0, ), + 'jenis_penilaian' => $persetujuanPenawaran->permohonan?->jenisPenilaian?->name ?? "", 'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null, 'bukti_bayar' => $persetujuanPenawaran->bukti_bayar ?? null, 'updated_at' => dateFormat($persetujuanPenawaran->updated_at, true), diff --git a/resources/views/noc/pembayaran.blade.php b/resources/views/noc/pembayaran.blade.php index 7796b6a..b792dd2 100644 --- a/resources/views/noc/pembayaran.blade.php +++ b/resources/views/noc/pembayaran.blade.php @@ -19,6 +19,14 @@
+
+ +
Export to Excel
@@ -51,6 +59,10 @@ Cabang + + Jenis Penilaian + + Tanggal KSL @@ -120,6 +132,7 @@ @endpush