diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 810ba9e..e756f2b 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -98,6 +98,7 @@ class AliranTunaiController extends Controller
             $GT = $GT[0];
         }
 
+
         $api_url = config('api.url');
 
         $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
@@ -105,6 +106,7 @@ class AliranTunaiController extends Controller
         $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
 
 
+
            //******************* INITIALIZE LEJER AM START HERE****************************//
 
 
@@ -480,16 +482,15 @@ class AliranTunaiController extends Controller
                 }
                 else
                 {
-  
+
                   //$glejer=$getGLedjer[0];
                   $jumlahSemalam_Upah=$getGLedjer_Upah[0]['jumlah'];
                   $hariIniSemalam_Upah=$getGLedjer_Upah[0]['hariini'];
                   $jumlah_Upah=$jumlahSemalam_Upah+$hariIniSemalam_Upah;
 
-                  
+               
                 }
 
-
              $jumlahBulan_ini_Upah=0.0;
              $get_GlejerBulan_Tahun_Upah=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KOD_Upah])->json();
         
@@ -1051,6 +1052,16 @@ class AliranTunaiController extends Controller
 
           //************************  END LEJER AM**********************************
 
+
+
+
+
+
+
+
+
+
+
         return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki'));
     }
 
@@ -1200,4 +1211,23 @@ class AliranTunaiController extends Controller
 
         return view('aliran_tunai.laporan.laporanserahan',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller'));
     }
+
+    public function kemaskiniupah(Request $request)
+    {
+        $auth_user = Auth::user();
+
+        $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
+
+        $requestupah = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+        $requestalirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
+
+        $upah = $requestupah['baki'];
+        $alirantunaisemasa = $requestalirantunai['baki'];
+
+        $totalalirantunai = floatval($upah) + floatval($alirantunaisemasa);
+
+        return response($totalalirantunai);
+    }
+
+
 }
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 900e7f8..54d3e0a 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -565,10 +565,15 @@ class GadaianController extends Controller
                         "norujukan" => $history
                 ])->json();
 
-                array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
-
                 if(sizeof($gadai) > 0)
-                $history = $gadai[0][0]['historygadaian'];
+                {
+                    if($history == $gadai[0][0]['historygadaian'])
+                        $history = 0;
+                    else{
+                        array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''), "pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
+                        $history = $gadai[0][0]['historygadaian'];
+                    }
+                }
     
             $count++;
 
@@ -580,7 +585,7 @@ class GadaianController extends Controller
                 ])->json();
 
 
-                array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
+                array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''),"pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
                 break;
             }
         }
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 1779a0a..2a197bd 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -227,7 +227,7 @@ class KhazanahController extends Controller
     
     public function barcodescannedtebus(Request $request)
     {
-      
+
 
         $auth_user = Auth::user();
 
@@ -272,8 +272,7 @@ class KhazanahController extends Controller
  
           $jum_bayaran=Http::get(config('api.url').'/api/transaction/one/'.$request->norujukan_barcode)->json();
           $jumlah_bayaran=$jum_bayaran['duit_masuk'];
- 
- 
+
    
  
        //tarikh tawawruqq
@@ -445,7 +444,7 @@ class KhazanahController extends Controller
  
                           $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
                          $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-                         $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
+                         $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
                      
                          $hariini_untung=$get_lejer_Untung[0]['hariini'];
                          $kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -458,7 +457,7 @@ class KhazanahController extends Controller
                          $hariini_untung=$debit_untung-$kredit_untung;
                          $kelmarin_untung=$jumlah_untung-$hariini_untung;
  
-                         $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+                         $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
                          'recno'=>$recno_untung,
                          'debit'=>$debit_untung,
                          'kredit'=>$kredit_untung,
@@ -467,10 +466,10 @@ class KhazanahController extends Controller
  
                         ]);
  
-                         $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan)->json();
+                         $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
                          $jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
  
-                         $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_BP])->json();    
+                         $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();    
                          $hariini_bp= $get_lejerBayaran_Pendahuluan[0]['hariini'];
                          $kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
                          $jumlah_bp= $get_lejerBayaran_Pendahuluan[0]['jumlah'];
@@ -482,7 +481,7 @@ class KhazanahController extends Controller
                          $hariini_bp=$debit_bp-$kredit_bp;
                          $kelmarin_bp=$jumlah_bp-$hariini_bp;
  
