diff --git a/app/Console/Commands/updateJbg.php b/app/Console/Commands/updateJbg.php
new file mode 100644
index 0000000..04aea7c
--- /dev/null
+++ b/app/Console/Commands/updateJbg.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class updateJbg extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update:jbg';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update JBG for every active gadai';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $updatejbg = Http::get(config('api.url') . '/api/updatejbgsemasa')->json();
+        if($updatejbg == 'successful'){
+            return 0;
+        }else{
+            return 'failed';
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 01b3eaf..84d8703 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -14,6 +14,7 @@ class Kernel extends ConsoleKernel
      */
     protected $commands = [
         Commands\resetRoleDaily::class,
+        Commands\updateJbg::class,
     ];
 
     /**
@@ -24,7 +25,8 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:00');
+        $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
+        $schedule->command('update:jbg')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
     }
 
     /**
diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index b26641d..8cebc55 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -1157,6 +1157,39 @@ class AliranTunaiController extends Controller
         
     }
 
+    public function alirantunaiUpahBknTawarruq(Request $request){
+
+        $auth_user = Auth::user();
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json();
+        $gadai_detail = $gadai[0];
+ 
+        $advansur = Http::get(config('api.url') . '/api/advansur/'. $auth_user['cawangan'] . '/'. $request->norujukan)->json();
+
+        $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $advansur['teller']])->json();
+
+        $keluar=$getTunai2['keluar'];
+        $baki=$getTunai2['baki'];
+        $masuk=$getTunai2['masuk'];
+        $bakiawal=$getTunai2['bakiawal'];
+        $pendahuluan=$getTunai2['tambah'];
+        $serahan=$getTunai2['kurang'];
+        $totalmasuk = 0;
+        $bakiakhir = $baki;
+        $totalkeluar = 0;
+
+        $totalmasuk = $advansur['upahDibayar'] + $masuk;
+        $bakiakhir = $bakiakhir + $advansur['upahDibayar'];
+
+        $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+            'kodlaluan' => $advansur['teller'],   
+            'keluar'=>$keluar,
+            'masuk'=>$totalmasuk,
+            'bakiakhir'=>$bakiakhir
+        ]);
+        
+    }
+
     public function LaporanSerahan(Request $request)
     {
         $auth_user = Auth::user();
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 54d3e0a..d9fd936 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -500,6 +500,39 @@ class GadaianController extends Controller
         return view('print.resittebussebelum',compact('gadai','customers_info','penebusan','wakil'));
     }
 
+    public function resitadvansur($id)
+    {  
+
+        $auth_user = Auth::user();
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
+
+        if(sizeof($customers_info) != 0)
+            $customers_info = $customers_info[0];
+
+        $advansur = Http::get(config('api.url') . '/api/advansur/'. $auth_user['cawangan'] . '/'. $id)->json();
+
+        if($advansur['nowakil'] != 0){    
+            $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan']  . '/code/' . $advansur['nowakil'])->json();    
+
+            if(sizeof($wakil) != 0){
+                $wakil = $wakil[0]; 
+            }
+        }
+        else
+        {
+            $wakil = [];
+        }
+        
+        return view('print.resitadvansur',compact('gadai','customers_info','advansur','wakil'));
+    }
+
     public function resittambahpinjam($id)
     {  
 
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 1badf17..152a178 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -117,11 +117,9 @@ class KhazanahController extends Controller
 
         $keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan'];
 
-        //Terkumpul
-        $ringkasanterkumpul = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
-        $ringkasanterkumpul = $ringkasanterkumpul[0];
-
-        $keseluruhanupahterkumpul = $ringkasanterkumpul['lelongupahsimpan'] + $ringkasanterkumpul['tebus'][0]['upahsimpan'] + $ringkasanterkumpul['advansur'][0]['upahsimpan'];
+        //Upah Terkumpul
+        $upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
+        $keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
 
         //Peti Besi Cawangan
         $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
@@ -152,7 +150,7 @@ class KhazanahController extends Controller
         }
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','keseluruhanupahterkumpul'));
+        return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
     }
 
     public function alirantunai()
@@ -447,7 +445,6 @@ class KhazanahController extends Controller
        else
        {
        
-       // dd(request()->all());
 
         if($tebus_detail['jenistebus'] == 'P')
         {
@@ -2657,7 +2654,7 @@ class KhazanahController extends Controller
     }
 
     public function cetakLaporanStokAudit(Request $request){
-        // dd($request);
+        
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -2669,11 +2666,21 @@ class KhazanahController extends Controller
             $split_date = explode('-',$request->datetimepicker1);
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
-        $stokaudit = Http::get(config('api.url'). '/api/gadai/cawangan/'. $auth_user['cawangan']. '/' . $tebus_date)->json();
+        
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
+
+        if($request->radaktif === 'aktif')
+        {
+            $stokaudit = Http::get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+            return view('print.laporan_stokaudit', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+        }else{
+            $stokaudit = Http::get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+            return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+        }
+
+       
         // dd($gadai);
-        return view('print.laporan_stokaudit', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
     }
 
     public function laporanBatalSuratGadai(){
@@ -3263,14 +3270,22 @@ class KhazanahController extends Controller
         $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         
-        
+        //TunaiDitangan Sementara Upah
+        if($tarikh_imbangan2 >= '2021-04-22')
+        {
+            $advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+            $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini);
+        }else{
+            $totaltunaiditangan = $tunaiditangan;
+        }
+
         //Terkumpul
         $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
         $hartasemasa = [];
         // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
         
-        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]);
+        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
         array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
         array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
         array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index be307fe..90e1d89 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -10,6 +10,14 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
+
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                  <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Pengenalan Diri</li>
+                </ol>
+              </nav>
+
             <div class="card">
                 <div class="card-body">
                     <div class="text-center">
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index dac70c6..3738a37 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -16,6 +16,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb pb-3">
                   <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                  <li class="breadcrumb-item"><a href="{{ url('/pelanggan') }}">Pengenalan Diri</a></li>
                   <li class="breadcrumb-item active" aria-current="page">Pelanggan</li>
                 </ol>
               </nav>
@@ -37,7 +38,14 @@
                             <b>No Kad Pengenalan</b>
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
+                            @php
+                                if($customer_info['kpbaru'] != null){
+                                    $noic = $customer_info['kpbaru'];
+                                }else{
+                                    $noic = $customer_info['kplama'];
+                                }
+                            @endphp
+                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $noic }}">
                         </div>
                     </div>
                 </div>
@@ -404,6 +412,9 @@
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
     $('#daftar_gadai').on('click',function(){
+        var noic = $('#noic').val();
+        var iclama = "{{ $customer_info['kplama'] }}";
+        var icbaru = "{{ $customer_info['kpbaru'] }}";
         event.preventDefault();
         $.ajax({
             method:'get',
@@ -429,7 +440,11 @@
                         return false;
                     }
                     else{
-                        window.location.href = "{{ route('gadaian',['noic'=>$customer_info['kpbaru'] ]) }}";
+                        if(icbaru.length > 0){
+                            window.location.href = "{{ route('gadaian',['noic'=>$customer_info['kpbaru'] ]) }}";
+                        }else{
+                            window.location.href = "{{ route('gadaian',['noic'=>$customer_info['kplama'] ]) }}";
+                        }
                     }
                 }
             }
@@ -518,7 +533,7 @@
                                 '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") + '%',
-                                gadai_detail['jbg'],
+                                gadai_detail['tempoh'],
                                 'RM '+ formatter.format(upahsemasa)
                             ]).draw();
                         }
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index bb166f2..f7b9d86 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -4,7 +4,12 @@
 
 
 @php
-    $gadai_session = Http::get($api_url . '/api/check/sag',['kodcaw'=>$cawangan_info['kodcaw'],'norujukan'=>$norujukan,'nokp'=>$customer_info['kpbaru']])->json();
+    if($customer_info['kpbaru'] != null){
+        $noic = $customer_info['kpbaru'];
+    }else{
+        $noic = $customer_info['kplama'];
+    }
+    $gadai_session = Http::get($api_url . '/api/check/sag',['kodcaw'=>$cawangan_info['kodcaw'],'norujukan'=>$norujukan,'nokp'=>$noic])->json();
 @endphp
 
 @if($gadai_session != null)
diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php
index 5582405..4d34971 100644
--- a/resources/views/khazanah/dashboard.blade.php
+++ b/resources/views/khazanah/dashboard.blade.php
@@ -25,6 +25,8 @@
                         </div>
                     </div>
 
+                    
+
 
                     <div class="row mt-4 col-12 d-flex justify-content-center">
                         {{-- First Column --}}
@@ -76,7 +78,7 @@
                           {{-- Second Column --}}
                           <div class="col-lg-6 col-xl-4 col-12">
                             <!-- small box -->
-                            <div class="small-box bg-light">
+                            {{-- <div class="small-box bg-light">
                               <div class="inner">
                                 <h3>RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</h3>
           
@@ -84,13 +86,27 @@
                               </div>
                               <div class="icon">
                               </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
+                            </div> --}}
+
+                            <div class="card bg-light mb-3" style="max-width: 20rem;">
+                              <div class="card-header font-weight-bold">Gadai Terkumpul</div>
+                              <div class="card-body mx-auto">
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Tawarruq : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ ($dashboard[0]['gadaitawarruq']) ? number_format((float)$dashboard[0]['gadaitawarruq'],2) : "0.00" }}</p>
+                                </div>
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Ar-Rahn : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</p>
+                                </div>
+                              </div>
                             </div>
                           </div>
 
                           <div class="col-lg-6 col-xl-4 col-12">
                             <!-- small box -->
-                            <div class="small-box bg-light">
+                            {{-- <div class="small-box bg-light">
                               <div class="inner">
                                 <h3>RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</h3>
           
@@ -98,13 +114,27 @@
                               </div>
                               <div class="icon">
                               </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> 
+                            </div> --}}
+
+                            <div class="card bg-light mb-3" style="max-width: 20rem;">
+                              <div class="card-header font-weight-bold">Tebus Terkumpul</div>
+                              <div class="card-body mx-auto">
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Tawarruq : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ ($dashboard[0]['tebustawarruq']) ? number_format((float)$dashboard[0]['tebustawarruq'],2) : "0.00" }}</p>
+                                </div>
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Ar-Rahn : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</p>
+                                </div>
+                              </div>
                             </div>
                           </div>
 
                           <div class="col-lg-6 col-xl-4 col-12">
                             <!-- small box -->
-                            <div class="small-box bg-light">
+                            {{-- <div class="small-box bg-light">
                               <div class="inner">
                                 <h3>RM {{ number_format($keseluruhanupahterkumpul) }}</h3>
           
@@ -112,7 +142,21 @@
                               </div>
                               <div class="icon">
                               </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> 
+                            </div> --}}
+
+                            <div class="card bg-light mb-3" style="max-width: 20rem;">
+                              <div class="card-header font-weight-bold">Keuntungan dan Upah Terkumpul</div>
+                              <div class="card-body mx-auto">
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Keuntungan : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ number_format($keuntungan) }}</p>
+                                </div>
+                                <div class="row text-justify">
+                                  <h5 class="card-title font-weight-bold">Upah Simpan : </h5>
+                                  <p class="card-text font-weight-bold">RM {{ number_format($upahsimpan) }}</p>
+                                </div>
+                              </div>
                             </div>
                           </div>
 
diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php
index dc0b4cb..8ec11b6 100644
--- a/resources/views/khazanah/laporan/gadaian.blade.php
+++ b/resources/views/khazanah/laporan/gadaian.blade.php
@@ -44,19 +44,27 @@
                                         <th>No K/P</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
+                                        <th>Keuntungan (RM)</th>
                                         <th>Nilai Marhun (RM)</th>
                                         <th>Berat (g)</th>
                                     </tr>
                                 </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="4">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th id="upah12total"></th>
+                                    <th id="nmtotal"></th>
+                                    <th id="berattotal"></th>
+                                </tfoot>
                             </table>
                         </div>
                     </div>
-                    <div class="row">
+                    {{-- <div class="row">
                         <div class="col-md-12 text-right">
                             Bilangan Surat : <span id="bilangan_surat">3</span>
                             Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
                         </div>
-                    </div>
+                    </div> --}}
                 </div>
             </div>
         </div>
@@ -99,10 +107,18 @@
             }
         });
     });
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
     
     function gadaitable(data){
         var counter = 1;
         var total_pinjaman = 0;
+        var total_upah12 = 0;
+        var total_nm = 0;
+        var total_berat = 0;
+
         tablegadai.clear().draw();
         $.each(data,function(index,gadai){
             $.ajax({
@@ -110,17 +126,23 @@
                 url:api_url + '/api/customers/' + gadai['nokp'],
                 success:function(customer){
                     total_pinjaman += Number(gadai['pinjaman']);
+                    total_upah12 += Number(gadai['upah12']);
+                    total_nm += Number(gadai['nilaimarhun']);
+                    total_berat += Number(gadai['berat']);
                     tablegadai.row.add([
                         counter,
                         customer[0]['nama'],
                         gadai['nokp'],
                         gadai['norujukan'],
-                        gadai['pinjaman'],
-                        gadai['nilaimarhun'],
-                        gadai['berat']
+                        formatter.format(gadai['pinjaman']),
+                        formatter.format(gadai['upah12']),
+                        formatter.format(gadai['nilaimarhun']),
+                        formatter.format(gadai['berat'])
                     ]).draw();
-                    $('#bilangan_surat').text(counter);
-                    $('#jumlah_pinjaman').text('RM '+total_pinjaman);
+                    $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+                    $('#upah12total').text(formatter.format(total_upah12.toFixed(2)));
+                    $('#nmtotal').text(formatter.format(total_nm.toFixed(2)));
+                    $('#berattotal').text(formatter.format(total_berat.toFixed(2)));
                     counter = counter + 1;
                 }
             });
diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php
index 61cb897..5e3534a 100644
--- a/resources/views/khazanah/laporan/penebusan.blade.php
+++ b/resources/views/khazanah/laporan/penebusan.blade.php
@@ -49,15 +49,20 @@
                                         <th>Bayaran (RM)</th>
                                     </tr>
                                 </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="5">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th id="keuntungantotal"></th>
+                                    <th id="bayarantotal"></th>
+                                </tfoot>
                             </table>
                         </div>
                     </div>
-                    <div class="row">
+                    {{-- <div class="row">
                         <div class="col-md-12 text-right">
-                            Bilangan Surat : <span id="bilangan_surat">3</span>
-                            Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
+                            <h5> Jumlah Pinjaman : <span id="jumlah_pinjaman"></span></h5>
                         </div>
-                    </div>
+                    </div> --}}
                 </div>
             </div>
         </div>
@@ -68,7 +73,7 @@
     var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
 
     var tabletebus = $('#myTable').DataTable({
-        "ordering": false
+        "ordering": true
     });
     $(document).ready( function () {
         $('#datetimepicker1').datepicker({
@@ -99,11 +104,23 @@
                 tebustable(tebus);
             }
         });
+        $('#pinjamantotal').text('0.00');
+        $('#keuntungantotal').text('0.00');
+        $('#bayarantotal').text('0.00');
+
     });
-    
+
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+
     function tebustable(data){
         var counter = 1;
         var total_pinjaman = 0;
+        var total_keuntungan = 0;
+        var total_bayaran = 0;
+        
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
             $.ajax({
@@ -113,23 +130,33 @@
                     $.ajax({
                         url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
                         method:'get',
-                        success: function(customer){
+                        success:function(customer){
+                            total_pinjaman += parseFloat(tebus['pinjaman']);
+                            total_keuntungan += parseFloat(tebus['bakiupah']);
+                            total_bayaran += parseFloat(tebus['bakipjm']);
                             tabletebus.row.add([
                                 counter,
                                 customer[0]['nama'],
                                 gadai[0][0]['nokp'],
                                 tebus['norujukan'],
                                 tebus['t_tebus'],
-                                tebus['pinjaman'],
-                                tebus['bakiupah'],
-                                tebus['bakipjm']
+                                formatter.format(tebus['pinjaman']),
+                                formatter.format(tebus['bakiupah']),
+                                formatter.format(tebus['bakipjm'])
                             ]).draw();
+                            counter = counter + 1;
+                            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+                            $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
+                            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+
                         }
                     });
                 }
             });
         });
-        
+        // console.log('Total Pinjam : ' + total_pinjaman);
+        // $('#jumlah_pinjaman').text('RM '+ total_pinjaman);
+
     }
 </script>
 @endsection
diff --git a/resources/views/khazanah/laporan/stokaudit.blade.php b/resources/views/khazanah/laporan/stokaudit.blade.php
index 508588d..50f89fb 100644
--- a/resources/views/khazanah/laporan/stokaudit.blade.php
+++ b/resources/views/khazanah/laporan/stokaudit.blade.php
@@ -1,4 +1,63 @@
 @extends('layouts.app')
+<style>
+
+.radiostyle .radio-green {
+            background-color: #27ae60;
+            color:white;
+            box-shadow: 5px 10px #888888;
+            width:200px;
+            margin-right:5px;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-red {
+            background-color: #e74c3c;
+            color:white;
+            width:200px;
+            margin-right:5px;
+            box-shadow: 5px 10px #888888;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-yellow {
+            background-color: #3498db;
+            color:white;
+            width:200px;
+            margin-right:5px;
+            box-shadow: 5px 10px #888888;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-green:hover {
+            box-shadow: 5px 5px #888888;
+            
+            
+        }
+
+        .radiostyle .radio-red:hover {
+            box-shadow: 5px 5px #888888;
+            
+        }
+
+        .radiostyle .radio-yellow:hover {
+            box-shadow: 5px 5px #888888;
+            
+        }
+
+        .radiostyle .radio-green input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+        .radiostyle .radio-yellow input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+        .radiostyle .radio-red input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+
+</style>
 
 @section('content')
 <div class="container">
@@ -20,45 +79,41 @@
                         <div class="col-md-10">
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-md-5">
-                            <form action="{{ route('stokaudit.laporancetak') }}" target="_blank" method="post">
-                                @csrf
-                                <div class="input-group mb-3">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
+
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-5 mx-auto">
+                                <form action="{{ route('stokaudit.laporancetak') }}" target="_blank" method="get">
+                                    @csrf
+                                    <div class="input-group mb-3">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text" id="basic-addon1">Tarikh</span>
+                                        </div>
+                                        <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
+                                        <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
                                     </div>
-                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
-                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
-                                </div>
-                            </form>
+                                
+                            </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <table class="" id="myTable">
-                                <thead>
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>No Rujukan</th>
-                                        <th>JBG</th>
-                                        <th>No KP</th>
-                                        <th>Marhun</th>
-                                        <th>Berat</th>
-                                        <th>N.M (RM)</th>
-                                        <th>Pembiayaan</th>
-                                        <th>JT</th>
-                                    </tr>
-                                </thead>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-12 text-right">
-                            Bilangan Surat : <span id="bilangan_surat">3</span>
-                            Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
+                        <br><br>
+                        <div class="row">
+                            
+                            <div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
+                                <label class="btn btn-lg radio-yellow">
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked><i
+                                        class="fas fa-money-bill-alt fa-2x"></i><br>
+                                    <span>Aktif</span>
+                                </label>
+                                <label class="btn btn-lg radio-green">
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option2" value="takaktif" autocomplete="off"><i
+                                        class="fas fa-thumbs-up fa-2x"></i><br><span>Tak Aktif</span>
+                                </label>
+                            </div>
+
                         </div>
+                    </form>
                     </div>
+
                 </div>
             </div>
         </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 8aa1a0c..57f4d5e 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="#">
+                <a class="navbar-brand" href="#" style="cursor:not-allowed;">
                 <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                 <div class="col-2">
@@ -116,6 +116,9 @@
                             </li>
 
                             <script>
+                                var audiokhazanah = new Audio("{{ asset('sound/3.wav') }}");
+                                audiokhazanah.muted = true;
+                                
 
                                 // Enable pusher logging - don't include this in production
                                 // Pusher.logToConsole = true;
@@ -130,32 +133,36 @@
                                 var channel = pusher.subscribe('status-liked');
                                 channel.bind('my-event', function(data) {
                                     // let message = JSON.stringify(data);
-                                    
 
                                     if(cawangankhazanah == data.cawangan)
                                     {
 
-                                    $('#bell').css("color", "red");
-                                    $('#linkz').text(data.namateller + " Memohon Kelulusan");
-                                    $("#linkz").attr("href", "{{ url('kelulusan') }}");
-                            
-                                    const Toast = Swal.mixin({
-                                    toast: true,
-                                    position: 'top-end',
-                                    showConfirmButton: false,
-                                    timer: 5000,
-                                    timerProgressBar: true,
-                                    didOpen: (toast) => {
-                                        toast.addEventListener('mouseenter', Swal.stopTimer)
-                                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                                        $('#bell').css("color", "red");
+                                        $('#linkz').text(data.namateller + " Memohon Kelulusan");
+                                        $("#linkz").attr("href", "{{ url('kelulusan') }}");
+
+                                        
+                                        audiokhazanah.play();
+                                        audiokhazanah.muted = false;
+                                        
+                                
+                                        const Toast = Swal.mixin({
+                                            toast: true,
+                                            position: 'top-end',
+                                            showConfirmButton: false,
+                                            timer: 5000,
+                                            timerProgressBar: true,
+                                            didOpen: (toast) => {
+                                                toast.addEventListener('mouseenter', Swal.stopTimer)
+                                                toast.addEventListener('mouseleave', Swal.resumeTimer)
+                                            }
+                                        })
+                                
+                                        Toast.fire({
+                                            icon: 'error',
+                                            title: 'Kelulusan Dipohon Sekarang!'
+                                        })
                                     }
-                                    })
-                            
-                                    Toast.fire({
-                                    icon: 'error',
-                                    title: 'Kelulusan Dipohon Sekarang!'
-                                    })
-                                }
 
                                 });
                             
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index a320644..cf40376 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="#">
+                <a class="navbar-brand" href="#" style="cursor:not-allowed;">
                     <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                
@@ -96,119 +96,6 @@
 
                     <!-- Right Side Of Navbar -->
                     <ul class="navbar-nav ml-auto">
-                        
-                        @php $auth_user = Auth::user(); @endphp
-                        @if ($auth_user['role_harian'] == 'khazanah')
-                            <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
-                                    <i id="bell" class="fa fa-bell"></i>
-                                </a>
-
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                    <div id="divbiasa">
-                                        <a class="dropdown-item" href="#">
-                                            {{ __('BlaBla') }}
-                                        </a>
-                                    </div>
-                                </div>
-                            </li>
-
-                            <script>
-
-                                // Enable pusher logging - don't include this in production
-                                Pusher.logToConsole = false;
-                            
-                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                                    cluster: 'ap1',
-                                    encrypted: true
-                                });
-                            
-                                var channel = pusher.subscribe('status-liked');
-                                channel.bind('my-event', function(data) {
-                                    let message = JSON.stringify(data);
-                                    
-                                    $('#bell').css("color", "red");
-                            
-                                    const Toast = Swal.mixin({
-                                    toast: true,
-                                    position: 'top-end',
-                                    showConfirmButton: false,
-                                    timer: 5000,
-                                    timerProgressBar: true,
-                                    didOpen: (toast) => {
-                                        toast.addEventListener('mouseenter', Swal.stopTimer)
-                                        toast.addEventListener('mouseleave', Swal.resumeTimer)
-                                    }
-                                    })
-                            
-                                    Toast.fire({
-                                    icon: 'error',
-                                    title: 'Kelulusan Dipohon Sekarang!'
-                                    })
-                                });
-                            
-                                $("#navbarDropdown").click(function(){
-                                    $('#bell').css("color", "grey");
-                                });
-                            
-                            </script>
-                        @elseif($auth_user['role_harian'] == 'teller') 
-                            <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
-                                    <i id="bell" class="fa fa-bell"></i>
-                                </a>
-
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                    <div id="divbiasa">
-                                        <a class="dropdown-item" href="#">
-                                            {{ __('BlaBla') }}
-                                        </a>
-                                    </div>
-                                </div>
-                            </li>
-
-                            <script>
-
-                                // Enable pusher logging - don't include this in production
-                                Pusher.logToConsole = false;
-                            
-                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                                    cluster: 'ap1',
-                                    encrypted: true
-                                });
-                            
-                                var channel = pusher.subscribe('notifikasi-pembayaran');
-                                channel.bind('trigger-pembayaran', function(data) {
-                                    let message = JSON.stringify(data);
-                                    
-                                    $('#bell').css("color", "red");
-                            
-                                    const Toast = Swal.mixin({
-                                    toast: true,
-                                    position: 'top-end',
-                                    showConfirmButton: false,
-                                    timer: 5000,
-                                    timerProgressBar: true,
-                                    didOpen: (toast) => {
-                                        toast.addEventListener('mouseenter', Swal.stopTimer)
-                                        toast.addEventListener('mouseleave', Swal.resumeTimer)
-                                    }
-                                    });
-                            
-                                    Toast.fire({
-                                    icon: 'error',
-                                    title: 'Notifikasi Pembayaran!'
-                                    });
-
-                                });
-                            
-                                $("#navbarDropdown").click(function(){
-                                    $('#bell').css("color", "grey");
-                                });
-                            
-                            </script>
-
-                        @elseif($auth_user['roles'] == 'operasi') 
                         <li class="nav-item dropdown" style="margin-right:10px;">
                             <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                                 <i id="bell" class="fa fa-bell"></i>
@@ -217,7 +104,7 @@
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                                 <div id="divbiasa">
                                     <a class="dropdown-item" id="gadailinkz" href="#">
-                                        Tiada Data
+                                        Tiada Notifikasi
                                     </a>
                                 </div>
                             </div>
@@ -225,6 +112,9 @@
 
                         <script>
 
+                            var audio = new Audio("{{ asset('sound/3.wav') }}");
+                            audio.muted = true;
+
                             // Enable pusher logging - don't include this in production
                             Pusher.logToConsole = false;
 
@@ -241,6 +131,9 @@
                                 $('#linkz').text(data.namateller + " Pohon Kelulusan");
                                 $("#linkz").attr("href", "{{ url('kelulusan') }}");
 
+                                audio.play();
+                                audio.muted = false;
+
                                 const Toast = Swal.mixin({
                                 toast: true,
                                 position: 'top-end',
@@ -264,10 +157,7 @@
                                 $('#bell').css("color", "grey");
                             });
 
-                        </script>    
-
-                            
-                        @endif
+                        </script> 
 
 
 
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 8d43ae3..f145236 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -10,8 +10,9 @@
             
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb pb-3">
-                  <li class="breadcrumb-item"><a href="#">Home</a></li>
-                  <li class="breadcrumb-item"><a href="#">Pelanggan</a></li>
+                  <li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Home</a></li>
+                  <li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Pengenalan Diri</a></li>
+                  <li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Pelanggan</a></li>
                   <li class="breadcrumb-item active" aria-current="page">Penebusan</li>
                 </ol>
               </nav>
@@ -66,9 +67,14 @@
                         <div class="col-8">
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Tebus</option>
-                                <option value="A">A = Ansuran</option>
-                                <option value="S">S = Separuh</option>
-                                <option value="P">P = Tambah Pembiayaan</option>
+                                @if($gadai['hargajualan'] != null)
+                                    <option value="A">A = Ansuran</option>
+                                    <option value="S">S = Separuh</option>
+                                    <option value="P">P = Tambah Pembiayaan</option>
+                                @endif
+                                @if($gadai['hargajualan'] == null)
+                                    <option value="U">U = Bayaran Upah</option>
+                                @endif
                               </select>
                         </div>
                     </div>
@@ -205,15 +211,15 @@
 
                                 <div class="form-group row" id="divhargaemassemasa">
                                     <div class="col-4">
-                                        PEMBIAYAAN H. SEMASA (RM)
+                                        PEMBIAYAAN H. ASAL (RM)
                                     </div>
                                     @php
-                                        $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
+                                        $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
                                     @endphp
                                     <div class="col-8 input-group mb-2">
                                         <input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($gadai['bakipjm'],2) }}" aria-describedby="basic-hargaemas" readonly/>
                                         <div class="input-group-append">
-                                            <span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_hargaemassemasa,2) }}</span>
+                                            <span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_asal,2) }}</span>
                                         </div>
                                     </div>
                                 </diV>
@@ -244,7 +250,6 @@
                                         <input type="text" id="tambahpinjam" onkeyup="bayarpinjam(this)" placeholder="0.00" class="form-control"/>
                                     </div>
                                     <div class="col-4">
-                            
                                         <input type="text" id="tambahpinjamsebenar" placeholder="0.00" class="form-control" disabled/>
                                     </div>
                                 </diV>
@@ -258,7 +263,6 @@
                                     </div>
                                     <div class="col-8 input-group mb-2">
                                         <input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
-                                    
                                     <div class="input-group-append">
                                         <span class="input-group-text" id="basic-separuh"></span>
                                     </div>
@@ -282,15 +286,15 @@
                                
                                 <div class="form-group row">
                                     <div class="col-4">
-                                        PINJAMAN BARU(RM)
+                                        PEMBIAYAAN BARU(RM)
                                     </div>
                                     @php
-                                        $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
+                                        $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
                                     @endphp
                                     <div class="col-8 input-group mb-3">
                                         <input type="text" id="pinjamanbaru" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
                                         <div class="input-group-append">
-                                        <span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span>
+                                        <span class="input-group-text" id="basic-addon2">{{ number_format($percent_hargaemassemasa,2) }}</span>
                                           </div>
                                     </div>
                                 </div>
@@ -670,93 +674,114 @@
 
         switch($(this).val()) {
             case "T":
-            $('input[type="checkbox"]').hide();
-            $('span.spannar').show();
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
 
-            $("#bayaran").prop("disabled", true);
-            $("#perludibayar").prop("readonly", true);
-            $("#bayaran").val(0);
-            
-            $('#divtambahpinjaman').hide();
-            $('#divpinjamanbaru').hide();
-            $('#divbayaranditerima').hide();
-            $('#divbakipinjaman').hide();
-            $('#divhargaemassemasa').hide();
+                $("#bayaran").prop("disabled", true);
+                $("#perludibayar").prop("readonly", true);
+                $("#bayaran").val(0);
+                
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divbakipinjaman').hide();
+                $('#divhargaemassemasa').hide();
 
 
 
-            $('#divtelahdibayar').show();
-            $('#divbayaran').show();
-            $('#divperludibayar').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-            tebusan();
-            break;
+                tebusan();
+                break;
 
             case "A":
-            $('input[type="checkbox"]').hide();
-            $('span.spannar').show();
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
 
-            $("#bayaran").prop("disabled", false);
-            $("#perludibayar").prop("readonly", true);
-            $("#bayaran").val(0);
+                $("#bayaran").prop("disabled", false);
+                $("#perludibayar").prop("readonly", true);
+                $("#bayaran").val(0);
 
-            $('#divtambahpinjaman').hide();
-            $('#divpinjamanbaru').hide();
-            $('#divbayaranditerima').hide();
-            $('#divbakipinjaman').hide();
-            $('#divhargaemassemasa').hide();
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divbakipinjaman').hide();
+                $('#divhargaemassemasa').hide();
 
 
-            $('#divtelahdibayar').show();
-            $('#divbayaran').show();
-            $('#divperludibayar').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-            $('#perludibayar').val(formatter.format(jumupah));
+                $('#perludibayar').val(formatter.format(jumupah));
 
-            break;
+                break;
 
             case "S":
-            $('input[type="checkbox"]').show();
-            $('span.spannar').hide();
+                $('input[type="checkbox"]').show();
+                $('span.spannar').hide();
 
-            $("#bayaran").prop("disabled", true);
-            $("#perludibayar").prop("readonly", false);
-            $("#bayaran").val(0);
+                $("#bayaran").prop("disabled", true);
+                $("#perludibayar").prop("readonly", false);
+                $("#bayaran").val(0);
 
-            $('#divtambahpinjaman').hide();
-            $('#divpinjamanbaru').hide();
-            $('#divbayaranditerima').hide();
-            $('#divhargaemassemasa').hide();
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divhargaemassemasa').hide();
 
 
-            $('#divbakipinjaman').show();
-            $('#divtelahdibayar').show();
-            $('#divbayaran').show();
-            $('#divperludibayar').show();
+                $('#divbakipinjaman').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-            
+                
 
-            $('#perludibayar').val(formatter.format(jumupah));
-            break;
+                $('#perludibayar').val(formatter.format(jumupah));
+                break;
 
             case "P":
-            $('input[type="checkbox"]').hide();
-            $('span.spannar').show();
-            $('#divpinjaman').show();
-            $('#divtambahpinjaman').show();
-            $('#divpinjamanbaru').show();
-            $('#divbayaranditerima').show();
-            $('#divhargaemassemasa').show();
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
+                $('#divpinjaman').show();
+                $('#divtambahpinjaman').show();
+                $('#divpinjamanbaru').show();
+                $('#divbayaranditerima').show();
+                $('#divhargaemassemasa').show();
 
-            $('#divtelahdibayar').hide();
-            $('#divbakipinjaman').hide();
-            $('#divbayaran').hide();
-            $('#divperludibayar').hide();
+                $('#divtelahdibayar').hide();
+                $('#divbakipinjaman').hide();
+                $('#divbayaran').hide();
+                $('#divperludibayar').hide();
 
 
-            $("#bayaran").prop("disabled", false);
-            $("#bayaran").val(0);
-            break;
+                $("#bayaran").prop("disabled", false);
+                $("#bayaran").val(0);
+                break;
+            case "U":
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
+
+                $("#bayaran").prop("disabled", false);
+                $("#perludibayar").prop("readonly", true);
+                $("#bayaran").val(0);
+
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divbakipinjaman').hide();
+                $('#divhargaemassemasa').hide();
+
+
+                $('#divtelahdibayar').hide();
+                $('#divbayaran').hide();
+                $('#divperludibayar').show();
+
+                $('#perludibayar').val(formatter.format(jumupah));
+                break;
         }      
 
     });
@@ -844,17 +869,24 @@
 
         totalpinjbaru = pinjam + parseFloat(e.value);
 
+        console.log(totalpinjbaru);
+
+        var maxpinjaman = nmsemasa * 0.7;
+
+        var bakimaxpinjaman = maxpinjaman - totalpinjbaru;
+
         $(e).val() == ''  ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
         $(e).val() == ''  ? $('#hargapembiayaansemasa').val(pinjam.toFixed(2)) : $('#hargapembiayaansemasa').val(totalpinjbaru.toFixed(2));
 
         // if(parseFloat($(e).val()) > maxpinjam)
         //     $(e).val(maxpinjam);
 
-        var total = totalpinjbaru/nm * 100;
-        var totalsemasa = totalpinjbaru/nmsemasa * 100;
-
-        $(e).val() == ''  ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
-        $(e).val() == ''  ? $('#basic-hargaemas').text(percentpemb.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
+        var total = totalpinjbaru/nmsemasa * 100;
+        var totalsemasa = totalpinjbaru/nm * 100;
+        
+        $(e).val() == ''  ? $('#tambahpinjamsebenar').val(maxpinjam.toFixed(2)) : $('#tambahpinjamsebenar').val(bakimaxpinjaman.toFixed(2));
+        $(e).val() == ''  ? $('#basic-addon2').text(percentpemb.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
+        $(e).val() == ''  ? $('#basic-hargaemas').text(percentpinj.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
 
     }
 
@@ -958,7 +990,7 @@
             }
 
             if(hargajualan != ''){
-                var bayar = $('#bayaran').val(); 
+                var bayar = $('#bayaran').val();
                 var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
 
                 if(bayar >  bakipinjam){   
@@ -1675,6 +1707,74 @@
             }
 
             tambahpinjamanfunc();
+        }else if($('#sltjenistebus').find(":selected").val() == 'U'){
+
+            var urlroute = '{{ route("resit.advansur", ":id") }}';
+            urlroute = urlroute.replace(':id', norujukan);
+
+            var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+            var prkod = "{{ $gadai['prkod'] }}";
+            var jenistebus = $('#sltjenistebus').find(":selected").val();
+            var jbg = "{{ $gadai['tempoh'] }}";
+            var kadarupah = "{{ $gadai['kadarupah'] }}";
+            var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+            var pinjaman = "{{ $gadai['pinjaman']}}";
+            var ansuran = 0;
+            var addpinjaman = 0;
+            var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
+            var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
+            var historygadaian = 0;
+            var marhun = "{{ $gadai['marhun'] }}";
+            var nowakil = nw;
+
+            $.ajax({
+                method:'post',
+                url: api + '/api/ansuran/create/' + kodcaw,
+                datatype: 'json',
+                data:{
+                    'norujukan' : norujukan,
+                    'nopelanggan' : nopelanggan,
+                    'nilaimarhun' : nilai_marhun,
+                    'pinjaman' : pinjaman,
+                    'kadarupah' : kadarupah,
+                    'glcode' : "1000/010",
+                    'upahsebenar' : bakipinjaman,
+                    'upahdibayar' : bakipinjaman,
+                    'teller' : teller,
+                    'prkod' : prkod,
+                    'jbg' : jbg,
+                    'nowakil' : 0,
+                    'hubungan' : 0,
+                    'historygadaian' : norujukan
+                },
+                success:function(data){
+                    $.ajax({
+                        method: 'put',
+                        url: "{{ route('alirantunai.advansur') }}",
+                        async:false,
+                        data:{ 
+                            'norujukan' : norujukan,
+                            "_token": "{{ csrf_token() }}"
+                        },
+                        success:function(data){
+                            console.log(data);
+                        }, error: function(xhr, status, error) {
+                                    var err = eval("(" + xhr.responseText + ")");
+                                    alert(xhr.responseText);
+                        }
+                    });
+
+                    Swal.fire({
+                        icon: 'success',
+                        title: 'Berjaya!',
+                        text: 'Pembayaran Upah Berjaya',
+                    }).then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
+                }
+            })
+
         }
 
         //Bayaran Semua function end file
@@ -1860,7 +1960,7 @@
         var kadarupahbaru = 0;
 
         if(nilai_marhun > 0 && nilai_marhun < 401.99){
-            kadarupahbaru = 1.2/100;
+            kadarupahbaru = 1.20/100;
         }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
             kadarupahbaru = 1.50/100;
         }else if(nilai_marhun >= 2002 ){
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php
index 1044c40..2e0567f 100644
--- a/resources/views/print/laporan_gadaian.blade.php
+++ b/resources/views/print/laporan_gadaian.blade.php
@@ -146,21 +146,21 @@
 
 <table id="header">
   <tr>
-    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
-    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
   </tr>
   <tr>
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
     <td></td>
   </tr>
-  <tr>
+  {{-- <tr>
     <td>{{ $cawangan_detail['alamat1'] }}</td>
     <td></td>
   </tr>
   <tr>
     <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
     <td></td>
-  </tr>
+  </tr> --}}
 </table>
 <br>
 
@@ -169,22 +169,25 @@
     <th colspan ="5"><b>LAPORAN GADAIAN</b></th>
     <th> </th>
     <th> </th>
-    <th><b> Tarikh Cetak:</b>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
+    <th>
     </th>
     <th></th>
   </tr>
   <tr>
-    <td style="width:10px"> <b>TARIKH</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp</td>
+    <td><b> Tarikh:</b></td>
+    <td style="text-align:left;"> @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp</td>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>Tarikh Cetak</b></td>
+    <td style="text-align:left;">@php 
+      $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+      $formattedweddingdate = $myDateTime->format('d-m-Y');
+      echo($formattedweddingdate)
+    @endphp</td>
     <td style="width:50px">   
     </td>
     <td> </td>
@@ -205,26 +208,31 @@
     <th>Alamat</th>
     <th>No K/P</th>
     <th>Masa</th>
-    <th>Marhun</th>
     <th>Berat</th>
     <th>N Marhun</th>
     <th>Pembiayaan</th>
+    <th>Peratus (%)</th>
   </tr>
-  @php $counter = 0; @endphp
+  @php $counter = 1; $totalpinjaman = 0; @endphp
   @foreach($gadai as $index=>$item)
+  @php $totalpinjaman += $item['pinjaman'] @endphp
     @if($index > 0)
         @if($item['teller'] != $gadai[$index - 1]['teller'])
             <tr>
-                <td colspan=10>Teller : {{$item['teller']}}</td>
+                <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
+           @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp
         @endif
     @else
         <tr>
-            <td colspan=10>Teller : {{$item['teller']}}</td>
+            <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
+        @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp
+
     @endif
     <tr>
-      <td colspan=2 style="width:100px">{{$item['norujukan']}}</td>
+      <td>{{ $counter }}</td>
+      <td style="width:100px">{{$item['norujukan']}}</td>
       <td>
         @php
             $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json();
@@ -232,29 +240,38 @@
         @endphp
       </td>
       <td>{{$customer_detail[0]['alamat1']}}</td>
-      <td>{{$item['nokp']}}</td>
-      <td>{{$item['masa']}}</td>
-      <td>{{$item['marhun']}}</td>
-      <td>{{$item['berat']}}</td>
-      <td>{{$item['nilaimarhun']}}</td>
-      <td>{{$item['pinjaman'] . ' ' . $item['percentpinj'].'%'}}</td>
+      <td>{{ $item['nokp'] }}</td>
+      <td>{{ $item['masa'] }}</td>
+      <td>{{ number_format($item['berat'],2) }}</td>
+      <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ $item['percentpinj'] }}</td>
     </tr>
     @php $counter++; @endphp
+    @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat']; @endphp
     @if($index+1 < sizeof($gadai))
         @if($item['teller'] != $gadai[$index + 1]['teller'])
             <tr>
-                <td colspan=10>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+                <td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
+                <td><b>{{ number_format($totalberatteller,2) }} </b></td>
+                <td><b>{{ number_format($totalnmteller,2) }} </b></td>
+                <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
             </tr>
-            @php $counter = 0; @endphp
+            @php $counter = 1; @endphp
         @endif
     @else
         <tr>
-            <td colspan=10>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+            <td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
+            <td><b>{{ number_format($totalberatteller,2) }} </b></td>
+            <td><b>{{ number_format($totalnmteller,2) }} </b></td>
+            <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
         </tr>
     @endif
   @endforeach
 </table>
 
+<h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5>
+
 <br>
 <br>
 <table id="sign">
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index e39d425..a4c31c5 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -135,6 +135,13 @@
   padding:4px;
   color:black;
 }
+
+@media print {
+  .new-page {
+    page-break-before: always;
+  }
+}
+
 </style>
 
 
@@ -146,21 +153,21 @@
 
 <table id="header">
   <tr>
-    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
-    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
   </tr>
   <tr>
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
     <td></td>
   </tr>
-  <tr>
+  {{-- <tr>
     <td>{{ $cawangan_detail['alamat1'] }}</td>
     <td></td>
   </tr>
   <tr>
     <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
     <td></td>
-  </tr>
+  </tr> --}}
 </table>
 <br>
 
@@ -206,28 +213,29 @@
     <th>T Gadai</th>
     <th>T Tebus</th>
     <th>JBG</th>
-    <th>Pembiayaan</th>
-    <th>Upah Asal</th>
-    <th>Upah Percuma</th>
-    <th>Upah Dibayar</th>
-    <th>N Marhun</th>
-    <th>Jenis Tebus</th>
+    <th width="6%;">Pembiayaan(RM)</th>
+    <th width="6%;">Upah/Keuntungan(RM)</th>
+    <th width="6%;">Bayaran(RM)</th>
   </tr>
-  @php $counter = 0; @endphp
+  @php $counter = 1; $totalbayaran = 0;@endphp
   @foreach($tebus as $index=>$item)
+  @php $totalbayaran += $item['bakipjm'] @endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
-                <td colspan=12>Teller : {{$item['teller']}}</td>
+                <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
+            @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
         @endif
     @else
         <tr>
-            <td colspan=12>Teller : {{$item['teller']}}</td>
+            <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
+        @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
     @endif
     <tr>
-      <td colspan=2>{{$item['norujukan']}}</td>
+      <td>{{ $counter }}</td>
+      <td>{{ $item['norujukan'] }}</td>
       <td>
         @php
             $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
@@ -247,28 +255,34 @@
       <td>{{$item['t_tebus']}}</td>
       <td>{{$item['jbg']}}</td>
       <td>{{$item['pinjaman']}}</td>
-      <td>{{$item['upahasal']}}</td>
-      <td>{{$item['upahpercuma']}}</td>
-      <td>{{$item['upahdibayar']}}</td>
-      <td>{{$item['nilaimarhun']}}</td>
-      <td>{{$item['jenistebus']}}</td>
+      <td>{{$item['bakiupah']}}</td>
+      <td>{{$item['bakipjm']}}</td>
     </tr>
     @php $counter++; @endphp
+    @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
-            <tr>
-                <td colspan=12>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+            <tr class="new-page">
+                <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
+                <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+                <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
             </tr>
             @php $counter = 0; @endphp
         @endif
     @else
-        <tr>
-            <td colspan=12>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+        <tr class="new-page">
+            <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
+            <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+            <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
         </tr>
     @endif
   @endforeach
 </table>
 
+<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
+
 <br>
 <br>
 <table id="sign">
diff --git a/resources/views/print/laporan_stokaudit.blade.php b/resources/views/print/laporan_stokaudit.blade.php
index a737844..0d5a442 100644
--- a/resources/views/print/laporan_stokaudit.blade.php
+++ b/resources/views/print/laporan_stokaudit.blade.php
@@ -198,34 +198,37 @@
 
 <br>
 <table id="details">
-  <tr>
+  <thead>
     <th>Bil</th>
     <th>Norujukan</th>
     <th>JBG</th>
     <th>No. KP</th>
-    <th>Marhun</th>
     <th>Berat</th>
     <th>Nilai Marhun (RM)</th>
     <th>Pembiayaan</th>
-    <th>Jenis Tebus</th>
-  </tr>
+    <th>Lanjutan</th>
+  </thead>
   @php $counter = 1; @endphp
-  @foreach($stokaudit as $index=>$item)
+  @foreach($stokaudit['rekod'] as $index=>$item)
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
       <td>{{ $item['jbg'] }}</td>
       <td>{{$item['nokp']}}</td>
-      <td>{{ $item['marhun'] }}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
-      <td>{{$item['jenistebus']}}</td>
-
+      <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
     @php $counter++; @endphp
-    
   @endforeach
+  <tfoot>
+    <th colspan='4'>Jumlah</th>
+    <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th>{{ number_format($stokaudit['total'],2) }}</th>
+    <th></th>
+  </tfoot>
 </table>
 
 <br>
diff --git a/resources/views/print/laporan_stokauditbelumaktif.blade.php b/resources/views/print/laporan_stokauditbelumaktif.blade.php
new file mode 100644
index 0000000..0d5a442
--- /dev/null
+++ b/resources/views/print/laporan_stokauditbelumaktif.blade.php
@@ -0,0 +1,257 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr>
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>Laporan Stok Audit</b></th>
+    <th> </th>
+    <th> </th>
+    <th><b> Tarikh Cetak:</b>
+        @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate)
+        @endphp
+    </th>
+    <th></th>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>TARIKH</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate)
+        @endphp</td>
+    <td style="width:50px">   
+    </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <thead>
+    <th>Bil</th>
+    <th>Norujukan</th>
+    <th>JBG</th>
+    <th>No. KP</th>
+    <th>Berat</th>
+    <th>Nilai Marhun (RM)</th>
+    <th>Pembiayaan</th>
+    <th>Lanjutan</th>
+  </thead>
+  @php $counter = 1; @endphp
+  @foreach($stokaudit['rekod'] as $index=>$item)
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{$item['norujukan']}}</td>
+      <td>{{ $item['jbg'] }}</td>
+      <td>{{$item['nokp']}}</td>
+      <td>{{ number_format($item['berat'],2) }}</td>
+      <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{$item['lelong_tawarruq']}}</td>
+    </tr>
+    @php $counter++; @endphp
+  @endforeach
+  <tfoot>
+    <th colspan='4'>Jumlah</th>
+    <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th>{{ number_format($stokaudit['total'],2) }}</th>
+    <th></th>
+  </tfoot>
+</table>
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td> </td>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+
diff --git a/resources/views/print/resitadvansur.blade.php b/resources/views/print/resitadvansur.blade.php
new file mode 100644
index 0000000..7f5b002
--- /dev/null
+++ b/resources/views/print/resitadvansur.blade.php
@@ -0,0 +1,573 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+    $(document).ready(function () {
+      window.print();
+      window.onfocus=function(){ window.close();}
+    });
+</script>
+<style>
+/* Red border */
+hr.new1 {
+  border-top: 1px solid red;
+}
+
+/* Dashed red border */
+hr.new2 {
+  border-top: 1px dashed red;
+}
+
+/* Dotted red border */
+hr.new3 {
+  border-top: 1px dotted red;
+}
+
+/* Thick red border */
+hr.new4 {
+  border: 1px solid red;
+}
+
+/* Large rounded green border */
+hr.new5 {
+  border: 10px solid green;
+  border-radius: 5px;
+}
+</style>
+
+<style>
+
+#cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:20%;
+    font-size:10px;
+    border: 1px solid black;
+
+  }
+
+  #cust td, #cust th {
+    border: 0px solid;
+    padding: 3px;
+    font-size:9px;
+    text-align:right;
+
+  }
+
+  #cust tr:nth-child(even){background-color: #ffffff;}
+
+  #cust tr:hover {background-color: #ddd;}
+
+  #cust th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align:right;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #cust {
+  margin-left: auto;
+  margin-right: 0;
+}
+
+
+
+
+</style>
+
+
+
+
+
+
+
+
+
+
+
+<style>
+  hr.new1 {
+    border-top: 1px dotted black;
+  }
+  .khazanah{
+    border:1px solid black;
+    margin-left:20px;
+    padding:10px;
+    width : 250px;
+    transform: rotate(-90deg);
+    font-size:11px;
+  }
+
+  #inside {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    font-size:10px;
+  }
+
+  #inside td, #inside th {
+    border: none;
+    padding: 2px;
+  }
+
+  #inside tr:nth-child(even){background-color: #ffffff;}
+
+  #inside tr:hover {background-color: #ddd;}
+
+  #inside th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: left;
+    background-color: #4CAF50;
+    color: white;
+  }
+
+
+
+
+  #semakan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    margin-top:40px;
+    font-size:10px;
+  }
+
+  #semakan td, #semakan th {
+    border: none;
+    padding: 2px;
+    text-align: center;
+  }
+
+  #semakan tr:nth-child(even){background-color: #ffffff;}
+
+  #semakan tr:hover {background-color: #ddd;}
+
+  #semakan th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: left;
+    background-color: #4CAF50;
+    color: white;
+  }
+
+
+
+
+
+
+
+
+
+
+  #salinan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    font-size:11px;
+  }
+
+  #salinan td, #salinan th {
+    padding: 2px;
+  }
+
+
+  #salinan tr:nth-child(even){background-color: #ffffff;}
+
+  #salinan tr:hover {background-color: #ffffff;}
+
+  #salinan th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: right;
+    background-color: #ffffff;
+    color: black;
+    padding:2px;
+  }
+  #perjanjian {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 100%;
+    font-size:10px;
+
+  }
+
+  #perjanjian td, #perjanjian th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:9px;
+  }
+
+  #perjanjian tr:nth-child(even){background-color:#ffffff}
+
+  #perjanjian tr:hover {background-color: #ddd;}
+
+  #perjanjian th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:5px;
+  }
+  #keuntungan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 100%;
+    font-size:10px;
+
+  }
+
+  #keuntungan td, #keuntungan th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:9px;
+  }
+
+  #keuntungan tr:nth-child(even){background-color: #ffffff;}
+
+  #keuntungan tr:hover {background-color: #ddd;}
+
+  #keuntungan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #payment {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 45%;
+    font-size:10px;
+    border: 1px solid black;
+
+  }
+
+  #payment td, #payment th {
+    border: 0px solid;
+    padding: 3px;
+    font-size:9px;
+    text-align: left;
+
+  }
+
+  #payment tr:nth-child(even){background-color: #ffffff;}
+
+  #payment tr:hover {background-color: #ddd;}
+
+  #payment th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align:left;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #payment {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+  #akuan td, #akuan th {
+    padding: 7px;
+    font-size:9px;
+    padding:4px;
+  }
+
+  #akuan tr:nth-child(even){background-color:#ffffff;}
+
+  #akuan tr:hover {background-color: #ddd;}
+
+  #akuan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:3px;
+  }
+  .page-break{
+    page-break-before:always;
+  }
+  
+  .formula{
+    font-family: Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+  
+  #copy_cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:10%;
+    font-size:10px;
+
+  }
+
+
+
+  #copy_cust tr:nth-child(even){background-color: #ffffff;}
+
+  #copy_cust tr:hover {background-color:#ffffff}
+
+  #copy_cust th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:4px;
+  }
+
+
+  #copy_cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 50%;
+    font-size:10px;
+
+
+  }
+
+  #copy_cust td, #copy_cust th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:9px;
+    text-align:right;
+    width: 10%;
+
+  }
+
+  #copy_cust {
+    margin-right:0px;margin-left:auto
+}
+
+
+
+
+
+  #inside tr:nth-child(even){background-color: #ffffff;}
+
+  #inside tr:hover {background-color: #ddd;}
+
+  #inside th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:4px;
+  }
+
+
+ 
+</style>
+
+
+
+
+
+
+
+  <table>
+
+      <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
+      <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
+
+
+
+
+  </table>
+
+  <table id="cust">
+<tr>
+ <th style="width:5px;"> Salinan Pelanggan</th>
+</tr>
+<tr>
+<td  style="width:5px;"> RESIT BAYARAN  </td>
+
+</tr>
+
+  </table>
+
+<br>
+
+
+
+  <table id="inside">
+
+ <tr>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
+ </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($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+ </tr>
+
+ <tr>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b>  {{ $gadai['jbg'] }} </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>
+ </tr>
+
+ <tr>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+ </tr>
+  </table>
+  <br>
+
+<h1 style="float:left;position:absolute;margin-left:100px;">U</h1>
+
+<table id="payment">
+
+<tr>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+</tr>
+<tr>
+<td style="width:10px">Pinjaman</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
+</tr>
+<tr>
+  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
+  </tr>
+<tr>
+  <td style="width:10px"><b>Bayaran Di Terima</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($advansur['upahDibayar'],2) }} </b></td>
+  </tr>
+
+
+</table>
+
+<br>
+
+
+
+
+
+  <table id="semakan">
+      <tr>
+      <td colspan="3">.................................................... </td> 
+      <td></td>    
+      <td colspan="3">.................................................... </td>
+      <td></td> 
+      <td colspan="3">.................................................... </td>
+      <td></td> 
+      <td colspan="3">.................................................... </td>
+</tr>
+<tr>
+
+<td colspan="3">DiSemak </td> 
+      <td></td>    
+      <td colspan="3"> Cagaran Di Keluarkan</td>
+      <td></td> 
+      <td colspan="3">Cagaran Diterima </td>
+      <td></td> 
+      <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
+</tr>
+  </table>
+  <br>
+  <br>
+  <hr class="new2"></hr>
+
+<br>
+<br>
+
+</table>
+
+
+<table id="cust">
+<tr>
+<th style="width:5px;"> Salinan Pejabat</th>
+</tr>
+<tr>
+<td  style="width:5px;"> RESIT BAYARAN  </td>
+
+</tr>
+
+</table>
+
+<br>
+<table id="inside">
+
+<tr>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
+</tr>
+<tr>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+</tr>
+
+<tr>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['jbg'] }} </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"> <t/d>  <td> </td><td> </td><td> </td><td> </td>
+</tr>
+
+
+<tr>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td>  </td><td> </td><td> </td><td> </td>
+</tr>
+</table>
+<br>
+
+<h1 style="float:left;position:absolute;margin-left:100px;">U</h1>
+
+
+<table id="payment">
+
+<tr>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+</tr>
+<tr>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
+</tr>
+<tr>
+  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
+  </tr>
+<tr>
+  <td style="width:10px"><b>Bayaran Di Terima</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($advansur['upahDibayar'],2) }}</b></td>
+  </tr>
+
+</table>
+
+<br>
+
+
+
+
+
+<table id="semakan">
+    <tr>
+    <td colspan="3">.................................................... </td> 
+    <td></td>    
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+</tr>
+<tr>
+
+<td colspan="3">DiSemak </td> 
+    <td></td>    
+    <td colspan="3"> Cagaran Di Keluarkan</td>
+    <td></td> 
+    <td colspan="3">Cagaran Diterima </td>
+    <td></td> 
+    <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
+
+</tr>
+</table>
+<br>
\ No newline at end of file
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index 4872683..fa6d84f 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>
 
