diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 37134c2..47431d7 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3105,6 +3105,29 @@ class KhazanahController extends Controller return view('khazanah.laporan.tuntutbaki', compact('cawangan_info','api_url')); } + // public function cetaklaporan_tuntutbaki(Request $request){ + + // $api_url = config('api.url'); + // $auth_user = Auth::user(); + // $current = Carbon::now(); + // $current = new Carbon(); + // $tarikh_cetak = $current->toDateString(); + + // if($request->datetimepicker1 == null){ + // $gadai_date = $current->toDateString(); + // }else{ + // $split_date = explode('-',$request->datetimepicker1); + // $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + // } + + // $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/TuntutBakiTarikh/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json(); + + // $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_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url')); + // } + public function cetaklaporan_tuntutbaki(Request $request){ $api_url = config('api.url'); @@ -3112,21 +3135,34 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - + if($request->datetimepicker1 == null){ $gadai_date = $current->toDateString(); - }else{ - $split_date = explode('-',$request->datetimepicker1); + } else { + $split_date = explode('-', $request->datetimepicker1); $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - - $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/TuntutBakiTarikh/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json(); - - $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_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url')); + + // Fetching the data from API + $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date]) + ->json(); + + $cawangan = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan']) + ->json(); + + // Check if $tuntutbaki is an array and not empty before sending it to the view + if (!is_array($tuntutbaki) || empty($tuntutbaki)) { + $tuntutbaki = []; // If not valid, set it to an empty array + } + + $cawangan_detail = $cawangan[0] ?? null; + + return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url')); } + + diff --git a/resources/views/callcenter/v2/index.blade.php b/resources/views/callcenter/v2/index.blade.php index 05652d6..2a6b751 100644 --- a/resources/views/callcenter/v2/index.blade.php +++ b/resources/views/callcenter/v2/index.blade.php @@ -3220,7 +3220,7 @@ urlroute = urlroute.replace(':id', norujukan); Swal.fire( 'Berjaya!', - 'Tebus Pembiayaan Semula Berjaya', + 'Penyelesaian Pembiayaan Semula Berjaya', 'success' ) .then(function() { window.open(urlroute, '_blank'); diff --git a/resources/views/khazanah/bajet.blade.php b/resources/views/khazanah/bajet.blade.php index 43f5557..f9ea2ca 100644 --- a/resources/views/khazanah/bajet.blade.php +++ b/resources/views/khazanah/bajet.blade.php @@ -51,7 +51,7 @@
-
Penebusan
+
Penyelesaian Pembiayaan
- Penyelesaian Pem. Bulanan + Penyelesaian Pembiayaan Bulanan
@@ -163,7 +163,7 @@
-
Penebusan Terkumpul
+
Penyelesaian Pembiayaan Terkumpul
@@ -384,10 +384,10 @@ var optionsbilangan = { series: [{ - name: 'Gadai', + name: 'Pembiayaan', data: [] }, { - name: 'Tebus', + name: 'Penyelesaian Pembiayaan', data: [] }], chart: { diff --git a/resources/views/penebusan/v2/index-khazanah.blade.php b/resources/views/penebusan/v2/index-khazanah.blade.php index 8c7acf8..e49f1b2 100644 --- a/resources/views/penebusan/v2/index-khazanah.blade.php +++ b/resources/views/penebusan/v2/index-khazanah.blade.php @@ -2665,7 +2665,7 @@ urlroute = urlroute.replace(':id', norujukan); Swal.fire( 'Berjaya!', - 'Tebus Pembiayaan Semula Berjaya', + 'Penyelesaian Pembiayaan Semula Berjaya', 'success' ) .then(function() { window.open(urlroute, '_blank'); diff --git a/resources/views/penebusan/v2/index.blade-backup.php b/resources/views/penebusan/v2/index.blade-backup.php index e7c32d6..0cafc10 100644 --- a/resources/views/penebusan/v2/index.blade-backup.php +++ b/resources/views/penebusan/v2/index.blade-backup.php @@ -2876,7 +2876,7 @@ urlroute = urlroute.replace(':id', norujukan); Swal.fire( 'Berjaya!', - 'Tebus Pembiayaan Semula Berjaya', + 'Penyelesaian Pembiayaan Semula Berjaya', 'success' ) .then(function() { window.open(urlroute, '_blank'); diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php index 31a1271..c4e9ab4 100644 --- a/resources/views/penebusan/v2/index.blade.php +++ b/resources/views/penebusan/v2/index.blade.php @@ -3298,7 +3298,7 @@ urlroute = urlroute.replace(':id', norujukan); Swal.fire( 'Berjaya!', - 'Tebus Pembiayaan Semula Berjaya', + 'Penyelesaian Pembiayaan Semula Berjaya', 'success' ) .then(function() { window.open(urlroute, '_blank'); diff --git a/resources/views/print/laporan_audittrail.blade.php b/resources/views/print/laporan_audittrail.blade.php index d295c39..73fd296 100644 --- a/resources/views/print/laporan_audittrail.blade.php +++ b/resources/views/print/laporan_audittrail.blade.php @@ -153,20 +153,20 @@ {{-- --}} - {{-- --}} + - + - {{-- + - --}} +
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 8027449..a964ecf 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -146,21 +146,21 @@ - {{-- --}} - {{-- --}} + + - {{-- + - --}} +
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 60bda15..ed97ff3 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -167,7 +167,7 @@ - +
LAPORAN Penyelesaian Pem.LAPORAN PENYELESAIAN PEMBIAYAAN Tarikh Cetak: diff --git a/resources/views/print/laporan_tebus_ujrah.blade.php b/resources/views/print/laporan_tebus_ujrah.blade.php index 3ed4f6d..6d9b5f9 100644 --- a/resources/views/print/laporan_tebus_ujrah.blade.php +++ b/resources/views/print/laporan_tebus_ujrah.blade.php @@ -192,7 +192,7 @@ - + diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index b954d36..afaae85 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -375,7 +375,7 @@
-

KOPERASI PERMODALAN Kelantan berhad (D-5-0228)

+

KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)

{{ $cawangan_detail['namacaw'] }}

{{ $cawangan_detail['alamat1'] }}

{{ $cawangan_detail['alamat2'] }}

@@ -481,7 +481,7 @@
LAPORAN PENYELESAIAN PEM.LAPORAN PENYELESAIAN PEMBIAYAAN
- @@ -748,7 +748,7 @@ - +
+ KETERANGAN MARHUN
TANDATANGAN SAKSI