From f95bdf1214753a2478a6ec38898d34476aaf25e4 Mon Sep 17 00:00:00 2001 From: nurafrinaalimi16 Date: Sun, 27 Sep 2026 16:55:12 +0800 Subject: [PATCH] fix: papar cara terima pada senarai dan cetakan SAG hanya apabila pembiayaan online aktif --- app/Http/Controllers/GadaianController.php | 6 +++++- app/Http/Controllers/PembiayaanOnlineController.php | 6 +++++- resources/views/customers/v2/info.blade.php | 10 ++++++++-- resources/views/print/sag_ujrah_3.blade.php | 2 ++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 95423895..128855f2 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -680,7 +680,11 @@ class GadaianController extends Controller $kuantiti = $gadai_detail['pinjaman'] / $komoditi['nilai']; if ($gadai_detail['tagbaru'] == 1) { - return view('print.sag_ujrah_3', compact('komoditi', 'product', 'kuantiti', 'gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kadar_ujrah', 'kakitangan')); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')]) + ->get($api_url . '/api/cawangan/' . $kodcaw)->json(); + $pembiayaanOnlineEnabled = !empty(($cawangan_info['features'] ?? [])['pembiayaan_online']); + + return view('print.sag_ujrah_3', compact('komoditi', 'product', 'kuantiti', 'gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kadar_ujrah', 'kakitangan'))->with('pembiayaanOnlineEnabled', $pembiayaanOnlineEnabled); } else { return view('print.sag', compact('gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kakitangan')); } diff --git a/app/Http/Controllers/PembiayaanOnlineController.php b/app/Http/Controllers/PembiayaanOnlineController.php index def2c466..18ea958c 100644 --- a/app/Http/Controllers/PembiayaanOnlineController.php +++ b/app/Http/Controllers/PembiayaanOnlineController.php @@ -533,6 +533,10 @@ class PembiayaanOnlineController extends Controller $kuantiti = $nilai > 0 ? ((float) ($gadai_detail['pinjaman'] ?? 0) / $nilai) : 0; if (($gadai_detail['tagbaru'] ?? 0) == 1) { + $cawangan_info = $this->api() + ->get($api_url . '/api/cawangan/' . $kodcaw)->json(); + $pembiayaanOnlineEnabled = !empty(($cawangan_info['features'] ?? [])['pembiayaan_online']); + return view('print.sag_ujrah_3', compact( 'komoditi', 'product', @@ -547,7 +551,7 @@ class PembiayaanOnlineController extends Controller 'mutu', 'kadar_ujrah', 'kakitangan' - )); + ))->with('pembiayaanOnlineEnabled', $pembiayaanOnlineEnabled); } return view('print.sag', compact( diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index c5589935..9ab201a7 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -801,9 +801,12 @@ } }); + var pembiayaanOnlineEnabled = @json(!empty(($cawangan_info['features'] ?? [])['pembiayaan_online'])); + var tablegadai = initErahnDatatable('#myTable', { order: [[1, 'desc']], columnDefs: [ + { targets: 2, visible: pembiayaanOnlineEnabled, className: pembiayaanOnlineEnabled ? '' : 'no-export' }, { targets: 0, orderable: false, width: '40px' }, { targets: -1, orderable: false, searchable: false, width: '70px' } ] @@ -811,6 +814,7 @@ var xtawarruq = initErahnDatatable('#xtawarruq', { columnDefs: [ + { targets: 2, visible: pembiayaanOnlineEnabled, className: pembiayaanOnlineEnabled ? '' : 'no-export' }, { targets: 0, orderable: false, width: '40px' } ] }); @@ -2067,7 +2071,8 @@ harini.setHours(0, 0, 0, 0); if ($("input[name='options']:checked").val() == 'belum_tebus') { - let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text(); + let selectedRow = $('input[name="belum"]:checked').closest('tr'); + let test1 = selectedRow.length ? selectedRow.closest('table').DataTable().row(selectedRow).data()[3] : ''; let tarikhgadai2 = new Date(test1); tarikhgadai2.setHours(0, 0, 0, 0); if (+harini !== +tarikhgadai2) { @@ -2484,7 +2489,8 @@ } if ($("input[name='options']:checked").val() == 'belum_tebus') { - let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text(); + let selectedRow = $('input[name="belum"]:checked').closest('tr'); + let test1 = selectedRow.length ? selectedRow.closest('table').DataTable().row(selectedRow).data()[3] : ''; let tarikhgadai2 = new Date(test1); tarikhgadai2.setHours(0, 0, 0, 0); diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index 6f6a5b72..0b0a5732 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -2112,6 +2112,7 @@
+ @if ($pembiayaanOnlineEnabled ?? false) @php $caraTerimaBayaran = strtoupper(trim((string) ($gadai_detail['cara_terima'] ?? ''))); @endphp @@ -2128,6 +2129,7 @@
+ @endif {{-- HEADER SECTION --}}