@@ -23,7 +23,7 @@
     transform: rotate(-90deg);
     font-size:11px;
     margin-left: 200px; 
-    margin-top: -170px;
+    margin-top: -70px;
   }
 
   #customers {
@@ -374,6 +374,24 @@
   #formula{
     border:1px solid black;
   }
+
+  #table_wakalah{
+    border: 1px solid black;
+    width: 100%;
+    border-collapse: collapse;
+  }
+  #box_stuju {
+    background-color: white;
+    width: 20px;
+    border: 1px solid black;
+    padding: 25px;
+    margin: 50px;
+  }
+
+  hr.new2 {
+    border-top: 1px dashed black;
+  }
+
 </style>
 </head>
 
@@ -424,14 +442,8 @@
     <tr>
       <td> ALAMAT</td>
       <td>{{$customer_detail['alamat1']}} </td>
-      <td>TARIKH MATANG</td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-      </td>
+      <td>NILAI MARHUN</td>
+      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
     </tr>
     <tr>
       <td> </td>
@@ -444,18 +456,12 @@
           echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
         @endphp
       </td>
-      <td>NILAI MARHUN</td>
-      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
-    </tr>
-    <tr>
-      <td>NO TELEFON</td>
-      <td>{{$customer_detail['telefon']}} </td>
       <td>NILAI PEMBIAYAAN</td>
       <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
     </tr>
     <tr>
