From 88c5acbd92f5b329c5a670de8cb75b375d85c7a7 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Mon, 30 Dec 2024 12:07:20 +0800
Subject: [PATCH] fix bakipembiayaan + keuntungan (based on shahmi operasi)

---
 .../print/resittebusautotawarruq.blade.php    | 65 ++++++++-----------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 318e7e7..96e01fa 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -452,15 +452,10 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Baki Pembiayaan</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
-  </tr>
-  <tr>
-    <td style="width:10px">(+) Keuntungan (Semasa)</td>
+    <td style="width:10px">B. Pembiayaan + Keuntungan</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>
+    <td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
   </tr>
   <tr>
     <td style="width:10px">(-) Bayaran Pelanggan</td>
@@ -469,24 +464,24 @@ hr.new5 {
     <td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
   </tr>
   <tr>
-      <td></td>
-  </tr>
-  <tr>
-      <td></td>
-  </tr>
-  <tr>
-      <td></td>
-  </tr>
-  <tr>
-    <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
+    <td style="width:10px;">Jumlah Bayaran</td>
     <td style="width:5px"> </td>
     @php $total = $temp_loan - $temp_totalpay; @endphp
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($total,2) }}</b></td>
+    <td style="width:10px;">: RM {{ number_format($total,2) }}</td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></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>
+    <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%">
@@ -602,37 +597,31 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Baki Pembiayaan</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
-  </tr>
-  <tr>
-    <td style="width:10px">(+) Keuntungan (Semasa)</td>
+    <td style="width:10px">B. Pembiayaan + Keuntungan</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>
+    <td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
   </tr>
   <tr>
     <td style="width:10px">(-) Bayaran Pelanggan</td>
     <td style="width:5px"> </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>
-  </tr>
-  <tr>
-      <td></td>
-  </tr>
-  <tr>
-      <td></td>
-  </tr>
-  <tr>
-    <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
+    <td style="width:10px;">Jumlah Bayaran</td>
     <td style="width:5px"> </td>
     @php $total = $temp_loan - $temp_totalpay; @endphp
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($total,2) }}</b></td>
+    <td style="width:10px;">: RM {{ number_format($total,2) }}</td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
   </tr>
   <tr>
     <td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>