diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 4c0a31c..b4cb26e 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -175,7 +175,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype"  value="nokp">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_ic" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -296,7 +296,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype" value="passport">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_passport" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -436,6 +436,7 @@
     });
 
     function verifycustomer(){
+        $("#terima_ic").prop('disabled', true);
         var customername = $('#name').val();
         var customeralamat = $('#alamat').val();
         var customerposkod = $('#poskod').val();
@@ -443,6 +444,7 @@
         var customerphone_alternate = $('#alternate_phone').val();
         var age = $('#age').val();
         if(age < 18){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -452,6 +454,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -461,6 +464,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -470,6 +474,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -479,6 +484,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -488,6 +494,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -499,6 +506,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -508,6 +516,7 @@
             return false;
         }else{
             if((customerphone.length < 9 || customerphone.length >= 12)){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -517,6 +526,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -529,6 +539,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length < 8 && customerphone_alternate.length > 12){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -538,6 +549,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -552,6 +564,7 @@
     }
 
     function verifycustomerpassport(){
+        $("#terima_passport").prop('disabled', true);
         var customername = $('#passport_name').val();
         var customeralamat = $('#passport_alamat').val();
         var customerposkod = $('#passport_poskod').val();
@@ -561,6 +574,7 @@
         var age = $('#passport_age').val();
 
         if(age < 18){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -570,6 +584,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -579,6 +594,7 @@
             return false;
         }
         if(tarikh_lahir == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -588,6 +604,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -597,6 +614,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -606,6 +624,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -615,6 +634,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -626,6 +646,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -635,6 +656,7 @@
             return false;
         }else{
             if(customerphone.length <= 9 || customerphone.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -644,6 +666,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -656,6 +679,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length <= 8 && customerphone_alternate.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -665,6 +689,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index ad42b14..180fde8 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -92,7 +92,7 @@
                             <b>No Telefon</b>
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] }}">
+                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}">
                         </div>
                     </div>
 
@@ -248,7 +248,7 @@
                                     No KP
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] }}" class='form-control'>
+                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -264,7 +264,7 @@
                                     No Telefon 1
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] }}" class='form-control'>
+                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon" style="color:red;"></span>
                                 </div>
                             </div>
@@ -273,7 +273,7 @@
                                     No Telefon 2
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] }}" class='form-control'>
+                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon2" style="color:red;"></span>
                                 </div>
                             </div>
@@ -310,7 +310,7 @@
                                     Alamat
                                 </div>
                                 <div class='col-md-8'>
-                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] }}</textarea>
+                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] ? $customer_info['alamat1'] : 'NIL' }}</textarea>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -318,7 +318,7 @@
                                     Poskod
                                 </div>
                                 <div class='col-md-8'>