-      <td> </td>
-      <td> </td>
+      <td>NO TELEFON</td>
+      <td>{{$customer_detail['telefon']}} </td>
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
@@ -527,19 +533,19 @@
     </tr>
     <tr>
       <td>TEMPOH PEMBIAYAAN</td>
-      <td style="text-align: center;">6 BULAN </td>
-      <td style="text-align: center;">12 BULAN</td>
+      <td style="text-align: center;">6 BULAN (TEMPOH MATANG)</td>
+      <td style="text-align: center;">6 BULAN (TEMPOH LANJUTAN)</td>
     </tr>
     <tr>
-      <td>TARIKH BAYARAN</td>
-      <td style="text-align: center;">Sebelum 
+      <td>TARIKH AKHIR BAYARAN</td>
+      <td style="text-align: center;"> 
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp
       </td>
-      <td style="text-align: center;">Sebelum 
+      <td style="text-align: center;">
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -655,8 +661,6 @@
       <td>NAMA</td>
       <td>{{ $customer_detail['nama'] }}</td>
       <td >NAMA</td>
-      <td>{{ $gadai_detail['teller'] }}</td>
-      <td >NAMA</td>
       <td>
         @if($gadai_detail['penilai'] == '')
           {{ $auth_username }}
@@ -664,6 +668,8 @@
           {{ $gadai_detail['penilai'] }}
         @endif
       </td>
