diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 9c00fa7..c0a05b3 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -556,6 +556,8 @@ class GadaianController extends Controller $totalBayaranAnsuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json(); + $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json(); + // dd($wakil); if(sizeof($wakil) != 0) $wakil = $wakil[0]; @@ -563,7 +565,7 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); if($gadai['tagbaru'] == 1) { - return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); + return view('print.resittebus_ujrah',compact('totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); } else { return view('print.resittebus',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); } diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php index be83001..47a2e5a 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -517,7 +517,7 @@ (-) Rebat Untung : RM - {{ number_format($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet'], 2) }} + {{ number_format($totalrebate['onepercent'], 2) }} @@ -527,7 +527,7 @@ (-) Rebat Ujrah : RM - {{ number_format($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet'], 2) }} + {{ number_format($totalrebate['ujrah'], 2) }} @@ -661,7 +661,7 @@ (-) Rebat Untung : RM - {{ number_format($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet'], 2) }} + {{ number_format($totalrebate['onepercent'], 2) }} @@ -671,7 +671,7 @@ (-) Rebat Ujrah : RM - {{ number_format($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet'], 2) }} + {{ number_format($totalrebate['ujrah'], 2) }}