diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index b5e4fa5..9c00fa7 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use App\Http\Controllers\AliranTunaiController;
+use App\User;
 
 class GadaianController extends Controller
 {
@@ -511,7 +512,9 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0];
 
-        return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+        $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
+
+        return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user'));
     }
 
     public function resittebus($id)
@@ -557,10 +560,12 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0];
 
+        $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
+
         if($gadai['tagbaru'] == 1) {
-            return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+            return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
         } else {
-            return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+            return view('print.resittebus',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
         }
     }
 
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 8b20c87..9a28c1f 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -4198,7 +4198,7 @@ class KhazanahController extends Controller
         $tarikh_cetak = $current->toDateString();
 
         if($request->datemula == null){
-            $mula_date = '2017-01-01';
+            $mula_date = $current->toDateString();
         }else{
             $split_date = explode('-', $request->datemula);
             $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
@@ -4238,7 +4238,7 @@ class KhazanahController extends Controller
         $tarikh_cetak = $current->toDateString();
 
         if($request->datemula == null){
-            $mula_date = '2017-01-01';
+            $mula_date = $current->toDateString();
         }else{
             $split_date = explode('-', $request->datemula);
             $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
@@ -4278,7 +4278,7 @@ class KhazanahController extends Controller
         $tarikh_cetak = $current->toDateString();
 
         if($request->datemula == null){
-            $mula_date = '2017-01-01';
+            $mula_date = $current->toDateString();
         }else{
             $split_date = explode('-', $request->datemula);
             $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
diff --git a/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php b/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
index 8952ab7..839180c 100644
--- a/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
+++ b/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
@@ -53,9 +53,9 @@
                                         <th>Tarikh Gadai</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
-                                        <th>Ujrah (RM) </th>
+                                        <th>Keuntungan Ujrah (RM) </th>
                                         <th>Keuntungan 1% (RM)</th>
-                                        <th>Keuntungan Sebenar (RM)</th>
+                                        <th>Jumlah Keuntungan (RM)</th>
                                         <th>Nilai Marhun (RM)</th>
                                         <th>Berat (g)</th>
                                     </tr>
@@ -213,12 +213,23 @@
         tablegadai.clear().draw();
         $.each(data,function(index,gadai){
                     total_pinjaman += Number(gadai['pinjaman']);
-                    total_upah12 += Number(gadai['upah12']);
                     total_nm += Number(gadai['nilaimarhun']);
                     total_berat += Number(gadai['berat']);
                     total_onepercent += Number(gadai['onepercent']*12);
                     total_ujrah += Number(gadai['ujrah']*12);
-
+                    
+                    if (gadai['tagbaru'] == 0) {
+                        
+                        var upah12 = gadai['upah12'];
+                        
+                    } else {
+                        
+                        var upah12 = gadai['ujrah']*12 + gadai['onepercent']*12;
+                        
+                    }
+                    
+                    total_upah12 += Number(upah12) ;
+                    
                     tablegadai.row.add([
                         counter,
                         gadai['nama'],
@@ -227,8 +238,8 @@
                         gadai['norujukan'],
                         formatter.format(gadai['pinjaman']),
                         formatter.format(gadai['ujrah']*12),
-                        formatter.format(gadai['onepercent']*12),                        
-                        formatter.format(gadai['upah12']),
+                        formatter.format(gadai['onepercent']*12),                                               
+                        formatter.format(upah12), 
                         formatter.format(gadai['nilaimarhun']),
                         formatter.format(gadai['berat'])
                     ]).draw();
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 546952d..4d0af3a 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -6,9 +6,11 @@
     <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>
@@ -398,19 +400,29 @@
             color: black;
             padding: 4px;
         }
+
+        .header-style {
+            display: flex;
+            justify-content: space-between;
+            align-items: center
+        }
+
+        .header-style span {
+            font-family: Arial, Helvetica, sans-serif;
+            text-align: right;
+            background-color: #d9deda;
+            color: black;
+            padding: 2px;
+            font-size: 10px;
+            border: 1px solid black;
+        }
     </style>
-
-    <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 Pelanggan</th>
-        </tr>
-    </table>
+    <div class="header-style">
+        <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <div>
+            <span><strong>Salinan Pelanggan</strong></span>
+        </div>
+    </div>
     <br>
     <table id="inside">
 
@@ -444,15 +456,7 @@
         </tr>
 
         <tr>
-            <td colspan="3">Nama Wakil </td>
-            <td>: @php
-                if (sizeof($wakil) != 0) {
-                    echo $wakil['nama'];
-                } else {
-                    echo '';
-                }
-            @endphp </td>
-            <td colspan="3"> </td>
+            <td colspan="7"> </td>
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
@@ -460,47 +464,33 @@
         </tr>
 
         <tr>
-            <td colspan="3">No K/P Wakil </td>
-            <td>: @php
-                if (sizeof($wakil) != 0) {
-                    echo $wakil['nokp'];
-                } else {
-                    echo '';
-                }
-            @endphp </td>
-            <td colspan="3"> </td>
+            <td colspan="7"> </td>
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
             @php
-            $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
-            $masa = date('H:i:s', $masa_bayaran);
+                $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+                $masa = date('H:i:s', $masa_bayaran);
             @endphp
             <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
 
-    <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
-    <table id="payment">
+    <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
+    <table id="payment" style="width: 50%">
         <tr>
-            <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>Ansuran Pembiyaan</td>
+            <td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
             </td>
         </tr>
         <tr>
-            <td style="width:30%"></td>
-            <td style="width:20%"></td>
-            <td style="width:30%">Keuntungan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['onepercent'], 2) }}</td>
+            <td>Keuntungan</td>
+            <td>: RM {{ number_format($transaction['onepercent'], 2) }}</td>
         </tr>
         <tr>
-            <td style="width:30%"></td>
-            <td style="width:20%"></td>
-            <td style="width:30%">Ujrah</td>
-            <td style="width:20%">: RM {{ number_format($transaction['ujrah'], 2) }}</td>
+            <td>Ujrah</td>
+            <td>: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
             <td></td>
@@ -512,19 +502,18 @@
             <td></td>
         </tr>
         <tr>
-            <td></td>
-            <td></td>
-            <td><strong>Jumlah Perlu Dibayar</strong></td>
+            <td style="font-size: 17px"><strong>Jumlah Perlu Dibayar</strong></td>
             @php
-            $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+                $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
             @endphp
             <td><strong>: RM {{ number_format($transaction['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;" id="inside">
-        Marhun: {{ $gadai['marhun'] }}
-    </p>
-    <br>
+    <table id="payment" style="border: none; margin-top:20px; width: 60%">
+        <tr>
+            <td>Marhun: {{ $gadai['marhun'] }}</td>
+        </tr>
+    </table>
     <br>
     <table id="semakan">
         <tr>
@@ -534,32 +523,23 @@
         </tr>
         <tr>
 
-            <td colspan="3">Pelanggan </td>
+            <td colspan="3">{{ $customers_info['nama'] }}</td>
             <td colspan="9"></td>
-            <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+            <td colspan="3">{{ Auth::user()->name }}</td>
         </tr>
     </table>
     <br>
     <br>
     <hr class="new2">
     </hr>
-
     <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>
-    </table>
-
+    <div class="header-style">
+        <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <div>
+            <span><strong>Salinan Pejabat</strong></span>
+        </div>
+    </div>
     <br>
     <table id="inside">
 
@@ -593,15 +573,7 @@
         </tr>
 
         <tr>
-            <td colspan="3">Nama Wakil </td>
-            <td>: @php
-                if (sizeof($wakil) != 0) {
-                    echo $wakil['nama'];
-                } else {
-                    echo '';
-                }
-            @endphp </td>
-            <td colspan="3"> </td>
+            <td colspan="7"> </td>
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
@@ -609,47 +581,33 @@
         </tr>
 
         <tr>
-            <td colspan="3">No K/P Wakil </td>
-            <td>: @php
-                if (sizeof($wakil) != 0) {
-                    echo $wakil['nokp'];
-                } else {
-                    echo '';
-                }
-            @endphp </td>
-            <td colspan="3"> </td>
+            <td colspan="7"> </td>
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
             @php
-            $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
-            $masa = date('H:i:s', $masa_bayaran);
+                $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+                $masa = date('H:i:s', $masa_bayaran);
             @endphp
             <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
 
-    <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
-    <table id="payment">
+    <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
+    <table id="payment" style="width: 50%">
         <tr>
-            <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>Ansuran Pembiyaan</td>
+            <td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
             </td>
         </tr>
         <tr>
-            <td style="width:30%"></td>
-            <td style="width:20%"></td>
-            <td style="width:30%">Keuntungan</td>
-            <td style="width:20%">: RM {{ number_format($transaction['onepercent'], 2) }}</td>
+            <td>Keuntungan</td>
+            <td>: RM {{ number_format($transaction['onepercent'], 2) }}</td>
         </tr>
         <tr>
-            <td style="width:30%"></td>
-            <td style="width:20%"></td>
-            <td style="width:30%">Ujrah</td>
-            <td style="width:20%">: RM {{ number_format($transaction['ujrah'], 2) }}</td>
+            <td>Ujrah</td>
+            <td>: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
             <td></td>
@@ -661,19 +619,18 @@
             <td></td>
         </tr>
         <tr>
-            <td></td>
-            <td></td>
-            <td><strong>Jumlah Perlu Dibayar</strong></td>
+            <td style="font-size: 17px"><strong>Jumlah Perlu Dibayar</strong></td>
             @php
-            $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+                $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
             @endphp
             <td><strong>: RM {{ number_format($transaction['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
-    <p style="float:left;position:absolute;margin-left:50px;" id="inside">
-        Marhun: {{ $gadai['marhun'] }}
-    </p>
-    <br>
+    <table id="payment" style="border: none; margin-top:20px; width: 60%">
+        <tr>
+            <td>Marhun: {{ $gadai['marhun'] }}</td>
+        </tr>
+    </table>
     <br>
     <table id="semakan">
         <tr>
@@ -683,9 +640,9 @@
         </tr>
         <tr>
 
-            <td colspan="3">Pelanggan </td>
+            <td colspan="3">{{ $customers_info['nama'] }}</td>
             <td colspan="9"></td>
-            <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+            <td colspan="3">{{ Auth::user()->name }}</td>
         </tr>
     </table>
     <table id="inside" style="width: 45%; margin-top:20px">
@@ -702,4 +659,15 @@
             <td>: RM {{ number_format($transaction['bakipelanggan'], 2) }}</td>
         </tr>
     </table>
+    <table id="semakan">
+        <tr style="visibility: hidden">
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+        </tr>
+    </table>
 </body>
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 9030924..011ab73 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -368,59 +368,58 @@ hr.new5 {
     color: black;
     padding:4px;
   }
+
+  .header-style{
+    display: flex;
+    justify-content: space-between;
+    align-items: center
+  }
+
+  .header-style span {
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: right;
+    background-color: #d9deda;
+    color: black;
+    padding: 2px;
+    font-size: 10px;
+    border: 1px solid black;
+  }
  
 </style>
 
 
-
-
-
-
-
-  <table>
-
-      <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>
+<div class="header-style">
+  <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+  <div>
+    <span><strong>Salinan Pelanggan</strong></span>
+  </div>
+</div>
 
 <br>
 
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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>{{ $gadai['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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp</td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp</td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
  </tr>
 
  <tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Masa Bayaran </td>
+@php
+    $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+    $masa = date('H:i:s', $masa_bayaran);
+@endphp
+<td>: {{ $masa }}</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
- </tr>
   </table>
   <br>
 
@@ -444,11 +443,24 @@ hr.new5 {
     <td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Tebus Keseluruhan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+    <td style="width:10px; font-size:17px"><b>Tebus Keseluruhan</b></td>
+    <td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
+  </tr>
+</table>
+<table id="payment" style="border: none; margin-top:20px; width:60%">
+  <tr>
+      <td>Marhun: {{ $gadai['marhun'] }}</td>
   </tr>
 </table>
-
 <br>
 
 
@@ -457,23 +469,18 @@ hr.new5 {
 
   <table id="semakan">
       <tr>
-      <td colspan="3">.................................................... </td> 
-      <td></td>    
       <td colspan="3">.................................................... </td>
       <td></td> 
       <td colspan="3">.................................................... </td>
       <td></td> 
       <td colspan="3">.................................................... </td>
 </tr>
-<tr>
-
-<td colspan="3">DiSemak </td> 
-      <td></td>    
-      <td colspan="3"> Cagaran Di Keluarkan</td>
+<tr> 
+      <td colspan="3"> {{ $khazanah_user->name }}</td>
       <td></td> 
-      <td colspan="3">Cagaran Diterima </td>
+      <td colspan="3"> {{ $customers_info['nama'] }} </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+      <td colspan="3">{{ Auth::user()->name }}</td>
 
 
 </tr>
@@ -483,45 +490,37 @@ hr.new5 {
   <hr class="new2"></hr>
 
 <br>
-<br>
 
 </table>
 
-
-<table id="cust">
-<tr>
-<th style="width:5px;"> Salinan Pejabat</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
-
-</tr>
-
-</table>
+<div class="header-style">
+  <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+  <div>
+    <span><strong>Salinan Pejabat</strong></span>
+  </div>
+</div>
 
 <br>
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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>{{ $gadai['norujukan'] }}</b> </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp</td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
 </tr>
 
-
-
 <tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> </td><td> </td>
-</tr>
-
-
-<tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td>  </td><td> </td><td> </td><td> </td>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Masa Bayaran </td>
+@php
+   $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+   $masa = date('H:i:s', $masa_bayaran);
+@endphp
+<td>: {{ $masa }}</td>
 </tr>
 </table>
 <br>
@@ -546,21 +545,32 @@ hr.new5 {
     <td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Tebus Keseluruhan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+  </tr>
+  <tr>
+    <td style="width:10px; font-size:17px"><b>Tebus Keseluruhan</b></td>
+    <td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
+  </tr>
+</table>
+
+
+<table id="payment" style="border: none; margin-top:20px; width:60%">
+  <tr>
+      <td>Marhun: {{ $gadai['marhun'] }}</td>
   </tr>
 </table>
 
 <br>
 
 
-
-
-
 <table id="semakan">
     <tr>
-    <td colspan="3">.................................................... </td> 
-    <td></td>    
     <td colspan="3">.................................................... </td>
     <td></td> 
     <td colspan="3">.................................................... </td>
@@ -569,15 +579,23 @@ hr.new5 {
 </tr>
 <tr>
 
-<td colspan="3">DiSemak </td> 
-    <td></td>    
-    <td colspan="3"> Cagaran Di Keluarkan</td>
+    <td colspan="3"> {{ $khazanah_user->name }}</td>
     <td></td> 
-    <td colspan="3">Cagaran Diterima </td>
+    <td colspan="3">{{ $khazanah_user->name }}</td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+    <td colspan="3">{{ Auth::user()->name }}</td>
 
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<table id="semakan">
+  <tr style="visibility: hidden">
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index 193f727..be83001 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -410,20 +410,29 @@
             color: black;
             padding: 4px;
         }
+
+        .header-style {
+            display: flex;
+            justify-content: space-between;
+            align-items: center
+        }
+
+        .header-style span {
+            font-family: Arial, Helvetica, sans-serif;
+            text-align: right;
+            background-color: #d9deda;
+            color: black;
+            padding: 2px;
+            font-size: 10px;
+            border: 1px solid black;
+        }
     </style>
-    <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 Pelanggan</th>
-        </tr>
-
-    </table>
-
+    <div class="header-style">
+        <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <div>
+            <span><strong>Salinan Pelanggan</strong></span>
+        </div>
+    </div>
     <br>
 
     <table id="inside">
@@ -470,7 +479,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $transaction_tebus['beza_tempoh'] }}</td>
+            <td>: {{ $gadai['tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -507,7 +516,9 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format(($transaction_tebus['onepercent'] - $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 +526,8 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format(($transaction_tebus['ujrah'] - $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>
@@ -527,13 +539,15 @@
             <td></td>
         </tr>
         <tr>
-            <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
+            <td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td>
+            <td style="font-size: 17px"><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
+        </tr>
+    </table>
+    <table id="payment" style="border: none; margin-top:20px; width: 60%">
+        <tr>
+            <td>Marhun: {{ $gadai['marhun'] }}</td>
         </tr>
     </table>
-    <p style="display: flex; margin: 20px 80px" id="inside">
-        Marhun: {{ $gadai['marhun'] }}
-    </p>
     <table id="semakan">
         <tr>
             <td colspan="3">.................................................... </td>
@@ -543,33 +557,26 @@
             <td colspan="3">.................................................... </td>
         </tr>
         <tr>
-            <td colspan="3"> Cagaran Di Keluarkan</td>
+            <td colspan="3"> {{ $khazanah_user->name }}</td>
             <td></td>
-            <td colspan="3">Pelanggan </td>
+            <td colspan="3">{{ $customers_info['nama'] }} </td>
             <td></td>
-            <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+            <td colspan="3">{{ Auth::user()->name }}</td>
 
 
         </tr>
     </table>
     <br>
-    <br>
     <hr class="new2">
 
     </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>
-
-    </table>
-
+    <div class="header-style">
+        <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <div>
+            <span><strong>Salinan Pejabat</strong></span>
+        </div>
+    </div>
     <br>
     <table id="inside">
 
@@ -615,7 +622,7 @@
             <td> </td>
             <td> </td>
             <td>Tempoh Simpan</td>
-            <td>: {{ $transaction_tebus['beza_tempoh'] }}</td>
+            <td>: {{ $gadai['tempoh'] }}</td>
         </tr>
 
         <tr>
@@ -653,7 +660,9 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format(($transaction_tebus['onepercent'] - $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 +670,8 @@
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format(($transaction_tebus['ujrah'] - $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>
@@ -673,14 +683,16 @@
             <td></td>
         </tr>
         <tr>
-            <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
+            <td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td>
+            <td style="font-size: 17px"><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
         </tr>
     </table>
 
-    <p style="display: flex; margin: 20px 80px" id="inside">
-        Marhun: {{ $gadai['marhun'] }}
-    </p>
+    <table id="payment" style="border: none; margin-top:20px; width: 60%">
+        <tr>
+            <td>Marhun: {{ $gadai['marhun'] }}</td>
+        </tr>
+    </table>
     <table id="semakan">
         <tr>
             <td colspan="3">.................................................... </td>
@@ -690,11 +702,11 @@
             <td colspan="3">.................................................... </td>
         </tr>
         <tr>
-            <td colspan="3"> Cagaran Di Keluarkan</td>
+            <td colspan="3">{{ $khazanah_user->name }}</td>
             <td></td>
-            <td colspan="3">Pelanggan </td>
+            <td colspan="3">{{ $customers_info['nama'] }} </td>
             <td></td>
-            <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+            <td colspan="3"> {{ Auth::user()->name }}</td>
 
 
         </tr>
@@ -713,4 +725,15 @@
             <td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td>
         </tr>
     </table>
+    <table id="semakan">
+        <tr style="visibility: hidden">
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+            <td></td>
+            <td colspan="3">.................................................... </td>
+        </tr>
+    </table>
 </body>
diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 03dce05..b11559d 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -231,7 +231,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
@@ -340,6 +340,21 @@ hr.new5 {
     padding:4px;
   }
  
+  .header-style{
+    display: flex;
+    justify-content: space-between;
+    align-items: center
+  }
+
+  .header-style span {
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: right;
+    background-color: #d9deda;
+    color: black;
+    padding: 2px;
+    font-size: 10px;
+    border: 1px solid black;
+  }
 </style>
 
 
@@ -348,68 +363,57 @@ hr.new5 {
 
 
 
-  <table>
-
-      <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>
+<div class="header-style">
+  <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+  <div>
+    <span><strong>Salinan Pelanggan</strong></span>
+  </div>
+</div>
 
 <br>
 
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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>{{ $gadai['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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
  </tr>
 
  <tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td></td><td> </td><td>Masa Bayaran </td>
+@php
+    $masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
+    $masa = date('H:i:s', $masa_bayaran);
+@endphp
+<td>: {{ $masa }} </td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
- </tr>
   </table>
   <br>
 
-<h1 style="float:left;position:absolute;margin-left:100px;">AT</h1>
+<h1 style="float:left;position:absolute;margin-left:100px;">PS</h1>
 
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pinjaman</td>
+    <td style="width:10px">Pembiayaan</td>
     <td style="width:5px"> </td>
     <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pinjaman</td>
+    <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"><b>Bayaran Upah</b></td>
+    <td style="width:10px">Bayaran Upah</td>
     <td style="width:5px"> </td>
     <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
   </tr>
@@ -419,22 +423,30 @@ hr.new5 {
     <td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Jumlah Bayaran</b></td>
+      <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:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+  </tr>
+</table>
+<table id="payment" style="border: none; margin-top:20px; width:55%">
+  <tr>
+      <td>Marhun: {{ $gadai['marhun'] }}</td>
   </tr>
 </table>
-
 <br>
 
 
-
-
-
   <table id="semakan">
       <tr>
-      <td colspan="3">.................................................... </td> 
-      <td></td>    
       <td colspan="3">.................................................... </td>
       <td></td> 
       <td colspan="3">.................................................... </td>
@@ -442,14 +454,11 @@ hr.new5 {
       <td colspan="3">.................................................... </td>
 </tr>
 <tr>
-
-<td colspan="3">DiSemak </td> 
-      <td></td>    
-      <td colspan="3"> Cagaran Di Keluarkan</td>
+      <td colspan="3"> {{ $khazanah_user->name }}</td>
       <td></td> 
-      <td colspan="3">Cagaran Diterima </td>
+      <td colspan="3">{{ $customers_info['nama'] }} </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+      <td colspan="3">{{ Auth::user()->name }}</td>
 
 
 </tr>
@@ -458,66 +467,56 @@ hr.new5 {
   <br>
   <hr class="new2"></hr>
 
-<br>
-<br>
-
 </table>
 
-
-<table id="cust">
-<tr>
-<th style="width:5px;"> Salinan Pejabat</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
-
-</tr>
-
-</table>
+<div class="header-style">
+  <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+  <div>
+    <span><strong>Salinan Pejabat</strong></span>
+  </div>
+</div>
 
 <br>
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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>{{ $gadai['norujukan'] }}</b> </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
 </tr>
 
-
-
 <tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> </td><td> </td>
-</tr>
-
-
-<tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td>  </td><td> </td><td> </td><td> </td>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td></td><td> </td><td>Masa Bayaran </td>
+@php
+  $masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
+  $masa = date('H:i:s', $masa_bayaran);
+@endphp
+<td>: {{ $masa }} </td>
 </tr>
 </table>
 <br>
 
-<h1 style="float:left;position:absolute;margin-left:100px;">AT</h1>
+<h1 style="float:left;position:absolute;margin-left:100px;">PS</h1>
 
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pinjaman</td>
+    <td style="width:10px">Pembiayaan</td>
     <td style="width:5px"> </td>
     <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pinjaman</td>
+    <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"><b>Bayaran Upah</b></td>
+    <td style="width:10px">Bayaran Upah</td>
     <td style="width:5px"> </td>
     <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
   </tr>
@@ -527,22 +526,30 @@ hr.new5 {
     <td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Jumlah Bayaran</b></td>
+      <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:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+  </tr>
+</table>
+<table id="payment" style="border: none; margin-top:20px; width:55%">
+  <tr>
+      <td>Marhun: {{ $gadai['marhun'] }}</td>
   </tr>
 </table>
-
 <br>
 
 
-
-
-
 <table id="semakan">
     <tr>
-    <td colspan="3">.................................................... </td> 
-    <td></td>    
     <td colspan="3">.................................................... </td>
     <td></td> 
     <td colspan="3">.................................................... </td>
@@ -551,15 +558,24 @@ hr.new5 {
 </tr>
 <tr>
 
-<td colspan="3">DiSemak </td> 
-    <td></td>    
-    <td colspan="3"> Cagaran Di Keluarkan</td>
+    <td colspan="3"> {{ $khazanah_user->name }}</td>
     <td></td> 
-    <td colspan="3">Cagaran Diterima </td>
+    <td colspan="3">{{ $customers_info['nama'] }} </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+    <td colspan="3">{{ Auth::user()->name }}</td>
 
 
 </tr>
 </table>
+<table id="semakan">
+  <tr style="visibility: hidden">
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+  </tr>
+</table>
 <br>
\ No newline at end of file
diff --git a/resources/views/print/sag_ujrah.blade.php b/resources/views/print/sag_ujrah.blade.php
index e4e82ea..941593d 100644
--- a/resources/views/print/sag_ujrah.blade.php
+++ b/resources/views/print/sag_ujrah.blade.php
@@ -7,8 +7,8 @@
     <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>
 
@@ -533,7 +533,6 @@
         </div>
         <div id="header_surat2" style="margin-left:20px">
             <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px;" alt="User Image" class="center">
-            <img src="{{ asset('img/pkb.png') }}" style="width:50px;" alt="User Image" class="center">
             @if ($gadai_detail['kodcaw'] == 'KB1')
                 <p style="margin-top:10px"><b>BORANG PEMBIAYAAN TAWARRUQ</b></p>
             @else
@@ -767,6 +766,11 @@
                             bersetuju untuk menggadaikan Marhun sebagai cagaran kepada harga komoditi mengikut
                             syarat-syarat pembiayaan dalam perjanjian ini.</td>
                     </tr>
+                    <tr>
+                        <td colspan="4">[ <span style="margin-right:10px"></span> ] Saya dengan ini bersetuju untuk
+                                menerima komoditi yang telah dijualkan
+                                kepada saya seperti dinyatakan di dalam SAG.</td>
+                    </tr>
 
                     <tr>
                         <td colspan="4"><b><u>AKAD WAKALAH</u></b></td>
@@ -775,14 +779,7 @@
                         <td colspan="4"><b>Pelanggan</b> :</td>
                     </tr>
                     <tr>
-                        <td colspan="1">(i)</td>
-                        <td colspan="3">Saya dengan ini bersetuju untuk menerima komoditi yang telah dijualkan
-                            kepada saya seperti dinyatakan di dalam SAG.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="1">(ii)</td>
-                        <td colspan="3">Berkenaan pilihan pengambilan komoditi, sila tandakan ( ✓ ) pada kotak yang
+                        <td colspan="4">Berkenaan pilihan pengambilan komoditi, sila tandakan ( ✓ ) pada kotak yang
                             berkenaan:</td>
                     </tr>
                     <tr>
@@ -794,10 +791,10 @@
                                 </tr>
                             </table>
                         </td>
-                        <td colspan="2">Saya bersetuju melantik PKB untuk menjual komoditi kepada pihak ketiga secara
+                        <td colspan="2">Saya bersetuju melantik KoPKB untuk menjual komoditi kepada pihak ketiga secara
                             tunai yang bersamaan dengan jumlah pembiayaan diberikan kepada saya. Saya dengan ini mengaku
-                            janji untuk membayar ganti rugi kepada PKB atas segala kerugian, kos, perbelanjaan atau
-                            kerosakan yang mungkin dialami atau ditanggung oleh PKB akibat memenuhi keperluan sebagai
+                            janji untuk membayar ganti rugi kepada KoPKB atas segala kerugian, kos, perbelanjaan atau
+                            kerosakan yang mungkin dialami atau ditanggung oleh KoPKB akibat memenuhi keperluan sebagai
                             wakil saya; Atau,</td>
                     </tr>
                     <tr>
@@ -873,7 +870,7 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">c.</td>
-                        <td colspan="2">Bagi Marhun yang mempunyai batu permata, pihak PKB akan mengasingkan batu
+                        <td colspan="2">Bagi Marhun yang mempunyai batu permata, pihak KoPKB akan mengasingkan batu
                             permata tersebut semasa penilaian emas dibuat atau pelanggan diberi hak untuk mengeluarkan
                             sendiri batu permata di mana-mana kedai yang difikirkan patut sebelum pembiayaan dilakukan.
                         </td>
@@ -882,7 +879,7 @@
                         <td colspan="1"></td>
                         <td colspan="1">d.</td>
                         <td colspan="2">Apa-apa kerosakan yang wujud hasil dari pengasingan batu permata dari
-                            marhun adalah bukan dibawah tanggungjawab PKB.</td>
+                            marhun adalah bukan dibawah tanggungjawab KoPKB.</td>
                     </tr>
                     <tr>
                         <td colspan="1"></td>
@@ -933,7 +930,7 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">i.</td>
-                        <td colspan="2">Membenarkan pihak PKB untuk mendedahkan apa-apa maklumat peribadi atau
+                        <td colspan="2">Membenarkan pihak KoPKB untuk mendedahkan apa-apa maklumat peribadi atau
                             dokumen berkenaan pembiayaan dan gadaian Marhun Pelanggan kepada mana-mana pihak ketiga yang
                             difikirkan wajar termasuk tetapi tidak terhad kepada:
                         </td>
@@ -949,7 +946,7 @@
                         <td colspan="1"></td>
                         <td colspan="1"></td>
                         <td colspan="1">ii.</td>
-                        <td colspan="1">Anak syarikat PKB dan/atau mana-mana syarikat di bawah kumpulan PKB; dan
+                        <td colspan="1">Anak syarikat KoPKB dan/atau mana-mana syarikat di bawah kumpulan KoPKB; dan
                         </td>
                     </tr>
                     <tr>
@@ -960,6 +957,9 @@
                             pembelian/penjualan komoditi.
                         </td>
                     </tr>
+                    <tr style="visibility: hidden">
+                        <td>-</td>
+                    </tr>
                 </table>
             </td>
         </tr>
@@ -972,7 +972,7 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">j.</td>
-                        <td colspan="2">Membenarkan kepada pihak PKB atau mana-mana ejen yang dilantik oleb PKB
+                        <td colspan="2">Membenarkan kepada pihak KoPKB atau mana-mana ejen yang dilantik oleb KoPKB
                             untuk membuka sampul/paket pembiayaan tanpa kehadiran Pelanggan untuk tujuan semakan emas.
                         </td>
                     </tr>
@@ -983,18 +983,18 @@
                             berdaftar, segala notis dan surat-menyurat hendaklah diserahkan melalui pos biasa di alamat
                             tersebut di atas atau alamat terkini yang dimaklumkan oleh Pelanggan melalui notis bertulis,
                             ataupun emel (SMS dan emel hendaklah dihantar ke nombor atau alamat emel yang disahkan oleh
-                            PKB).</td>
+                            KoPKB).</td>
                     </tr>
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">l.</td>
-                        <td colspan="2">Surat-menyurat adalah dianggap telah diserahkan oleh PKB kepada Pelanggan
+                        <td colspan="2">Surat-menyurat adalah dianggap telah diserahkan oleh KoPKB kepada Pelanggan
                             selepas tujuh (7) hari daripada tarikh penghantaran.</td>
                     </tr>
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">m.</td>
-                        <td colspan="2">PKB berhak menuntut Jumlah Pembiayaan dan Keuntungan setelah tamat tempoh
+                        <td colspan="2">KoPKB berhak menuntut Jumlah Pembiayaan dan Keuntungan setelah tamat tempoh
                             dinyatakan pada notis yang berkaitan.
                         </td>
                     </tr>
@@ -1008,12 +1008,12 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">o.</td>
-                        <td colspan="2">Tidak meminta PKB bertanggungjawab sekiranya PKB tidak dapat melaksanakan
+                        <td colspan="2">Tidak meminta KoPKB bertanggungjawab sekiranya KoPKB tidak dapat melaksanakan
                             keseluruhan atau sebahagian daripada mana-mana obligasinya di bawah SAG ini, disebabkan
                             secara langsung atau tidak langsung daripada kegagalan mana-mana alat mekanikal atau
                             elektronik, sistem pemprosesan data, talian penghantaran, kegagalan elektrik, pertikaian
                             industri, kerajaan, atau pihak berkuasa tempatan atau apa-apa mogok, kecurian, rompakan,
-                            boikot, sekatan, bencana alam, kekacauan sivil atau sebab di luar kawalan PKB.
+                            boikot, sekatan, bencana alam, kekacauan sivil atau sebab di luar kawalan KoPKB.
                         </td>
                     </tr>
                     <tr>
@@ -1022,14 +1022,14 @@
                         <td colspan="2">Menerima gantirugi Marhun di atas, dalam bentuk tunai berdasarkan nilai
                             Marhun pada masa barang tersebut ditaksirkan pada transaksi pembiayaan yang pertama setelah
                             ditolak segala kos berkaitan jika berlaku kehilangan dan tidak akan membuat apa-apa tuntutan
-                            terhadap PKB.
+                            terhadap KoPKB.
                         </td>
                     </tr>
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">q.</td>
                         <td colspan="2">PKB berhak menggabung dan menyatukan semua atau mana-mana akaun Pelanggan
-                            dengan liabiliti kepada PKB dan boleh menolak selesai (set-off), apa-apa jumlah tunggakan
+                            dengan liabiliti kepada KoPKB dan boleh menolak selesai (set-off), apa-apa jumlah tunggakan
                             selepas tamat tempoh notis termasuk kos-kos berkaitan seperti dinyatakan dalam SAG dengan
                             memberikan notis tujuh (7) hari kepada Pelanggan.
                         </td>
@@ -1039,7 +1039,7 @@
                         <td colspan="1">r.</td>
                         <td colspan="2">Menanggung rugi PKB sepenuhnya daripada dan terhadap apa-apa perbelanjaan
                             termasuk kos-kos guaman atas dasar peguam cara dan pelanggan, kehilangan, kerugian, tuntutan
-                            atau liabiliti (dimana jumlah dalam perakuan PKB akan, tanpa kesilapan yang nyata, dianggap
+                            atau liabiliti (dimana jumlah dalam perakuan KoPKB akan, tanpa kesilapan yang nyata, dianggap
                             sebagai muktamad) walau apa jua aspek sekalipun yang mungkin ditanggung atau dialami oleh
                             PKB akibat tuntutan oleh pihak ketiga berkaitan Marhun atau dalam menguatkuasakan atau dalam
                             usahanya menguatkuasakan bayaran-bayaran dan dalam menguatkuasakan Terma dan Syarat SAG ini.
@@ -1049,15 +1049,15 @@
                         <td colspan="1"></td>
                         <td colspan="1">s.</td>
                         <td colspan="2">Mengesahkan bahawa beliau telah membaca, memahami serta bersetuju dengan
-                            Notis Akta Perlindungan Data Peribadi 2010 sesawang rasmi PKB: www.pkb.net.my.
+                            Notis Akta Perlindungan Data Peribadi 2010 sesawang rasmi KoPKB: www.koppkb.com.
                         </td>
                     </tr>
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">t.</td>
-                        <td colspan="2">Memberi hak mutlak kepada PKB, atas budi bicara PKB dan tanpa notis lain
+                        <td colspan="2">Memberi hak mutlak kepada KoPKB, atas budi bicara KoPKB dan tanpa notis lain
                             kepada Pelanggan, untuk menjual, menyerah, menovasi dan/atau memindah hak dan kepentingan
-                            atas SAG ini, menurut sebarang transaksi yang mungkin dimeterai oleh PKB dan jika notis
+                            atas SAG ini, menurut sebarang transaksi yang mungkin dimeterai oleh KoPKB dan jika notis
                             pertu diberikan kepada Pelanggan menurut undang-undang, terma ini adalah notis yang
                             diperlukan itu dan memadai.
                         </td>
@@ -1083,7 +1083,7 @@
                         <td colspan="1"></td>
                         <td colspan="1">a.</td>
                         <td colspan="2">Jumlah Pembiayaan, Bayaran Keuntungan dan Bayaran Ujrah hendaklah dibayar
-                            pada Tarikh Matang (6 bulan). Walaubagaimanapun, pihak PKB atas budi bicara boleh
+                            pada Tarikh Matang (6 bulan). Walaubagaimanapun, pihak KoPKB atas budi bicara boleh
                             melanjutkan tempoh pembayaran balik kepada Tarikh Lanjutan (6 bulan) sekiranya Pelanggan
                             membayar jumlah keuntungan pertama pada Tarikh Matang (6 bulan)</td>
                     </tr>
@@ -1112,25 +1112,10 @@
                         </td>
                     </tr>
                     <tr>
-                        <td>KADAR KEUNTUNGAN (1%)</td>
+                        <td>KEUNTUNGAN (1%)</td>
                         <td>RM {{ number_format($gadai_detail['onepercent'] * 6, 2) }}</td>
                         <td>RM {{ number_format($gadai_detail['onepercent'] * 6, 2) }}</td>
                     </tr>
-                    <tr>
-                        <td>UJRAH (PENYIMPANAN MARHUN)</td>
-                        <td>RM {{ number_format($gadai_detail['ujrah'] * 6, 2) }}</td>
-                        <td>RM {{ number_format($gadai_detail['ujrah'] * 6, 2) }}</td>
-                    </tr>
-                    <tr>
-                        <td>JUMLAH YANG PERLU DIBAYAR</td>
-                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
-                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
-                    </tr>
-                    <tr>
-                        <td>JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL</td>
-                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
-                        <td>RM {{ number_format($gadai_detail['upah12'], 2) }}</td>
-                    </tr>
                 </table>
                 <table id="akad_pembiayaan">
                     <tr>
@@ -1148,7 +1133,7 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">a.</td>
-                        <td colspan="2">Marhun akan dilelong atau dijual. PKB akan membatalkan lelongan Marhun
+                        <td colspan="2">Marhun akan dilelong atau dijual. KoPKB akan membatalkan lelongan Marhun
                             sekiranya Pelanggan membayar tunggakan Pembiayaan, Keuntungan dan Ujrah sepenuhnya dua hari
                             sebelum tarikh lelongan.</td>
                     </tr>
@@ -1156,7 +1141,7 @@
                         <td colspan="1"></td>
                         <td colspan="1">b.</td>
                         <td colspan="2">Pelanggan hendaklah membayar jumlah terkurang daripada hasil lelongan atau
-                            jualan (jika ada), kos-kos tuntutan, dalam tempoh 14 hari daripada tarikh tuntutan oleh PKB
+                            jualan (jika ada), kos-kos tuntutan, dalam tempoh 14 hari daripada tarikh tuntutan oleh KoPKB
                             termasuk dan tidak terhad kepada kos lelongan, kos guaman serta kos yang berkaitan dengan
                             tindakan undang-undang yang akan diambil.</td>
                     </tr>
@@ -1170,7 +1155,7 @@
                     <tr>
                         <td colspan="1"></td>
                         <td colspan="1">d.</td>
-                        <td colspan="2">Setelah tamat tempoh empat belas (14) hari tersebut, PKB berhak untuk
+                        <td colspan="2">Setelah tamat tempoh empat belas (14) hari tersebut, KoPKB berhak untuk
                             mengambil apa-apa tindakan undang-undang yang difikirkan wajib bagi menuntut kos-kos yang
                             berkaitan atas kemungkiran Pelanggan seperti di para 3(b).</td>
                     </tr>
@@ -1178,7 +1163,7 @@
                         <td></td>
                         <td><b>4. </b></td>
                         <td colspan="2"><b>Pelanggan akan diberikan Ibra’ (Rebat) pada hari penyelesaian
-                                pembiayaan berdasarkan polisi dan prosedur semasa PKB yang akan dikira mengikut
+                                pembiayaan berdasarkan polisi dan prosedur semasa KoPKB yang akan dikira mengikut
                                 formula seperti berikut:-</b></td>
                     </tr>
                 </table>
@@ -1197,7 +1182,7 @@
                     <tr>
                         <td></td>
                         <td><b>5. </b></td>
-                        <td colspan="2"><b>PKB berhak mengambil apa-apa tindakan undang-undang termasuk untuk
+                        <td colspan="2"><b>KoPKB berhak mengambil apa-apa tindakan undang-undang termasuk untuk
                                 melelong atau menjual Marhun yang digadaikan sekiranya:</b></td>
                     </tr>
                     <tr>
@@ -1218,7 +1203,7 @@
                         <td colspan="1"></td>
                         <td colspan="1">c.</td>
                         <td colspan="2">Pelanggan melanggar mana-mana syarat dalam SAG ini dan apa-apa arahan
-                            PKB yang berkaitan dengannya dari masa ke masa.</td>
+                            KoPKB yang berkaitan dengannya dari masa ke masa.</td>
                     </tr>
                 </table>
             </td>
@@ -1279,22 +1264,25 @@
             </td>
         </tr>
     </table>
-    <table id="akad_pembiayaan">
+    <table id="akad_pembiayaan" style="text-transform: uppercase">
         <tr>
             <td colspan="4">Sekiranya Pelanggan mempunyai sebarang pandangan, pertanyaan atau
                 aduan, anda boleh menghubungi kami sebagaimana berikut:</td>
         </tr>
         <tr>
-            <td colspan="2">PERMODALAN KELANTAN BERHAD</td>
-            <td colspan="2">NO TEL :09-7414343</td>
+            <td></td>
         </tr>
         <tr>
-            <td colspan="2">TINGKAT 8 BANGUNAN KELANTAN TRADE CENTRE</td>
-            <td colspan="2">FAX :09-7414342</td>
+            <td colspan="2">PT 448, Tingkat 1, Batu 3</td>
+            <td colspan="2">NO TEL :09-7414331</td>
         </tr>
         <tr>
-            <td colspan="2">JALAN BAYAM,15200 KOTA BHARU KELANTAN</td>
-            <td colspan="2">EMAIL : pkb@pkb.net.my</td>
+            <td colspan="2">Jalan Kuala Krai, Wkaf Che Yeh</td>
+            <td colspan="2">FAX :09-7414330</td>
+        </tr>
+        <tr>
+            <td colspan="2">15150 Kota Bharu, Kelantan</td>
+            <td colspan="2">EMAIL : customercare@koppkb.com</td>
         </tr>
     </table>
     <div class='page-break'></div>
@@ -1310,7 +1298,6 @@
         </div>
         <div id="header_surat2" style="margin-left: 20px">
             <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px;" alt="User Image" class="center">
-            <img src="{{ asset('img/pkb.png') }}" style="width:50px;" alt="User Image" class="center">
             @if ($gadai_detail['kodcaw'] == 'KB1')
                 <p style="margin-top:10px"><b>BORANG PEMBIAYAAN TAWARRUQ</b></p>
             @else