+      <td >NAMA</td>
+      <td >{{ $gadai_detail['teller'] }}</td>
     </tr>
     <tr>
       <td>TARIKH</td>
@@ -762,45 +768,46 @@
     </tr>
 
       <td> 5.</td>
-      <td colspan="6">Sekiranya Pelanggan membuat penyelesaian awal,Harga Jualan sebelum daripada tempoh kontrak, PKB berakujanji memberikan ibra' (rebat) atas keuntungan dari Harga Jualan yang telah ditetapkan pada tarikh Pembiayaan berdasarkan formula berikut.</td>
+      <td colspan="6">Tempoh Pembiayaan ini adalah dua belas (12) bulan. Pelanggan dikehendaki menjelaskan keseluruhan Jumlah Keuntungan bagi tempoh enam (6) bulan pertama (tarikh matang) daripada Tempoh Pembiayaan terlebih dahulu bagi melayakkan lanjutan tempoh Pembiayaan bagi enam (6) bulan berikutnya (sehingga 12 bulan iaitu tempoh lanjutan).</td>
+    </tr>
+    <tr>
+      <td> 6.</td>
+      <td colspan="6">Sekiranya Harga Jualan tidak dibayar dalam tempoh enam (6) bulan pertama (tarikh matang), barang cagaran Pelanggan akan dilelong.</td>
+    </tr>
+    <tr>
+      <td>7.</td>
+      <td colspan="6">Pelanggan memberi kebenaran untuk melelong barang cagaran Pelanggan sekiranya Pelanggan tidak membayar Pembiayaan, Kadar Keuntungan atau mana-mana fi yang berkaitan dalam jangka masa yang telah dipersetujui</td>
+    </tr>
+    <tr>
+      <td>8.</td>
+      <td colspan="6">Sekiranya Pelanggan membuat penyelesaian awal Harga Jualan sebelum daripada tempoh kontrak, PKB berakujanji memberikan ibra’ (rebat) atas keuntungan dari Harga Jualan yang telah ditetapkan pada tarikh Pembiayaan berdasarkan formula berikut:</td>
     </tr>
     <tr>
       <td> </td>
