diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 69e12a0..16ba31c 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -811,8 +811,8 @@
             }
         });
 
-        if(bakiakhir < pinjaman)
-        {
+        if(bakiakhir < pinjaman){
+            $("#terima_gadai").prop('disabled', false);
             Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -941,7 +941,6 @@
                                             $(func).submit();
                                             return true;
                                         });
-
                                     }
                                     else if(data.kelulusan == 'batal')
                                     {
@@ -955,12 +954,7 @@
                                         });
                                     }
                                 }
-
-
-
                             });
-
-
                         } else if (result.dismiss === Swal.DismissReason.cancel){
                             swalWithBootstrapButtons.fire(
                                 'Batal',
@@ -1093,8 +1087,6 @@
                     return true;
                 }
             }
-            
-
         }
     }
 </script>
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 2541b72..e03324d 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -652,14 +652,13 @@
         });
 
 
-        if(bakiakhir < pinjaman)
-        {
+        if(bakiakhir < pinjaman){
+            $("#terima_gadai").prop('disabled', false);
             Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
                     text: 'Baki Akhir Tunai Lebih Rendah Daripada Nilai Marhun Yang Ingin Digadaikan. Sila Tambah Pendahuluan di Laman Aliran Tunai Segera. '
             });
-
             event.preventDefault();
             return false;
         }else{
diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php
index 70bcf0d..81d0d16 100644
--- a/resources/views/operasi/komuditi/index.blade.php
+++ b/resources/views/operasi/komuditi/index.blade.php
@@ -39,7 +39,7 @@
                         </div>
                     </div>
                     <div class="row justify-content-center" id="tiada_komuditi">
-                        <div class="col-12">
+                        <div class="col-12 text-center">
                             <p>Tiada Komoditi</p>
                         </div>
                     </div>
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 6b33373..90afd32 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1145,21 +1145,21 @@
                         success:function(data){
                             console.log(data);
                         }, error: function(xhr, status, error) {
-                                    var err = eval("(" + xhr.responseText + ")");
-                                    alert(xhr.responseText);
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
                         }
                     });
 
                     var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
                     urlroute = urlroute.replace(':id', norujukan);
                     Swal.fire(
-                    'Berjaya!',
-                    'Tebus Separuh Berjaya',
-                    'success'
-                ) .then(function() {
-                    window.open(urlroute, '_blank');
-                    window.location.replace("{{ url()->previous() }}");
-                })
+                        'Berjaya!',
+                        'Tebus Separuh Berjaya',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{ url()->previous() }}");
+                    })
                 },error: function (request, status, error) {
                     console.log(request.responseText);
                 }
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index ae85cec..84deb83 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php
index 2681be5..e6c8ef9 100644
--- a/resources/views/print/resitansuransebelum.blade.php
+++ b/resources/views/print/resitansuransebelum.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index b57d4f1..4cfd739 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 5cc8c85..19b0cf5 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index c566ee6..9a1a141 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index 181413c..cb242ba 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
@@ -420,7 +425,6 @@ hr.new5 {
 
 
 <table id="payment">
-
 <tr>
 <td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
@@ -437,7 +441,10 @@ hr.new5 {
   <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
+  </tr>
+  <tr>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
   </tr>
 
 
@@ -522,7 +529,6 @@ hr.new5 {
 
 
 <table id="payment">
-
 <tr>
 <td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
@@ -530,17 +536,21 @@ hr.new5 {
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }}</td>
 </tr>
 <tr>
-<td style="width:10px">Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }}</td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
 </tr>
 <tr>
   <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
   </tr>
+  <tr>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
+  </tr>
+
 
 </table>
 
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index c566ee6..9a1a141 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -6,7 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <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();}
+    });
+</script>
 <style>
 /* Red border */
 hr.new1 {
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index 8c6abf8..171c2c4 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.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>
 
 <style>
@@ -1091,7 +1091,13 @@
     <table>
       <tr>
         <td>Penilai</td>
-        <td>{{ $gadai_detail['penilai'] }}</td>
+        <td>
+          @if($gadai_detail['penilai'] == '')
+            {{ $auth_username }}
+          @else
+            {{ $gadai_detail['penilai'] }}
+          @endif
+        </td>
       </tr>
       <tr>
         <td>Tarikh Gadai</td>