-                                 $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+                                 $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
                                  'recno'=>$recno_bp,
                                  'debit'=>$debit_bp,
                                  'kredit'=>$kredit_bp,
@@ -505,7 +504,7 @@ class KhazanahController extends Controller
              {
                  $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
  
-
+ 
          //KIRAAN LEJER AM UNTUK PENEBUSAN S
  
                  $get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
@@ -535,6 +534,7 @@ class KhazanahController extends Controller
  
                  ]);
  
+ 
                  $get_lejerPinjaman=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_Pembiayaan])->json();
  
                  $hariIni_Pinjaman=$get_lejerPinjaman[0]['hariini'];
@@ -559,7 +559,7 @@ class KhazanahController extends Controller
  
              $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
              $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-             $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
+             $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
  
              $hariini_untung=$get_lejer_Untung[0]['hariini'];
              $kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -572,7 +572,7 @@ class KhazanahController extends Controller
              $hariini_untung=$debit_untung-$kredit_untung;
             $kelmarin_untung=$jumlah_untung-$hariini_untung;
  
-           $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+           $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
              'recno'=>$recno_untung,
              'debit'=>$debit_untung,
              'kredit'=>$kredit_untung,
@@ -585,7 +585,7 @@ class KhazanahController extends Controller
          $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
          $jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
  
-         $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_BP])->json();
+         $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();
  
          $hariini_bp=$get_lejerBayaran_Pendahuluan[0]['hariini'];
          $kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
@@ -598,7 +598,7 @@ class KhazanahController extends Controller
          $hariini_bp=$debit_bp-$kredit_bp;
          $kelmarin_bp=$jumlah_bp-$hariini_bp;
  
-         $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+         $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_cawangan['cawangan'],[
          'recno'=>$recno_bp,
          'debit'=>$debit_bp,
          'kredit'=>$kredit_bp,
@@ -639,7 +639,7 @@ class KhazanahController extends Controller
           
               ]);
               
-        
+          
               $get_lejerPinjaman=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_Pembiayaan])->json();
  
               $hariIni_Pinjaman=$get_lejerPinjaman[0]['hariini'];
@@ -664,7 +664,7 @@ class KhazanahController extends Controller
   
                        $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
                        $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-                       $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
+                       $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
                          
                              $hariini_untung=$get_lejer_Untung[0]['hariini'];
                              $kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -676,7 +676,7 @@ class KhazanahController extends Controller
                              $hariini_untung=$debit_untung-$kredit_untung;
                              $kelmarin_untung=$jumlah_untung-$hariini_untung;
               
-                             $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+                             $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
                              'recno'=>$recno_untung,
                              'debit'=>$debit_untung,
                              'kredit'=>$kredit_untung,
@@ -687,7 +687,7 @@ class KhazanahController extends Controller
                   
                   $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
                   $jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
-                  $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>   $KOD_BP])->json();
+                  $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>   $KOD_BP])->json();
                     
                   $hariini_bp= $get_lejerBayaran_Pendahuluan[0]['hariini'];
                   $kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
@@ -700,7 +700,7 @@ class KhazanahController extends Controller
                   $hariini_bp=$debit_bp-$kredit_bp;
                   $kelmarin_bp=$jumlah_bp-$hariini_bp;
  
-                 $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
+                 $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
                  'recno'=>$recno_bp,
                  'debit'=>$debit_bp,
                  'kredit'=>$kredit_bp,
@@ -724,8 +724,58 @@ class KhazanahController extends Controller
          // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
         //masuk dalam tunai aliran
    
+ 
         return $this->tebus();
 
+
+
+
+
+
+
+
+
+       
+    }
+
+    //END KHAZANAH FARIS
+
+    public function pendahuluanserah($id)
+    {
+
+        $array_reqteller = [];
+
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+        $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
+        
+
+        foreach($reqTeller as $index=>$req)
+        {
+            if($id == $req['no'])
+                array_push($array_reqteller,["teller" => $req]);         
+        }
+
+        $array_reqteller = $array_reqteller[0]['teller'];
+
+        $listUser=User::where('cawangan',$auth_user['cawangan'] )->get();
+        $denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        else
+        {
+            $denominasi=$denominasi[0];
+        }
+        
+
+        return view('khazanah.pendahuluanserah',compact('cawangan_info','api_url','listUser','denominasi','array_reqteller'));
     }
 
 
