From 2b81c5dd087dec3a890d7d368f42073b5317c736 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 23 Nov 2023 13:39:26 +0800
Subject: [PATCH] Update resit ansuran

---
 app/Http/Controllers/GadaianController.php    |   3 +-
 .../views/print/resitansuran_ujrah.blade.php  | 220 ++++++++----------
 2 files changed, 97 insertions(+), 126 deletions(-)

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 17d965c..c3ea243 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -385,7 +385,8 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0];
 
-        return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
+        // return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
+        return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
     }
 
     public function resitbelumansurans($id)
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 51fb5d9..64ba248 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -422,28 +422,14 @@
     <table id="inside">
 
         <tr>
-            <td colspan="3">Marhun</td>
-            <td>: {{ $gadai['marhun'] }} </td>
+            <td colspan="3">Nama</td>
+            <td>: {{ $customers_info['nama'] }} </td>
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
             <td><b> No SAG</b></td>
             <td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
         </tr>
-        <tr>
-            <td colspan="3">Nama</td>
-            <td>: {{ $customers_info['nama'] }} </td>
-            <td colspan="3"> </td>
-            <td> </td>
-            <td> </td>
-            <td> Tarikh Bayar</td>
-            <td>: @php
-                $time = new DateTime($transaction['created_at']);
-                $date = $time->format('d/m/Y');
-                echo $date;
-            @endphp</td>
-        </tr>
-
         <tr>
             <td colspan="3">No K/P </td>
             <td>: @php
@@ -456,8 +442,12 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> <b>Tempoh Simpanan</b></td>
-            <td>:<b> {{ $gadai['tempoh'] }}</b> </td>
+            <td> Tarikh Bayar</td>
+            <td>: @php
+                $time = new DateTime($transaction['created_at']);
+                $date = $time->format('d/m/Y');
+                echo $date;
+            @endphp</td>
         </tr>
 
         <tr>
@@ -472,8 +462,8 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> </td>
-            <td> </td>
+            <td>Tempoh Simpan</td>
+            <td>: {{ $gadai['tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -488,8 +478,8 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> </td>
-            <td> </td>
+            <td>Masa Bayaran</td>
+            <td>: --:--:--</td>
         </tr>
     </table>
     <br>
@@ -497,61 +487,56 @@
     <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
     <table id="payment">
         <tr>
-            <td style="width:30%">Harga Jualan/Baki</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }}
-            </td>
-            <td style="width:30%">Pembiayaan/Baki</td>
-            <td style="width:20%">: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }}
-            </td>
-        </tr>
-        <tr>
-            <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
-            <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'], 2) }} </b></td>
-            <td style="width:30%">Ansuran Pembiyaan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
-        </tr>
-        <tr>
-            <td style="width:30%">Baki Harga Jualan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bakiharga'], 2) }}</td>
             <td style="width:30%">Baki Pembiayaan</td>
             <td style="width:20%">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
+            <td style="width:30%">Ansuran Pembiyaan</td>
+            <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
+            </td>
         </tr>
         <tr>
-            <td style="width:10px"></td>
-            <td style="width:10px"></td>
-            <td style="width:10px">Keuntungan</td>
-            <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} </td>
+            <td style="width:30%"></td>
+            <td style="width:20%"></td>
+            <td style="width:30%">Untung</td>
+            <td style="width:20%">: RM XX.XX</td>
+        </tr>
+        <tr>
+            <td style="width:30%"></td>
+            <td style="width:20%"></td>
+            <td style="width:30%">Ujrah</td>
+            <td style="width:20%">: RM XX.XX</td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td></td>
+            <td><strong>Jumlah Perlu Dibayar</strong></td>
+            <td><strong>: RM XX.XX</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan
-            direbat semasa penebusan</i></p>
+    <p style="float:left;position:absolute;margin-left:50px;">
+        Marhun: {{ $gadai['marhun'] }}
+    </p>
+    <br>
     <br>
-
-
-
-
-
     <table id="semakan">
         <tr>
             <td colspan="3">.................................................... </td>
-            <td></td>
-            <td colspan="3">.................................................... </td>
-            <td></td>
-            <td colspan="3">.................................................... </td>
-            <td></td>
+            <td colspan="9"></td>
             <td colspan="3">.................................................... </td>
         </tr>
         <tr>
 
-            <td colspan="3">DiSemak </td>
-            <td></td>
-            <td colspan="3"> Cagaran Di Keluarkan</td>
-            <td></td>
-            <td colspan="3">Cagaran Diterima </td>
-            <td></td>
+            <td colspan="3">Pelanggan </td>
+            <td colspan="9"></td>
             <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
-
-
         </tr>
     </table>
     <br>
@@ -580,28 +565,14 @@
     <table id="inside">
 
         <tr>
-            <td colspan="3">Marhun</td>
-            <td>: {{ $gadai['marhun'] }} </td>
+            <td colspan="3">Nama</td>
+            <td>: {{ $customers_info['nama'] }} </td>
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
             <td><b> No SAG</b></td>
             <td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
         </tr>
-        <tr>
-            <td colspan="3">Nama</td>
-            <td>: {{ $customers_info['nama'] }} </td>
-            <td colspan="3"> </td>
-            <td> </td>
-            <td> </td>
-            <td> Tarikh Bayar</td>
-            <td>: @php
-                $time = new DateTime($transaction['created_at']);
-                $date = $time->format('d/m/Y');
-                echo $date;
-            @endphp </td>
-        </tr>
-
         <tr>
             <td colspan="3">No K/P </td>
             <td>: @php
@@ -614,8 +585,12 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> <b>Tempoh Simpan</b></td>
-            <td>:<b> {{ $gadai['tempoh'] }}</b> </td>
+            <td> Tarikh Bayar</td>
+            <td>: @php
+                $time = new DateTime($transaction['created_at']);
+                $date = $time->format('d/m/Y');
+                echo $date;
+            @endphp</td>
         </tr>
 
         <tr>
@@ -630,8 +605,8 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> </td>
-            <td> </td>
+            <td>Tempoh Simpan</td>
+            <td>: {{ $gadai['tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -646,8 +621,8 @@
             <td colspan="3"> </td>
             <td> </td>
             <td> </td>
-            <td> </td>
-            <td> </td>
+            <td>Masa Bayaran</td>
+            <td>: --:--:--</td>
         </tr>
     </table>
     <br>
@@ -655,63 +630,58 @@
     <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
     <table id="payment">
         <tr>
-            <td style="width:30%">Harga Jualan/Baki</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }}
-            </td>
-            <td style="width:30%">Pembiayaan/Baki</td>
-            <td style="width:20%">: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }}
-            </td>
-        </tr>
-        <tr>
-            <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
-            <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'], 2) }} </b></td>
-            <td style="width:30%">Ansuran Pembiyaan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
-        </tr>
-        <tr>
-            <td style="width:30%">Baki Harga Jualan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['bakiharga'], 2) }}</td>
             <td style="width:30%">Baki Pembiayaan</td>
             <td style="width:20%">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
+            <td style="width:30%">Ansuran Pembiyaan</td>
+            <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
+            </td>
         </tr>
         <tr>
-            <td style="width:10px"></td>
-            <td style="width:10px"></td>
-            <td style="width:10px">Keuntungan</td>
-            <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} </td>
+            <td style="width:30%"></td>
+            <td style="width:20%"></td>
+            <td style="width:30%">Untung</td>
+            <td style="width:20%">: RM XX.XX</td>
+        </tr>
+        <tr>
+            <td style="width:30%"></td>
+            <td style="width:20%"></td>
+            <td style="width:30%">Ujrah</td>
+            <td style="width:20%">: RM XX.XX</td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td></td>
+            <td><strong>Jumlah Perlu Dibayar</strong></td>
+            <td><strong>: RM XX.XX</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan
-            direbat semasa penebusan</i></p>
-
+    <p style="float:left;position:absolute;margin-left:50px;">
+        Marhun: {{ $gadai['marhun'] }}
+    </p>
+    <br>
     <br>
-
-
-
-
-
     <table id="semakan">
         <tr>
             <td colspan="3">.................................................... </td>
-            <td></td>
-            <td colspan="3">.................................................... </td>
-            <td></td>
-            <td colspan="3">.................................................... </td>
-            <td></td>
+            <td colspan="9"></td>
             <td colspan="3">.................................................... </td>
         </tr>
         <tr>
 
-            <td colspan="3">DiSemak </td>
-            <td></td>
-            <td colspan="3"> Cagaran Di Keluarkan</td>
-            <td></td>
-            <td colspan="3">Cagaran Diterima </td>
-            <td></td>
+            <td colspan="3">Pelanggan </td>
+            <td colspan="9"></td>
             <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
-
-
         </tr>
     </table>
     <br>
+    <br>
 </body>