diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index cfdf213..37134c2 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4403,13 +4403,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/print/laporan_tebus_ujrah.blade.php b/resources/views/print/laporan_tebus_ujrah.blade.php index 75a7e2a..c9304c9 100644 --- a/resources/views/print/laporan_tebus_ujrah.blade.php +++ b/resources/views/print/laporan_tebus_ujrah.blade.php @@ -446,7 +446,7 @@ {{ number_format($totalujrah, 2) }} {{ number_format($totalonepercent, 2) }} {{ number_format($totalupah, 2) }} - {{ number_format($totalupah - $totalkeuntunganrebet, 2) }} + {{ number_format(floatval($totalupah) - floatval($totalkeuntunganrebet), 2) }} {{ number_format($totalbayaran, 2) }}