@@ -1185,10 +1235,10 @@ class KhazanahController extends Controller
             'bakiakhir' => $bakiakhir
         ]);
             
-  //************KIRAAN LEJER AM BERMULA ***/
-  $pembiayaan_tawaruq='1000/017';
-  $GL_Untung_Tangguh='1000/211';
-  $GL_Untung_Suspense='2000/007';
+        //************KIRAAN LEJER AM BERMULA ***/
+        $pembiayaan_tawaruq='1000/017';
+        $GL_Untung_Tangguh='1000/211';
+        $GL_Untung_Suspense='2000/007';
 
         $getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json();     
         $glcode=$getProduct[0]['glcode'];
@@ -1196,6 +1246,8 @@ class KhazanahController extends Controller
         $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$glcode])->json();
         $keterangan=$get_GLCode[0]['descpt'];
         $acctype=$get_GLCode[0]['acttype'];
+
+
       $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode])->json();
       if(sizeof($get_lejer)>0)
        {
@@ -2327,6 +2379,8 @@ class KhazanahController extends Controller
             ])->json();
 
         }else{
+
+           
             $pendahuluanserahan = Http::put(config('api.url').'/api/UpdateVaultPendahuluanSerahan/'. $auth_user['cawangan'],[
                 'jenispendahuluanserahan' => $request->jenisgldetail,
                 'amaun' => $request->amaun,
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 1d4fa15..f75358a 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -124,7 +124,7 @@
                     <div class="card-body">
 
 
-                        <a href="{{ route('laporan.serahanteller') }}" class="btn btn-primary">Teller Serahan</a>
+                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right" disabled>Kemaskini</button>
                         <nav>
                             <div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
                               <a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
@@ -235,11 +235,11 @@
     var tabletuntutbaki = $('#tabletuntutbaki').DataTable({
     //   "scrollX": true
     });
+    var tele = "{{ $auth_user['name'] }}";
 
     $(document).ready( function () {
         var api = '{{ $api_url }}';
         var kodcaw = "{{ $auth_user['cawangan'] }}";
-        var tele = "{{ $auth_user['name'] }}";
 
         function getData(){
             $.ajax({
@@ -284,6 +284,19 @@
         });
     }
 
+    function kemaskiniupah()
+    {
+        $.ajax({
+                type: 'get',
+                url: "{{ route('kemaskini.upah') }}",
+                data: { "namateller" : tele },
+                success: function(data){
+                    console.log(data);
+                }
+            });
+
+    }
+
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let laporanroute = "{{ route('laporan.serahanteller') }}";
 </script>
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index d8615a5..ae4d958 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -713,8 +713,6 @@
         var counter = 1;
         historytebusbayaran.clear().draw();
 
-        console.table(data);
-
         $.each(data,function(index,tebusaz){
 
             switch(tebusaz['jenistebus']) {
@@ -723,8 +721,17 @@
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'T':
-                    var urlroute = '{{ route("resit.tebus", ":id") }}';
-                    urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+
+                    if(tebusaz['hargajualan'] === '')
+                    {
+                        var urlroute = '{{ route("resit.belumtebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+
+                    }else{
+                        var urlroute = '{{ route("resit.tebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                    }
+                  
                     break;
                 case 'A':
                     var urlroute = '{{ route("resit.belumansurans", ":id") }}';
@@ -750,7 +757,7 @@
     }
 
 
-    function ubahfunc(e){
+    async function ubahfunc(e){
 
         let ubahid = $('input[name="belum"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -792,11 +799,34 @@
         }
 
         if($("input[name='options']:checked").val() == 'sudah_tebus'){
-            Swal.fire({
-                icon: 'error',
-                title: 'Amaran',
-                text: 'Ubah Gadai Tidak Dibenarkan'
+            const { value: amaun } = await Swal.fire({
+                title: 'Kad Pengenalan Wakil',
+                input: 'text',
+                inputPlaceholder: 'Kad Pengenalan',
+                confirmButtonText: 'Terima',
+                showCancelButton:true,
+                cancelButtonText:'Batal',
+                allowOutsideClick: true,
+                inputValidator: (value) => {
+                    if (!value) {
+                        return 'Isikan tempat kosong diatas!'
+                    }
+
+                    if(value <= 0){
+                        return 'Masukkan No Kad Pengenalan yang betul!';
+                    }
+
+                    if(isNaN(value))
+                    {
+                        return 'Kad Pengenalan hendaklah dalam bentuk nombor!'
+                    }
+                }
             });
+
+            if(amaun)
+            {
+                
+            }
             return false;
         }
 
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index b38a385..c9e1447 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -65,7 +65,7 @@
                             </div>
                             @php
                                 if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
-                                    $kadarupah = 1.25/100;
+                                    $kadarupah = 1.2/100;
                                 }else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
                                     $kadarupah = 1.5/100;
                                 }else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
@@ -386,7 +386,7 @@
         }
         
         if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
-            kadarupah = 1.25/100;
+            kadarupah = 1.2/100;
         }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
             kadarupah = 1.5/100;
         }else if(total_nilai_marhun >= 2001 ){
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index a199037..bb166f2 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -365,7 +365,7 @@
         $('#bilangan_marhun').val(formatter.format(counter-1));
         $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
         if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
-            kadarupah = 1.25/100;
+            kadarupah = 1.2/100;
         }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
             kadarupah = 1.5/100;
         }else if(total_nilai_marhun >= 2001 ){
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index fbc1672..5d54857 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -168,8 +168,8 @@
                         </div>
                         <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
                             <div class="float-right mb-3">
-                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()">Check All</button>
-                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()">Uncheck All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
                             </div>
                             <table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
                                 <thead class="thead-dark">
@@ -263,16 +263,16 @@
         setTimeout("location.reload(true);",timeoutPeriod);
     }
 
-    window.onload = timedRefresh(300000);
+    window.onload = timedRefresh(100000);
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": false
+        "ordering": true
     });
     var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
     var table_rekod_gadaian = $('#table-rekod-gadaian').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
     $('#tarikh_rekod').datepicker({
@@ -289,19 +289,26 @@
     });
 
     function checkallfunc(){
-        
+
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun += marhun;
             this.checked = true;                        
         });
-
+        $("#btn-serah").prop('disabled', false);
+        $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
     }
 
     function uncheckallfunc(){
-        
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun -= marhun;
             this.checked = false;                        
         });
-
+        $('#marhunpilih').val(0);
+        $("#btn-serah").prop('disabled', true);
     }
 
     function fetchRekodGadaian(){
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index 9857c00..5d1d7e8 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -195,6 +195,19 @@
 <script>
     var api_url = "<?php echo $api_url ?>";
     //modal
+
+    var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
+        //   "scrollX": true
+        });
+
+    var pengesahanmarhun = $('#table-gadaian-belum-serah').DataTable({
+    //   "scrollX": true
+    });
+
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+    
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
         var arraymarhun = button.data('marhun');
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index 6074e54..16d54ad 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -168,13 +168,17 @@
 var api_url = "<?php echo $api_url ?>";
 
 
