From d8de04ade9366cb8b60a9767c3d370faab11818c Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Sun, 16 Mar 2025 12:25:05 +0800 Subject: [PATCH] update serahan online, lelong dan keseluruhan --- app/Http/Controllers/KhazanahController.php | 4 +++- .../laporan/pendahuluanserahan.blade.php | 19 ++++++++++++++++--- .../laporan_pendahuluanserahan.blade.php | 15 ++++++++++++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ad081f8..8cba09c 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3065,7 +3065,9 @@ class KhazanahController extends Controller $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - return view('print.laporan_pendahuluanserahan', compact('pendser','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + $jenisLaporan = $request->radpendser; + + return view('print.laporan_pendahuluanserahan', compact('pendser','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url','jenisLaporan')); } public function laporanDenominasi() diff --git a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php index 2f02b2c..6d874fb 100644 --- a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php +++ b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php @@ -96,11 +96,24 @@ - +
+
+ + +
+
+

-
+ {{--
@@ -114,7 +127,7 @@ Serahan-Online
-
+
--}} diff --git a/resources/views/print/laporan_pendahuluanserahan.blade.php b/resources/views/print/laporan_pendahuluanserahan.blade.php index 6448688..412e509 100644 --- a/resources/views/print/laporan_pendahuluanserahan.blade.php +++ b/resources/views/print/laporan_pendahuluanserahan.blade.php @@ -169,10 +169,23 @@ --}}
+@php +$reportNames = [ + 'serahan' => 'LAPORAN SERAHAN HQ', + 'pendahuluan' => 'LAPORAN PENDAHULUAN HQ', + 'online' => 'LAPORAN SERAHAN ONLINE HQ', + 'serahanlelong' => 'LAPORAN SERAHAN LELONG HQ', + 'serahanonline' => 'LAPORAN SERAHAN DAN SERAHAN ONLINE HQ', + 'all' => 'LAPORAN KESELURUHAN HQ' +]; + +$displayJenisLaporan = $reportNames[$jenisLaporan] ?? 'Laporan Tidak Diketahui'; +@endphp - + {{-- --}} +
LAPORAN PENDAHULUAN/SERAHAN HQLAPORAN PENDAHULUAN/SERAHAN HQ{{ $displayJenisLaporan }} (arOSv2)