-      <td colspan="6"> <b>Pengiraan Rebat : Jumlah Keuntungan - Keuntungan Telah Dibayar</b></td>
+      <td colspan="6"> <b>Pengiraan Rebat: Jumlah Keuntungan (12 bulan) – Keuntungan perlu dibayar</b></td>
     </tr>
     <tr>
       <td> </td>
-      <td colspan="6">Contoh penebusan pada bulan 4 : RM 180 (Jumlah Keuntungan 12 bulan) - RM 45 (Keuntungan selama 3 bulan) = RM 135 (rebat)</td>
+      <td colspan="6">Contoh penebusan pada bulan 4: RM 180 (Jumlah Keuntungan 12 bulan) – RM 60 (Keuntungan selama 4 bulan) = RM 120 (rebat)</td>
     </tr>
     <tr>
   
     <tr>
       <td> </td>
-      <td colspan="6">Jumlah Rebat yang diperolehi oleh pelanggan : RM 135</td>
-    </tr>
-    <tr>
-      <td> 6.</td>
-      <td colspan="6">Tempoh Pembiayaan ini adalah dua belas (12) bulan. Pelanggan dikehendaki menjelaskan keseluruhan Jumlah Keuntungan bagi tempoh (6) bulan pertama (tarikh matang) , daripada Tempoh Pembiayaan terlebih dahulu bagi melayakkan lanjutan tempoh Pembiayaan bagi enam (6) bulan berikutnya ( sehingga 12 bulan iaitu tempoh lanjutan).</td>
-    </tr>
-    <tr>
-      <td>7.</td>
-      <td colspan="6">Sekiranya Harga Jualan tidak dibayar dalam tempoh  enam (6) bulan pertama (tarikh matang), barang cagaran Pelanggan akan dilelong. </td>
-    </tr>
-    <tr>
-      <td>8.</td>
-      <td colspan="6">Pelanggan memberi kebenaran untuk melelong barang cagaran Pelanggan sekiranya Pelanggan tidak membayar Pembiayaan, Kadar Keuntungan atau mana-mana fi yang berkaitan dalam jangka masa yang telah dipersetujui.</td>
+      <td colspan="6">Jumlah Rebat yang diperolehi oleh Pelanggan: RM 120</td>
     </tr>
