From 9aa14e17ff2db1b566e896927cee10a2716a2167 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <hafpkb@Hafifies-MacBook-Pro.local>
Date: Mon, 4 Dec 2023 09:44:06 +0800
Subject: [PATCH] fix penebusan layout dan resit tebus tukar rebate

---
 resources/views/penebusan/index.blade.php        |  2 +-
 resources/views/print/resittebus_ujrah.blade.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index dbb18b7..3fd89ba 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1248,7 +1248,7 @@
             var nowakil = nw;
             var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
             var bakipelanggan =  $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
-
+            console.log('test');
             $.ajax({
                 method:'get',
                 datatype: 'json',
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index 16627ae..193f727 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -499,7 +499,7 @@
     <table id="payment">
         <tr>
             <td style="width:10px">Baki Pembiayaan</td>
-            <td style="width:10px">: RM {{ number_format($penebusan['bakipjm'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Keuntungan</td>
@@ -507,7 +507,7 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Ujrah</td>
@@ -515,7 +515,7 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
         </tr>
         <tr>
             <td></td>
@@ -645,7 +645,7 @@
     <table id="payment">
         <tr>
             <td style="width:10px">Baki Pembiayaan</td>
-            <td style="width:10px">: RM {{ number_format($penebusan['bakipjm'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Keuntungan</td>
@@ -653,7 +653,7 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Ujrah</td>
@@ -661,7 +661,7 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
         </tr>
         <tr>
             <td></td>