From 18c7c2ddc8a8ae629d01fd6df098a4169bfa8a7a Mon Sep 17 00:00:00 2001
From: Ain Izazi <ain55645@gmail.com>
Date: Sun, 30 Nov 2025 11:02:54 +0800
Subject: [PATCH] fix utk kiraan resit

---
 app/Http/Controllers/ResitController.php         | 4 +++-
 resources/views/resit/resittebus_ujrah.blade.php | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ResitController.php b/app/Http/Controllers/ResitController.php
index de1a507..9482f08 100644
--- a/app/Http/Controllers/ResitController.php
+++ b/app/Http/Controllers/ResitController.php
@@ -154,7 +154,8 @@ class ResitController extends Controller
 
         $totalBayaranAnsuran = Http::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();
+        
         $surat_wakil = [];
         if(sizeof($wakil) != 0) {
             $wakil = $wakil[0];
@@ -162,6 +163,7 @@ class ResitController extends Controller
         }
 
         $transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
+        $totalrebate = ['ujrah' => ($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 'onepercent' => ($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet'])];
 
         $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
 
diff --git a/resources/views/resit/resittebus_ujrah.blade.php b/resources/views/resit/resittebus_ujrah.blade.php
index 17dbd6d..0df9d07 100644
--- a/resources/views/resit/resittebus_ujrah.blade.php
+++ b/resources/views/resit/resittebus_ujrah.blade.php
@@ -629,7 +629,7 @@
             </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_tebus['onepercent'], 2) }}</td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Untung</td>
@@ -639,7 +639,7 @@
             </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_tebus['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
@@ -855,7 +855,7 @@
             </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_tebus['onepercent'], 2) }}</td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Untung</td>
@@ -865,7 +865,7 @@
             </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_tebus['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>