From 352d6411b19fdf408efe050b3ee283581baf9128 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Mon, 30 Dec 2024 11:03:28 +0800
Subject: [PATCH] fix resit PS(based on shahmin operasi)

---
 .../print/resittebusautotawarruq.blade.php    | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 98b8706..318e7e7 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -452,24 +452,21 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pembiayaan</td>
+    <td style="width:10px">Baki Pembiayaan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+    <td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pembiayaan</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
-  </tr>
-  <tr>
-    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px">(+) Keuntungan (Semasa)</td>
     <td style="width:5px"> </td>
+    @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
     <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Pembiayaan Baru</td>
+    <td style="width:10px">(-) Bayaran Pelanggan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
+    @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
   </tr>
   <tr>
       <td></td>
@@ -483,7 +480,13 @@ hr.new5 {
   <tr>
     <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
     <td style="width:5px"> </td>
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+    @php $total = $temp_loan - $temp_totalpay; @endphp
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($total,2) }}</b></td>
+  </tr>
+  <tr>
+    <td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b> </td>
   </tr>
 </table>
 <table id="payment" style="border: none; margin-top:20px; width:55%">
@@ -599,24 +602,22 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pembiayaan</td>
+    <td style="width:10px">Baki Pembiayaan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+    <td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pembiayaan</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
-  </tr>
-  <tr>
-    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px">(+) Keuntungan (Semasa)</td>
     <td style="width:5px"> </td>
+    @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
     <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Pembiayaan Baru</td>
+    <td style="width:10px">(-) Bayaran Pelanggan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
+    @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
+
   </tr>
   <tr>
       <td></td>
@@ -630,7 +631,13 @@ hr.new5 {
   <tr>
     <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
     <td style="width:5px"> </td>
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+    @php $total = $temp_loan - $temp_totalpay; @endphp
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($total,2) }}</b></td>
+  </tr>
+  <tr>
+    <td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b></td>
   </tr>
 </table>
 <table id="payment" style="border: none; margin-top:20px; width:55%">