From 98ad8a585e4773d35af067499cb73801a0a96324 Mon Sep 17 00:00:00 2001 From: Cyclone Date: Sun, 23 Nov 2025 20:49:23 +0800 Subject: [PATCH 1/3] resit ujrah align with keuntungan --- app/Http/Controllers/GadaianController.php | 4 +++- resources/views/print/resittebus_ujrah.blade.php | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index eb6e6b8..360d4a2 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -612,8 +612,10 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); + $transaction_keuntungan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json(); + if($gadai['tagbaru'] == 1) { - return view('print.resittebus_ujrah',compact('surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); + return view('print.resittebus_ujrah',compact('transaction_keuntungan','surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); } else { return view('print.resittebus',compact('surat_wakil', '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 11e6ced..9bb2377 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -629,22 +629,22 @@ Keuntungan - : RM {{ number_format($penebusan['onepercent'], 2) }} + : RM {{ number_format($transaction_keuntungan['onepercent'],2) }} (-) Rebat Untung : RM - {{ number_format($totalrebate['onepercent'], 2) }} + {{ number_format(($transaction_keuntungan['onepercent'] - $transaction_keuntungan['onepercent_rebet']),2) }} Lain-Lain Caj - : RM {{ number_format($penebusan['ujrah'], 2) }} + : RM {{ number_format($transaction_keuntungan['ujrah'],2) }} (-) Rebat Lain-Lain Caj : RM - {{ number_format($totalrebate['ujrah'], 2) }} + {{ number_format(($transaction_keuntungan['ujrah'] - $transaction_keuntungan['ujrah_rebet']), 2) }} From 94abeef80b26839dfdf9fe6edd601017b6039b40 Mon Sep 17 00:00:00 2001 From: Cyclone Date: Fri, 28 Nov 2025 23:15:31 +0800 Subject: [PATCH 2/3] fix the defined variable ujrah_rebate and keuntungan_rebate --- app/Http/Controllers/GadaianController.php | 8 +++++--- resources/views/print/resittebus_ujrah.blade.php | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 360d4a2..ce9ba48 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -601,7 +601,7 @@ 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(); + // $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json(); // dd($wakil); $surat_wakil = []; @@ -612,10 +612,12 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); - $transaction_keuntungan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json(); + $ujrah_rebate = $transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']; + $keuntungan_rebate = $transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']; + if($gadai['tagbaru'] == 1) { - return view('print.resittebus_ujrah',compact('transaction_keuntungan','surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); + return view('print.resittebus_ujrah',compact('ujrah_rebate','keuntungan_rebate','surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); } else { return view('print.resittebus',compact('surat_wakil', '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 9bb2377..dffc1e1 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -629,22 +629,22 @@ Keuntungan - : RM {{ number_format($transaction_keuntungan['onepercent'],2) }} + : RM {{ number_format($transaction_tebus['onepercent'],2) }} (-) Rebat Untung : RM - {{ number_format(($transaction_keuntungan['onepercent'] - $transaction_keuntungan['onepercent_rebet']),2) }} + {{ number_format($keuntungan_rebate,2) }} Lain-Lain Caj - : RM {{ number_format($transaction_keuntungan['ujrah'],2) }} + : RM {{ number_format($transaction_tebus['ujrah'],2) }} (-) Rebat Lain-Lain Caj : RM - {{ number_format(($transaction_keuntungan['ujrah'] - $transaction_keuntungan['ujrah_rebet']), 2) }} + {{ number_format($ujrah_rebate, 2) }} @@ -859,22 +859,22 @@ Keuntungan - : RM {{ number_format($penebusan['onepercent'], 2) }} + : RM {{ number_format($transaction_tebus['onepercent'], 2) }} (-) Rebat Untung : RM - {{ number_format($totalrebate['onepercent'], 2) }} + {{ number_format($keuntungan_rebate, 2) }} Lain-Lain Caj - : RM {{ number_format($penebusan['ujrah'], 2) }} + : RM {{ number_format($transaction_tebus['ujrah'], 2) }} (-) Rebat Lain-Lain Caj : RM - {{ number_format($totalrebate['ujrah'], 2) }} + {{ number_format($ujrah_rebate, 2) }} From 0156712742d7b2d9afa8f079714fe373af51ed3b Mon Sep 17 00:00:00 2001 From: Cyclone Date: Tue, 2 Dec 2025 20:09:29 +0800 Subject: [PATCH 3/3] remove totalrebate --- app/Http/Controllers/GadaianController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index ce9ba48..a2615fc 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -603,7 +603,6 @@ class GadaianController extends Controller // $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json(); - // dd($wakil); $surat_wakil = []; if(sizeof($wakil) != 0) { $wakil = $wakil[0]; @@ -617,7 +616,7 @@ class GadaianController extends Controller if($gadai['tagbaru'] == 1) { - return view('print.resittebus_ujrah',compact('ujrah_rebate','keuntungan_rebate','surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); + return view('print.resittebus_ujrah',compact('ujrah_rebate','keuntungan_rebate','surat_wakil','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); } else { return view('print.resittebus',compact('surat_wakil', 'transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user')); }