From 98ad8a585e4773d35af067499cb73801a0a96324 Mon Sep 17 00:00:00 2001
From: Cyclone <muhammadhafifie97@gmail.com>
Date: Sun, 23 Nov 2025 20:49:23 +0800
Subject: [PATCH] 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 @@
             </tr>
             <tr>
                 <td style="width:10px">Keuntungan</td>
-                <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
+                <td style="width:10px">: RM {{ number_format($transaction_keuntungan['onepercent'],2) }}</td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Untung</td>
                 <td style="width:10px">: RM
-                    {{ number_format($totalrebate['onepercent'], 2) }}
+                    {{ number_format(($transaction_keuntungan['onepercent'] - $transaction_keuntungan['onepercent_rebet']),2) }}
                 </td>
             </tr>
             <tr>
                 <td style="width:10px">Lain-Lain Caj</td>
-                <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
+                <td style="width:10px">: RM {{ number_format($transaction_keuntungan['ujrah'],2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
                 <td style="width:10px">: RM
-                    {{ number_format($totalrebate['ujrah'], 2) }} </td>
+                    {{ number_format(($transaction_keuntungan['ujrah'] - $transaction_keuntungan['ujrah_rebet']), 2) }} </td>
             </tr>
             <tr>
                 <td></td>