+    
     <tr>
       <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>
+      <td colspan="6">Sekiranya mana-mana barang 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>
+      <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>
+      <td colspan="6">Pihak Pelanggan mengesahkan bahawa telah membaca, memahami serta bersetuju dengan Notis Akta Perlindungan Data Peribadi 2010 yang boleh didapati di laman sesawang rasmi Permodalan Kelantan Berhad (www.pkb.net.my) atau melalui mana-mana cawangan Ar-Rahn.</td>
     </tr>
   </table>
 <p>
@@ -858,14 +865,8 @@
     <tr>
       <td> ALAMAT</td>
       <td>{{$customer_detail['alamat1']}} </td>
-      <td>TARIKH MATANG</td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-      </td>
+      <td>NILAI MARHUN</td>
+      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
     </tr>
     <tr>
       <td> </td>
@@ -878,18 +879,12 @@
           echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
         @endphp
       </td>
-      <td>NILAI MARHUN</td>
-      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
-    </tr>
-    <tr>
-      <td>NO TELEFON</td>
-      <td>{{$customer_detail['telefon']}} </td>
       <td>NILAI PEMBIAYAAN</td>
       <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
     </tr>
     <tr>
-      <td> </td>
-      <td> </td>
+      <td>NO TELEFON</td>
+      <td>{{$customer_detail['telefon']}} </td>
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
@@ -903,19 +898,19 @@
     </tr>
     <tr>
       <td>TEMPOH PEMBIAYAAN</td>
