diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index d5c44a1..0d5171f 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/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 9129dea..546952d 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     <script>
-        // $(document).ready(function () {
-        //   window.print();
-        //   window.onfocus=function(){ window.close();}
-        // });
+        $(document).ready(function () {
+          window.print();
+          window.onfocus=function(){ window.close();}
+        });
     </script>
 </head>
 
@@ -404,19 +404,12 @@
 
         <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image"
                 class="center"> </td>
-        <td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image"
-                class="center"> </td>
 
     </table>
     <table id="cust">
         <tr>
             <th style="width:5px;"> Salinan Pelanggan</th>
         </tr>
-        <tr>
-            <td style="width:5px;"> RESIT BAYARAN </td>
-
-        </tr>
-
     </table>
     <br>
     <table id="inside">
@@ -463,7 +456,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $gadai['tempoh'] }}</td>
+            <td>: {{ $transaction['beza_tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -528,7 +521,7 @@
             <td><strong>: RM {{ number_format($transaction['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;">
+    <p style="float:left;position:absolute;margin-left:50px;" id="inside">
         Marhun: {{ $gadai['marhun'] }}
     </p>
     <br>
@@ -555,17 +548,16 @@
     <br>
 
     </table>
+    <table>
 
+        <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image"
+                class="center"> </td>
 
+    </table>
     <table id="cust">
         <tr>
             <th style="width:5px;"> Salinan Pejabat</th>
         </tr>
-        <tr>
-            <td style="width:5px;"> RESIT BAYARAN </td>
-
-        </tr>
-
     </table>
 
     <br>
@@ -613,7 +605,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $gadai['tempoh'] }}</td>
+            <td>: {{ $transaction['beza_tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -678,7 +670,7 @@
             <td><strong>: RM {{ number_format($transaction['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;">
+    <p style="float:left;position:absolute;margin-left:50px;" id="inside">
         Marhun: {{ $gadai['marhun'] }}
     </p>
     <br>
@@ -696,6 +688,18 @@
             <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
         </tr>
     </table>
-    <br>
-    <br>
+    <table id="inside" style="width: 45%; margin-top:20px">
+        <tr>
+            <td>Duit Pelanggan</td>
+            <td>: RM {{ number_format($transaction['duitpelanggan'], 2) }}</td>
+        </tr>
+        <tr>
+            <td>Jumlah Perlu Dibayar</td>
+            <td>: RM {{ number_format($transaction['duit_masuk'], 2) }}</td>
+        </tr>
+        <tr>
+            <td>Baki</td>
+            <td>: RM {{ number_format($transaction['bakipelanggan'], 2) }}</td>
+        </tr>
+    </table>
 </body>
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index f3d4338..193f727 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -7,8 +7,10 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     <script>
         $(document).ready(function() {
-            // window.print();
-            // window.onfocus=function(){ window.close();}
+            window.print();
+            window.onfocus = function() {
+                window.close();
+            }
         });
     </script>
 </head>
@@ -413,20 +415,12 @@
 
         <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image"
                 class="center"> </td>
-        <td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image"
-                class="center"> </td>
-        <td></td>
-
     </table>
 
     <table id="cust">
         <tr>
             <th style="width:5px;"> Salinan Pelanggan</th>
         </tr>
-        <tr>
-            <td style="width:5px;"> RESIT BAYARAN </td>
-
-        </tr>
 
     </table>
 
@@ -476,7 +470,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $gadai['tempoh'] }}</td>
+            <td>: {{ $transaction_tebus['beza_tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -493,8 +487,8 @@
             <td> </td>
             <td>Masa Bayaran</td>
             @php
-            $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
-            $masa = date('H:i:s', $masa_bayaran);
+                $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+                $masa = date('H:i:s', $masa_bayaran);
             @endphp
             <td>: {{ $masa }}</td>
         </tr>
@@ -505,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>
@@ -513,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>
@@ -521,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>
@@ -533,15 +527,11 @@
             <td></td>
         </tr>
         <tr>
-            @php
-            $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet'];
-            @endphp
             <td><strong>Jumlah Perlu Dibayar</strong></td>
             <td><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
-
-    <p style="display: flex; margin: 20px 80px">
+    <p style="display: flex; margin: 20px 80px" id="inside">
         Marhun: {{ $gadai['marhun'] }}
     </p>
     <table id="semakan">
@@ -565,20 +555,18 @@
     <br>
     <br>
     <hr class="new2">
-    <br>
-    <br>
 
     </table>
 
+    <table>
 
+        <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px"
+                alt="User Image" class="center"> </td>
+    </table>
     <table id="cust">
         <tr>
             <th style="width:5px;"> Salinan Pejabat</th>
         </tr>
-        <tr>
-            <td style="width:5px;"> RESIT BAYARAN </td>
-
-        </tr>
 
     </table>
 
@@ -627,7 +615,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $gadai['tempoh'] }}</td>
+            <td>: {{ $transaction_tebus['beza_tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -644,8 +632,8 @@
             <td> </td>
             <td>Masa Bayaran</td>
             @php
-            $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
-            $masa = date('H:i:s', $masa_bayaran);
+                $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+                $masa = date('H:i:s', $masa_bayaran);
             @endphp
             <td>: {{ $masa }}</td>
         </tr>
@@ -657,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>
@@ -665,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>
@@ -673,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>
@@ -685,15 +673,12 @@
             <td></td>
         </tr>
         <tr>
-            @php
-            $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet'];
-            @endphp
             <td><strong>Jumlah Perlu Dibayar</strong></td>
             <td><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
 
-    <p style="display: flex; margin: 20px 80px">
+    <p style="display: flex; margin: 20px 80px" id="inside">
         Marhun: {{ $gadai['marhun'] }}
     </p>
     <table id="semakan">
@@ -714,4 +699,18 @@
 
         </tr>
     </table>
+    <table id="inside" style="width: 45%; margin-top:20px">
+        <tr>
+            <td>Duit Pelanggan</td>
+            <td>: RM {{ number_format($transaction_tebus['duitpelanggan'], 2) }}</td>
+        </tr>
+        <tr>
+            <td>Jumlah Perlu Dibayar</td>
+            <td>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</td>
+        </tr>
+        <tr>
+            <td>Baki</td>
+            <td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td>
+        </tr>
+    </table>
 </body>