-var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": false
+    var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
+        "ordering": true
     });
     var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+
     //modal
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index bfc150d..8aa1a0c 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -71,7 +71,7 @@
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
             <div class="container">
-                <a class="navbar-brand" href="{{ url('/') }}">
+                <a class="navbar-brand" href="#">
                 <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                 <div class="col-2">
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index 1f7cdf5..a320644 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -71,7 +71,7 @@
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
             <div class="container">
-                <a class="navbar-brand" href="{{ url('/') }}">
+                <a class="navbar-brand" href="#">
                     <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index ce99cf1..a9032dd 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -397,7 +397,7 @@
     });
 
     function tebusan(){
-        if(hargajualan != null ){   
+        if(hargajualan != '' ){   
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
             let maxgadaipembiayaanbaru = "{{ $maxgadaipemb = ($nilaihargasemasa * 0.7) - $gadai['bakipjm'] }}";
                                 
@@ -430,7 +430,7 @@
             });
 
 
-        }else if(hargajualan == null){
+        }else if(hargajualan == ''){
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}";
 
             $('#tambahpinjamsebenar').val(formatter.format(Number(maxgadaila).toFixed(2)));
@@ -491,7 +491,7 @@
 
     }
 
-    if(hargajualan != null){
+    if(hargajualan != ''){
 
         //checked box
         var checkboxes = document.querySelectorAll('input[type="checkbox"]');
@@ -596,7 +596,7 @@
         });
 
     }
-    else if(hargajualan == null){
+    else if(hargajualan == ''){
         //Separuh Bayar Bukan Tawarruq
         $(document).on('click', '#checkmarhun', function(e) {
 
@@ -807,7 +807,7 @@
 
     function bayartambahan(e){
         if($('#sltjenistebus').find(":selected").val() == 'A'){
-            if(hargajualan == null){
+            if(hargajualan == ''){
         
                 let byr = $(e).val();
                 let total = 0;
@@ -865,14 +865,14 @@
         $("#terima_transaksi").prop('disabled', true);
         if($('#sltjenistebus').find(":selected").val() == 'T'){
             let jenisbayarantebus = '';
-            if(hargajualan == null)
+            if(hargajualan == '')
             {
                 jenisbayarantebus = "nottawarruq";
 
                 var urlroute = '{{ route("resit.belumtebus", ":id") }}';
                 urlroute = urlroute.replace(':id', norujukan);
             }
-            else if (hargajualan != null){
+            else if (hargajualan != ''){
                 jenisbayarantebus = "tawarruq";
 
                 var urlroute = '{{ route("resit.tebus", ":id") }}';
@@ -951,13 +951,13 @@
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
-            if(hargajualan == null){
+            if(hargajualan == ''){
                 jenisbayarantebus = "nottawarruq";
-            }else if (hargajualan != null){
+            }else if (hargajualan != ''){
                 jenisbayarantebus = "tawarruq";
             }
 
-            if(hargajualan != null){
+            if(hargajualan != ''){
                 var bayar = $('#bayaran').val(); 
                 var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
 
@@ -997,7 +997,7 @@
                 });
 
             }
-            else if(hargajualan == null){
+            else if(hargajualan == ''){
                 // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){
                 //     Swal.fire(
                 //         'Amaran!',
@@ -1409,9 +1409,9 @@
         }else if($('#sltjenistebus').find(":selected").val() == 'P'){
             let pinjamanbaru = $('#hargapembiayaansemasa').val();
             let jenisbayarantebus = '';
-            if(hargajualan == null){
+            if(hargajualan == ''){
                 jenisbayarantebus = "nottawarruq";
-            }else if (hargajualan != null){
+            }else if (hargajualan != ''){
                 jenisbayarantebus = "tawarruq";
             }
 
@@ -1685,11 +1685,11 @@
 
         let jenisbayarantebus = '';
 
-        if(hargajualan == null)
+        if(hargajualan == '')
         {
             jenisbayarantebus = "nottawarruq";
         }
-        else if (hargajualan != null){
+        else if (hargajualan != ''){
             jenisbayarantebus = "tawarruq";
         }
 
@@ -1833,9 +1833,9 @@
     function tambahpinjamanfunc()
     {
         let jenisbayarantebus = '';
-        if(hargajualan == null){
+        if(hargajualan == ''){
             jenisbayarantebus = "nottawarruq";
-        }else if (hargajualan != null){
+        }else if (hargajualan != ''){
             jenisbayarantebus = "tawarruq";
         }
 
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index f542897..6eb9721 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -409,7 +409,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
  </tr>
  
  <tr>
@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 
@@ -435,7 +436,7 @@ hr.new5 {
 <td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }} </td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
 </tr>
 
 
@@ -465,7 +466,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -502,7 +503,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
 </tr>
 
 <tr>
@@ -515,6 +516,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
+
 
 <table id="payment">
 
@@ -528,7 +531,7 @@ hr.new5 {
 <td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b></td>
 </tr>
 
 
@@ -558,7 +561,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php
index e6c8ef9..df55994 100644
--- a/resources/views/print/resitansuransebelum.blade.php
+++ b/resources/views/print/resitansuransebelum.blade.php
@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 
@@ -515,6 +516,7 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 7aec9d4..7cf82f9 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -409,7 +409,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </td>
  </tr>
  
  <tr>
@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
 
 <table id="payment">
 
@@ -438,7 +439,7 @@ hr.new5 {
 <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
 </tr>
 
 
@@ -468,7 +469,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -505,7 +506,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </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>
@@ -517,6 +518,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
+
 
 <table id="payment">
 
@@ -533,7 +536,7 @@ hr.new5 {
 <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
 </tr>
 
 
@@ -563,7 +566,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 5a9a819..c7d96e2 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +423,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -442,7 +443,7 @@ 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>Tebus Keseluruhan</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>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
   </tr>
 
 
@@ -472,7 +473,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -509,7 +510,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
 </tr>
 
 
@@ -525,6 +526,7 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -544,7 +546,7 @@ 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>Tebus Keseluruhan</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>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</b></td>
   </tr>
 
 </table>
@@ -573,7 +575,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 9a1a141..ea36b4a 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -368,6 +368,8 @@ hr.new5 {
     color: black;
     padding:4px;
   }
+
+
  
 </style>
 
@@ -400,6 +402,8 @@ hr.new5 {
 
 <br>
 
+
+
   <table id="inside">
 
  <tr>
@@ -410,7 +414,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b>  {{ $gadai['jbg'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +427,7 @@ hr.new5 {
   </table>
   <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -436,7 +441,7 @@ hr.new5 {
   <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }} </b></td>
   </tr>
 
 
@@ -466,9 +471,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
-
-
+      <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
 </tr>
   </table>
   <br>
@@ -503,7 +506,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg`'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['jbg'] }} </b></td>
 </tr>
 
 
@@ -519,6 +522,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
+
 
 <table id="payment">
 
@@ -532,7 +537,7 @@ hr.new5 {
   <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</b></td>
   </tr>
 
 </table>
@@ -561,8 +566,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
-
+    <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
 
 </tr>
 </table>
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index 30659e8..107a71e 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +423,8 @@ hr.new5 {
   </table>
   <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 <tr>
@@ -444,7 +446,7 @@ hr.new5 {
   <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>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</b></td>
   </tr>
 
 
@@ -474,7 +476,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -511,7 +513,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
 </tr>
 
 
@@ -527,6 +529,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 <tr>
@@ -548,7 +552,7 @@ hr.new5 {
   <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>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }} </b></td>
   </tr>
 
 
@@ -578,7 +582,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index 9a1a141..91adab4 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -423,6 +423,8 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 
@@ -519,6 +521,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index 72527c5..b4e945a 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -380,7 +380,7 @@
 <body>
   <div class="grid-container">
     <div id="header_surat1">
-    <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
       <p>AR-RAHN {{ $cawangan_detail['namacaw'] }}</p>
       <p>{{ $cawangan_detail['alamat1'] }}</p>
       <p>{{ $cawangan_detail['alamat2'] }}</p>
@@ -794,17 +794,10 @@
       <td>9.</td>
       <td colspan="6">Sekiranya mana-mana cagaran (marhun) hilang atau rosak akibat kebakaran, kecurian dan seumpamanya pelanggan akan menerima gantirugi marhun dalam bentuk tunai berdasarkan Nilai Marhun masa barang tersebut ditaksirkan pada transaksi yang pertama setelah ditolak segala kos berkaitan   </td>
     </tr>
-
-
     <tr>
       <td>10.</td>
       <td colspan="6">Pelanggan adalah bertanggungjawab untuk membayar zakat ke atas emas yang dicagarkan di PKB. Pihak PKB tidak bertanggungjawab untuk membayar zakat bagi pihak Pelanggan ke atas cagaran tersebut.   </td>
     </tr>
-
-
-
-
-
     <tr>
       <td>11.</td>
       <td colspan="6">Pihak Pelanggan mengesahkan bahawa telah membaca, memahami serta bersetuju bahawa Notis Akta Perlindungan Data Peribadi 2010 yang boleh didapati di laman rasmi Permodalan Kelantan Berhad (www.pkb.net.my) atau melalui mana-mana cawangan Ar-Rahn</td>
@@ -819,17 +812,20 @@
   <td colspan="20">  </td><td><div align="right"> Tandatangan </div></td>
   </tr>
   </table>
+<<<<<<< HEAD
 
 
   
 
 
 
+=======
+>>>>>>> 475262dda1bb76ac31ce354a339b62a820b6df24
   <div class='page-break'>  </div>
 
   <div class="grid-container">
     <div id="header_surat1">
-    <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
       <p>AR-RAHN {{ $cawangan_detail['namacaw'] }}</p>
       <p>{{ $cawangan_detail['alamat1'] }}</p>
       <p>{{ $cawangan_detail['alamat2'] }}</p>
@@ -1175,5 +1171,79 @@
     <br>
     <br>
   </div>
+  <div class='page-break'>  </div>
+  <div class='page-break'>  </div>
+  <div class="grid-container">
+    <div id="header_surat1">
+      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+      <p>AR-RAHN {{ $cawangan_detail['namacaw'] }}</p>
+      <p>{{ $cawangan_detail['alamat1'] }}</p>
+      <p>{{ $cawangan_detail['alamat2'] }}</p>
+      <p>{{ $cawangan_detail['notel'] }}</p>
+    </div>
+    <div id="header_surat2">
+      
+    </div>
+    <div class="visible-print" style="text-align:right">
+      <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" >
+    </div>
+  </div>
+  <div style="text-align:center">
+    <p><b>AKAD WAKALAH</b></p>
+  </div>
+  <div>
+    Nama Pelanggan &emsp;&emsp;: {{ $customer_detail['nama'] }}
+  </div>
+  <div>
+    No. Kad Pengenalan &ensp;: {{$gadai_detail['nokp']}}
+  </div>
+  <div>
+    Tarikh&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&nbsp;: 
+    @php 
+      $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_gadai']);
+      $formattedweddingdate = $myDateTime->format('d-m-Y');
+      echo($formattedweddingdate)
+    @endphp
+  </div>
+
+  <div>
+    <p>Dengan ini, saya bersetuju untuk menerima komoditi yang telah dijualkan kepada saya seperti dinyatakan di dalam SAG.</p>
+  </div>
+  <div>
+    <p>Saya dengan ini membuat pilihan untuk :</p>
+  </div>
+  <div>
+    <p>(Sila tandakan (√) pada salah satu kotak dibawah)</p>
+  </div>
+
+  <div>
+    <table id='table_wakalah'>
+      <thead>
+        <tr>
+          <th class="table_th" colspan="2">AKAD WAKALAH</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+        <td class='table_td'><div id='box_stuju'></div></td>
+        <td class='table_td'>Saya bersetuju melantik PKB 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 wakil saya.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div>atau</div>
+  <div>
+    <table id='table_wakalah'>
+      <tr>
+       <td class='table_td'><div id='box_stuju'></div></td>
+       <td class='table_td'>Saya bersetuju ingin mengambil komoditi tersebut dan menanggung segala kos dan caj yang berkaitan. Saya juga bersetuju dengan mengambil komoditi tersebut, jumlah pembiayaan tidak akan dikreditkan ke dalam akaun pembiayaan saya atau dibayar tunai kepada saya.</td>
+      </tr>
+    </table>
+  </div>
+  <div style="text-align:right; margin-top:100px">
+    <p><b>.................................................</b></p>
+    <p><b>(Tandatangan pelanggan)</b></p>
+  </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 4e6ef7c..31f6a3c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,6 +86,9 @@ Route::post('/createwakil',['as'=>'wakil.create','uses'=>'PenebusanController@cr
 Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfirstWakil'])->middleware('auth','teller');
 Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller');
 
+//Kemaskini Upah
+Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller');
+
 
 //MAINTENANCE
 Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
@@ -103,7 +106,7 @@ Route::post('/printsag',['as'=>'printsag','uses'=>'GadaianController@printSAG'])
 Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah');
 Route::get('/pendahuluanserahan','KhazanahController@pendahuluanserahandaftar')->middleware('auth','khazanah');
 Route::get('/khazanahgadaian',['as'=>'khazanah.gadaian','uses'=>'KhazanahController@gadaian'])->middleware('auth','khazanah');
-Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah');
+Route::get('/khazanahtebus',['as'=>'khazanah.tebus','uses'=>'KhazanahController@tebus'])->middleware('auth','khazanah');
 Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah');
 Route::get('/kelulusanrekodlepas',['as'=>'khazanah.rekodlepas','uses'=>'KhazanahController@kelulusanrekodlepas'])->middleware('auth','khazanah');
 Route::get('/pendahuluan',['as'=>'khazanah.pendahulu','uses'=>'KhazanahController@pendahuluan'])->middleware('auth','khazanah');