-                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] }}" class='form-control'>
+                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] ? $customer_info['poskod'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -328,9 +328,12 @@
                                 <div class='col-md-8'>
                                     @php
                                         $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+                                        if(sizeof($poskod) < 1 || sizeof($poskod) > 1){
+                                            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+                                        }
                                         $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
                                     @endphp
-                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
+                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -341,7 +344,7 @@
                                     @php
                                         $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
                                     @endphp
-                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
+                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -699,7 +702,7 @@
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
-                                gadai_detail['t_matang1'],
+                                gadai_detail['t_matang'],
                                 'RM '+ formatter.format(gadai_detail['bakihargajualan']),
                                 'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 53c90eb..7f5eed3 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -553,11 +553,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }
@@ -647,11 +642,6 @@
                                     'nilai_marhun' : nilai_marhun
                                 },
                                 success:function(data){
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -748,11 +738,6 @@
                                 'nilai_marhun' : nilai_marhun
                             },
                             success:function(data){
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 19e27b9..9984860 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -509,11 +509,6 @@
                                 success:function(data){
                                     $("#tambah_marhun").prop('disabled', false);
                                     $("#terima_marhun").prop('disabled', false);
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -625,11 +620,6 @@
                             success:function(data){
                                 $("#tambah_marhun").prop('disabled', false);
                                 $("#terima_marhun").prop('disabled', false);
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
@@ -1131,11 +1121,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }
diff --git a/resources/views/not_assign.blade.php b/resources/views/not_assign.blade.php
index 24016f5..b6be251 100644
--- a/resources/views/not_assign.blade.php
+++ b/resources/views/not_assign.blade.php
@@ -84,7 +84,7 @@
             </form>
             <div class="content">
                 <div class="title m-b-md">
-                    Khazanah Belum Menugaskan Jawatan Harian
+                    Kakitangan Belum Disahkan Lagi
                 </div>
             </div>
         </div>
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 71e36e6..7f1d076 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -246,7 +246,7 @@
                             <div class="col-6">
                                 <div class="form-group row" id="divbayaran">
                                     <div class="col-4">
-                                       BAYARAN PEMBIAYAAN(RM)
+                                       BAYARAN PELANGGAN(RM)
                                     </div>
                                     <div class="col-8">
                                         <input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
@@ -373,6 +373,7 @@
     $('#divhargaemassemasa').hide();
     $('#divperludibayartawarruq').hide();
     $('#divbayarantawarruq').hide();
+    $('#divbayaran').hide();
 
 
     var array_recno = [];
@@ -721,9 +722,9 @@
                 $('#divhargaemassemasa').hide();
                 $('#divperludibayartawarruq').hide();
                 $('#divbayarantawarruq').hide();
+                $('#divbayaran').hide();
 
                 $('#divtelahdibayar').show();
-                $('#divbayaran').show();
                 $('#divperludibayar').show();
 
                 tebusan();
@@ -748,9 +749,9 @@
                 $('#divbayarantawarruq').hide();
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
-                $('#divperludibayar').show();
+                $('#divperludibayar').hide();
 
-                $('#perludibayar').val(formatter.format(jumupah));
+                $('#bayaran').val(formatter.format(jumupah));
 
                 break;
 
@@ -992,6 +993,7 @@
     function bayaransemua()
     {
         $("#terima_transaksi").prop('disabled', true);
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         if($('#sltjenistebus').find(":selected").val() == 'T'){
         
             var adadah = false;
@@ -1128,7 +1130,17 @@
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
             var bayar = $('#bayaran').val();
-            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
+            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+
+            if(bayar < jumupah){
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire(
+                    'Amaran!',
+                    'Bayaran tidak boleh kurang dari kos keuntungan semasa',
+                    'error'
+                )
+                return false;
+            }
 
             if(bayar >  bakipinjam){   
                 $("#terima_transaksi").prop('disabled', false);
diff --git a/resources/views/print/resitadvansur.blade.php b/resources/views/print/resitadvansur.blade.php
index 2167d75..6a5659a 100644
--- a/resources/views/print/resitadvansur.blade.php
+++ b/resources/views/print/resitadvansur.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:10px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 941a371..b17a935 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -8,8 +8,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>
 <style>
@@ -77,22 +77,6 @@ hr.new5 {
   margin-right: 0;
 }
 
-
-
-
-</style>
-
-
-
-
-
-
-
-
-
-
-
-<style>
   hr.new1 {
     border-top: 1px dotted black;
   }
@@ -247,7 +231,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +240,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
@@ -399,7 +383,7 @@ hr.new5 {
   <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>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
  </tr>
  <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
@@ -493,7 +477,7 @@ hr.new5 {
 <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>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
 </tr>
 <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 00d15af..5f3ffa4 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index f6c5ea4..6b2e8cf 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 737529e..451287e 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index c88c4de..bbfa8fb 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index fa6d84f..62c1b52 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -8,7 +8,7 @@
 <script>
     $(document).ready(function () {
       window.print();
-      // window.onfocus=function(){ window.close();}
+      window.onfocus=function(){ window.close();}
     });
 </script>
 
@@ -26,6 +26,14 @@
     margin-top: -70px;
   }
 
+  .khazanah-copy{
+    border:1px solid black;
+    padding:10px;
+    width : 250px;
+    font-size:11px;
+    margin-left: 200px;
+  }
+
   #customers {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
@@ -68,7 +76,7 @@
   .grid-container {
     display: grid;
     grid: 80px / 33% 33% 33%;
-    padding: 10px;
+    padding: 10px 10px 0px 10px;
   }
 
   #customers td, #customers th {
@@ -414,7 +422,6 @@
       {!! QrCode::size(60)->generate($pembayaran_segera); !!}
       <p class="bottomright"><b>SALINAN PELANGGAN</b></p>
     </div>
-
   </div>
   
   <table style="margin-bottom:10px;" id="perjanjian">
@@ -424,8 +431,8 @@
     <tr>
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
-      <td>NO SAG </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td><b>NO SAG</b> </td>
+      <td style="font-size:12px"><b>{{$gadai_detail['norujukan']}}</b></td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -450,14 +457,26 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(sizeof($poskod) < 1 || sizeof($poskod) > 1){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+          if($negeri){
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
-      <td>NILAI PEMBIAYAAN</td>
-      <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
+      <td><b>NILAI PEMBIAYAAN</b></td>
+      <td><b>RM {{ number_format($gadai_detail['pinjaman'],2) }}</b> </td>
     </tr>
     <tr>
       <td>NO TELEFON</td>
@@ -465,11 +484,23 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td><b>UPAH SEBULAN</b></td>
+      <td><b>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </b></td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="transaksi_twq">
     <tr>
-      <th  colspan="4"> TRANSAKSI TAWARRUQ</th>
+      <th  colspan="3"> TRANSAKSI TAWARRUQ</th>
+      <th>Setuju</th>
     </tr>
     <tr>
       <td rowspan="2"> 1</td>
@@ -477,7 +508,7 @@
       <td rowspan="2">
         Saya bersetuju dan dengan ini membeli komoditi daripada PKB pada Harga Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana yang dinyatakan di dalam sijil pembekal komoditi mengikut kadar jumlah pembiayaan yang diberikan kepada saya.
       </td>
-      <td rowspan="2"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="2"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
     <tr></tr>
     <tr>
@@ -486,7 +517,7 @@
       <td rowspan="1">
         Saya bersetuju untuk menggadaikan Marhun sebagai cagaran kepada harga komoditi.
       </td>
-      <td rowspan="1"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="1"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
   </table>
 
@@ -498,33 +529,29 @@
 
   <table style="margin-bottom:10px;" id="keuntungan">
     <tr>
-      <th colspan="3">MAKLUMAT SIJIL KOMODITI </th>
+      <th colspan="6">MAKLUMAT SIJIL KOMODITI </th>
     </tr>
     <tr>
       <td>1</td>
       <td>Nombor Sijil</td>
       <td>{{ $komuditi['no_sijil'] }}</td>
-    </tr>
-    <tr>
-      <td>2</td>
-      <td>Kod Produk / Diskripsi</td>
-      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
-    </tr>
-    <tr>
-      <td>3</td>
-      <td>Unit</td>
-      <td>{{ $product['unit'] }}</td>
-    </tr>
-    <tr>
       <td>4</td>
       <td>Kuantiti</td>
       <td>{{ $kuantiti }}</td>
     </tr>
     <tr>
+      <td>2</td>
+      <td>Kod Produk / Diskripsi</td>
+      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
       <td>5</td>
       <td>Nilai</td>
       <td>{{ 'RM ' . number_format($gadai_detail['pinjaman'],2) }}</td>
     </tr>
+    <tr>
+      <td>3</td>
+      <td>Unit</td>
+      <td colspan ="4">{{ $product['unit'] }}</td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="keuntungan">
@@ -538,7 +565,7 @@
     </tr>
     <tr>
       <td>TARIKH AKHIR BAYARAN</td>
-      <td style="text-align: center;"> 
+      <td style="text-align: center; font-weight: bold;"> 
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -555,7 +582,7 @@
     </tr>
     <tr>
       <td>JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</td>
-      <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
+      <td style="text-align: center; font-weight: bold;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
       <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
     </tr>
     <tr>
@@ -651,9 +678,9 @@
       <th colspan="2">TANDATANGAN SAKSI</th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -709,7 +736,7 @@
     </tr>
     <tr>
       <td> 1.</td>
-      <td colspan="6"> Sesrorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
+      <td colspan="6"> Seorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
     </tr>
     <tr>
       <td> 2.</td>
@@ -848,7 +875,7 @@
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
       <td>NO SAG </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td style="font-size:12px">{{$gadai_detail['norujukan']}}</td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -873,10 +900,22 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(sizeof($poskod) < 1 || sizeof($poskod) > 1){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+          if($negeri){
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
       <td>NILAI PEMBIAYAAN</td>
@@ -888,6 +927,17 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td>UPAH SEBULAN</td>
+      <td>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </td>
+    </tr>
   </table>
   <br>
 
@@ -994,9 +1044,9 @@
       <th colspan="2">TANDATANGAN SAKSI </th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -1053,7 +1103,7 @@
     <table>
       <tr>
         <td>No SAG</td>
-        <td>{{ $gadai_detail['norujukan'] }}</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
       </tr>
       <tr>
         <td>Nama</td>
@@ -1077,7 +1127,13 @@
       </tr>
       <tr>
         <td>Marhun</td>
-        <td>{{ $gadai_detail['marhun'] }}</td>
+        <td>
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
       </tr>
     </table>
     <br>
@@ -1149,7 +1205,109 @@
       </table>
     </div>
   </div>
-  <div class='page-break'>  </div>
+  <div class="khazanah-copy">
+    <div style="text-align:center;">
+      @php
+        echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG($gadai_detail['norujukan'], 'C128',1,40) . '" alt="barcode"   />';
+      @endphp
+    </div>
+    <br>
+    <table>
+      <tr>
+        <td>No SAG</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
+      </tr>
+      <tr>
+        <td>Nama</td>
+        <td>{{ $customer_detail['nama'] }}</td>
+      </tr>
+      <tr>
+        <td>No K/P</td>
+        <td>{{ $gadai_detail['nokp'] }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Marhun</td>
+        <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Pembiayaan</td>
+        <td>RM {{ number_format($gadai_detail['pinjaman'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Berat (g)</td>
+        <td>{{ $gadai_detail['berat'] }}</td>
+      </tr>
+      <tr>
+        <td>Marhun</td>
+        <td>
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
+      </tr>
+    </table>
+    <br>
+    <div id="khazanahtable">
+      <table class="table_table" style="border: 1px solid black;">
+        <thead>
+          <tr>
+            <th class="table_th" colspan="3">Ujian</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="table_td" colspan="2">Mutu</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Ketumpatan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Peratus (%)</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Kunci/Emas</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Batu Hitam/Asid</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Digital Caliper</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Precious Metel Verifier</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Magnet</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Saya sahkan telah menyemak fizikal saiz, berat dengan teliti mengikut SOP penilai</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td">
+              @if($gadai_detail['penilai'] == '')
+                {{ $auth_username }}
+              @else
+                {{ $gadai_detail['penilai'] }}
+              @endif
+            </td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
   <div class='page-break'>  </div>
   <div class="grid-container">
     <div id="header_surat1">