diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index cfdf213..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')); } + + @@ -4403,13 +4439,14 @@ class KhazanahController extends Controller } $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebusujrah/laporan/'. $auth_user['cawangan'] ,['mula' => $mula_date,'akhir' => $hingga_date])->json(); + $totalkeuntunganrebet = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebusujrah/laporan/'. $auth_user['cawangan'] ,['mula' => $mula_date,'akhir' => $hingga_date])->json(); $tebuspengasingan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebus/laporanjenistawarruqujrah/'. $auth_user['cawangan'] ,['mula' => $mula_date,'akhir' => $hingga_date])->json(); $upahlama = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/advansurdetailsrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); $ansuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuransummaryrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_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_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran')); + return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet')); } public function laporanAnsuranUjrah(){ diff --git a/resources/views/admin/customer_index.blade.php b/resources/views/admin/customer_index.blade.php index 25da6e5..a51ea9e 100644 --- a/resources/views/admin/customer_index.blade.php +++ b/resources/views/admin/customer_index.blade.php @@ -141,13 +141,13 @@
No Akaun
-
Tujuan Gadai
+
Tujuan Pembiayaan
@php $tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json(); @endphp
-
Tujuan Gadai
+
Tujuan Pembiayaan
@php $tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json(); @endphp
-
Tujuan Gadai
+
Tujuan Pembiayaan
@php $tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json(); @endphp
-
Tujuan Gadai
+
Tujuan Pembiayaan
@php $tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json(); @endphp
Belum Tebus + Pembiayaan Belum Selesai