-      <td style="text-align: center;">6 BULAN </td>
-      <td style="text-align: center;">12 BULAN</td>
+      <td style="text-align: center;">6 BULAN (TEMPOH MATANG)</td>
+      <td style="text-align: center;">6 BULAN (TEMPOH LANJUTAN)</td>
     </tr>
     <tr>
-      <td>TARIKH BAYARAN</td>
-      <td style="text-align: center;">Sebelum 
+      <td>TARIKH AKHIR BAYARAN</td>
+      <td style="text-align: center;">
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp
       </td>
-      <td style="text-align: center;">Sebelum 
+      <td style="text-align: center;">
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -1009,15 +1004,15 @@
       <td>NAMA</td>
       <td>{{ $customer_detail['nama'] }}</td>
       <td >NAMA</td>
-      <td>{{ $gadai_detail['teller'] }}</td>
-      <td >NAMA</td>
-      <td > 
+      <td>
         @if($gadai_detail['penilai'] == '')
           {{ $auth_username }}
         @else
           {{ $gadai_detail['penilai'] }}
         @endif
       </td>
+      <td >NAMA</td>
+      <td >{{ $gadai_detail['teller'] }}</td>
     </tr>
     <tr>
       <td>TARIKH</td>
@@ -1090,78 +1085,69 @@
       <table class="table_table" style="border: 1px solid black;">
         <thead>
           <tr>
-            <th class="table_th" colspan="2">Ujian</th>
+            <th class="table_th" colspan="3">Ujian</th>
           </tr>
         </thead>
         <tbody>
           <tr>
-            <td class="table_td">Mutu</td>
-            <td class="table_td" style="width:180px"></td>
+            <td class="table_td" colspan="2">Mutu</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
           <tr>
-            <td class="table_td">Ketumpatan</td>
-            <td class="table_td" style="width:180px"></td>
+            <td class="table_td" colspan="2">Ketumpatan</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
           <tr>
-            <td class="table_td">Peratus (%)</td>
-            <td class="table_td" style="width:180px"></td>
+            <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>
+          <tr>
+            <td class="table_td" colspan="2">Saya mengesahkan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" >Pengurus Cawangan</td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
         </tbody>
       </table>
     </div>
-    <br>
-    <table>
-      <tr>
-        <td>Penilai</td>
-        <td>
-          @if($gadai_detail['penilai'] == '')
-            {{ $auth_username }}
-          @else
-            {{ $gadai_detail['penilai'] }}
-          @endif
-        </td>
-      </tr>
-      <tr>
-        <td>Tarikh Gadai</td>
-        <td>
-          @php 
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_gadai']);
-            $formattedweddingdate = $myDateTime->format('d-m-Y');
-            echo($formattedweddingdate)
-          @endphp
-        </td>
-      </tr>
-      <tr>
-        <td>Tarikh Matang</td>
-        <td>
-          @php 
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-            $formattedweddingdate = $myDateTime->format('d-m-Y');
-            echo($formattedweddingdate)
-          @endphp
-        </td>
-      </tr>
-    </table>
-    <br>
-    <p>Nota</p>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
   </div>
   <div class='page-break'>  </div>
   <div class='page-break'>  </div>
diff --git a/routes/web.php b/routes/web.php
index c37b4ec..f3828a3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -73,6 +73,7 @@ Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','te
 Route::get('/aliran_tunai/laporanserahan}',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller');
 Route::put('/aliran_tunai/Gadaian',['as'=>'alirantunai.gadai','uses' => 'AliranTunaiController@alirantunaiGadai'])->middleware('auth','teller');
 Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranTunaiController@alirantunaiTebus'])->middleware('auth','teller');
+Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller');
 Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
 Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth');
 Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
@@ -198,6 +199,7 @@ Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit
 Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'GadaianController@resitansurans'])->middleware('auth','teller');
 Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'GadaianController@resitbelumansurans'])->middleware('auth','teller');
 Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'GadaianController@resittebus'])->middleware('auth','teller');
+Route::get('/resit/advansur/{id}',['as'=>'resit.advansur','uses'=>'GadaianController@resitadvansur'])->middleware('auth','teller');
 Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'GadaianController@resittebusseparuh'])->middleware('auth','teller');
 Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller');
 Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller');