diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 23924ea..cb73da9 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -112,7 +112,11 @@ class AliranTunaiController extends Controller
 
         $tunaipast = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
 
-        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast'));
+        $proses_modal = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/requestTeller/checkproses',['kodlaluan' => Auth::user()->name,'kodcaw' => $auth_user['cawangan']])->json();
+        
+        $countproses = sizeof($proses_modal);
+
+        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast','countproses'));
     }
 
     public function alirantunaiGadai(Request $request,$teller){
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index dde6f4a..cda0864 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Auth;
 use App\Services\CustomerService;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Hash;
 
 class HomeController extends Controller
 {
@@ -29,6 +30,16 @@ class HomeController extends Controller
     {
         $auth_user = Auth::user();
         $api_url = config('api.url');
+
+        if(session()->has('iklan') && session()->get('iklan') == 0)
+        {
+            session()->put('iklan', 1);
+        }else{
+            if (Hash::check(config('app.reset_password'), $auth_user['password']) || Hash::check($auth_user['no_kp'], $auth_user['password'])) {
+                session()->put('iklan', 0);
+            }
+        }
+
         if($auth_user['roles'] == 'teller'){
             if($auth_user['role_harian'] == 'teller'){
                 $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -45,7 +56,13 @@ class HomeController extends Controller
         }
         elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
             $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-            return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
+
+            $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
+            $listserah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/listSerahMarhunController/'.$auth_user['cawangan'])->json();
+
+            $countkhazanah = sizeof($gadai) + sizeof($listserah);
+            
+            return view('homepage.khazanah.home',compact('cawangan_info','api_url','countkhazanah'));
         }
         else{
             $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 3310c68..69127d0 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -383,7 +383,15 @@ class KhazanahController extends Controller
 
         $update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
 
-        return redirect()->route('khazanah.tebus');
+        if($update == 'success')
+        {
+            return redirect()->route('khazanah.tebus');
+        }else if($update == 'unavailable'){
+            return redirect()->route('khazanah.tebus')->with(['type' => 'unavailable', 'message' => 'Norujukan Tidak Wujud!', 'norujukan' => $request->norujukan_barcode]);
+        }else{
+            return redirect()->route('khazanah.tebus')->with(['type' => 'scanned', 'message' => 'Norujukan Dah Discan!', 'norujukan' => $request->norujukan_barcode]);
+        }
+
     }
 
     public function pendahuluanserah($id)
@@ -1026,7 +1034,14 @@ class KhazanahController extends Controller
 
         event(new NotifikasiPembayaran('TellerkepadaKhazanah'));
 
-        return redirect()->route('khazanah.gadaian');
+        if($scan_barcode == 'success')
+        {
+            return redirect()->route('khazanah.gadaian');
+        }else if($scan_barcode == 'unavailable'){
+            return redirect()->route('khazanah.gadaian')->with(['type' => 'unavailable', 'message' => 'Norujukan Tidak Wujud!', 'norujukan' => $request->norujukan_barcode]);
+        }else{
+            return redirect()->route('khazanah.gadaian')->with(['type' => 'scanned', 'message' => 'Norujukan Dah Discan!', 'norujukan' => $request->norujukan_barcode]);
+        }
     }
 
     public function LaporanSemakBarcode(){
@@ -3928,5 +3943,170 @@ class KhazanahController extends Controller
         }
        
     }
-    
+
+    public function Laporan_SerahPetiBesiGadai()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        // $lookwakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lookupwakil/')->json();
+
+        return view('khazanah.laporan.serahgadai', compact('cawangan_info','api_url'));
+    }
+
+    public function cetak_serahBarcodeGadai(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $datemula = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+        if($request->datehingga == null){
+            $datehingga = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+
+        $serahbarcode = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahgadai/',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $datemula,
+            'hingga' => $datehingga,
+        ])->json();
+
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_serahpetibesigadai', compact('cawangan_detail','api_url','serahbarcode','cawangan_info','datemula','datehingga','tarikh_cetak'));
+    }
+
+
+    public function Laporan_SerahMarhunTebus()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        // $lookwakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lookupwakil/')->json();
+
+        return view('khazanah.laporan.serahmarhun', compact('cawangan_info','api_url'));
+    }
+
+
+    public function cetak_serahMarhunTebus(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $datemula = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+        if($request->datehingga == null){
+            $datehingga = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+
+        $serahmarhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahmarhuntebus/',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $datemula,
+            'hingga' => $datehingga,
+        ])->json();
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
+    }
+
+    public function Laporan_AuditCustomer()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+        return view('khazanah.laporan.auditcustomer', compact('cawangan_info','api_url'));
+    }
+
+    public function cetak_AuditCustomer(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $datemula = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+        if($request->datehingga == null){
+            $datehingga = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+        $auditcustomer = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/auditcustomer/',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $datemula,
+            'hingga' => $datehingga
+        ])->json();
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_auditcustomer', compact('cawangan_detail','api_url','auditcustomer','cawangan_info','datemula','datehingga','tarikh_cetak'));
+    }
+
+    public function LaporanTebusBarcode(){
+        $auth_user=Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $api_url = config('api.url');
+        $tarikh_cetak = $current->toDateString();
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        $datemula = $current->toDateString();
+        $datehingga = $current->toDateString();
+
+        $serahmarhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahmarhuntebus/',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $datemula,
+            'hingga' => $datehingga,
+        ])->json();
+
+        return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
+    }
+
 }
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index b761293..0db0a5c 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -5,6 +5,19 @@
 
 @include('modal.denominasimodal')
 
+@if($countproses > 0)
+<script>
+    Swal.fire({
+        title: 'Memuatkan...',
+        allowEscapeKey: false,
+        allowOutsideClick: false,
+        didOpen: () => {
+            Swal.showLoading()
+        }
+    });
+</script>
+@endif
+
 
 <div class="container">
     <div class="row justify-content-center">
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 57770bd..bd9fc2f 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -212,6 +212,7 @@
                                 <th>Jum Tuntut/Bayar</th>
                                 <th>Keuntungan</th>
                                 <th>Caj Lelong</th>
+                                <th>Tuntutan</th>
                                 <th>Cetak</th>
                             </tr>
                         </thead>
@@ -805,6 +806,24 @@
                         var urlroute = '{{ route("lelongan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
 
+                        var tuntutan = 'Pelanggan';
+
+                        $.ajax({
+                            method:"GET",
+                            async:false,
+                            url: api_url + "/api/check/customer/",
+                            data:{
+                                "norujukan" : gadai_detail['norujukan'],
+                                "kodcaw" : kodcaw
+                            },
+                            success: function(response){
+                                if(response[0].teller = 'DM')
+                                {
+                                    tuntutan = 'WTD';
+                                }
+                            }
+                        });
+
                         if(gadai_detail['trkhtuntut'] == null){
                             tablelelong.row.add([
                                 counter,
@@ -816,6 +835,7 @@
                                 'RM '+formatter.format(gadai_detail['baki']),
                                 'RM '+formatter.format(gadai_detail['bakiupah']),
                                 'RM '+formatter.format(gadai_detail['cajlelong']),
+                                '',
                                 '<button class="btn btn-info" disabled>Cetak</button>'
                             ]).draw();
                         }else{
@@ -829,6 +849,7 @@
                                 'RM '+formatter.format(gadai_detail['baki']),
                                 'RM '+formatter.format(gadai_detail['bakiupah']),
                                 'RM '+formatter.format(gadai_detail['cajlelong']),
+                                tuntutan,
                                 '<button class="btn btn-info" onclick="cetaktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] +'>Cetak</button>'
                             ]).draw();
                         }
@@ -874,7 +895,99 @@
                             text: 'Lelongan dalam process WTD'
                         });
                     }else{
-                        window.location.href = urlroute;
+
+                        const swalWithBootstrapButtons = Swal.mixin({
+                            customClass: {
+                                confirmButton: 'btn btn-success ml-1',
+                                cancelButton: 'btn btn-danger'
+                            },
+                            buttonsStyling: false
+                        });
+
+                        swalWithBootstrapButtons.fire({
+                        title: 'Dapatkan Pengesahan Khazanah',
+                        text: "Kelulusan Tuntut Baki Lelong",
+                        icon: 'info',
+                        showCancelButton: true,
+                        confirmButtonText: 'Hantar',
+                        cancelButtonText: 'Batal',
+                        reverseButtons: true
+                        }).then((result) => {
+                            if(result.isConfirmed) {
+                                Swal.fire({
+                                    title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                    icon: 'info',
+                                    width: 600,
+                                    padding: '3em',
+                                    background: '#fffff',
+                                    showCancelButton: false,
+                                    showConfirmButton: false,
+                                    allowOutsideClick: false,
+                                    allowEscapeKey: false,
+                                    allowEnterKey: false
+                                })
+
+                                let mohon = "Tuntut Baki";
+
+                                $.ajax({
+                                    method:'post',
+                                    url: '{{ route("teller.createkelulusan") }}',
+                                    data: {
+                                        "_token": "{{ csrf_token() }}",
+                                        "norujukan" : norujukan,
+                                        "mohon" : mohon
+                                    },
+                                    success:function(data){
+                                    },error: function(xhr, status, error) {
+                                        var err = eval("(" + xhr.responseText + ")");
+                                        alert(xhr.responseText);
+                                    }
+                                });
+
+                                let teller = "{{ Auth::user()->name }}";
+
+                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                        cluster: 'ap1',
+                                                        encrypted: true
+                                });
+
+                                var channel = pusher.subscribe('notice-ubahhapus');
+                                channel.bind('my-ubahhapus', function(data) {
+
+                                    if(data.norujukan == norujukan && data.teller == teller)
+                                    {
+                                        if(data.kelulusan == 'lulus')
+                                        {
+                                            Swal.fire({
+                                                    icon: 'success',
+                                                    title: 'Telah Disahkan'
+                                            }).then(function(){
+                                                window.location.href = urlroute;
+                                            });
+                                        }
+                                        else if(data.kelulusan == 'batal')
+                                        {
+                                            Swal.fire({
+                                                icon: 'warning',
+                                                title: 'Telah Dibatalkan',
+                                                text: `Komen : ${data.komen}`
+                                            }).then(function(){
+                                                location.reload();
+                                                return false;
+                                            });
+                                        }
+                                    }
+                                });
+                            }else if (result.dismiss === Swal.DismissReason.cancel){
+                                swalWithBootstrapButtons.fire(
+                                    'Batal',
+                                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                                    'error'
+                                )
+                            }
+
+                        });
+
                     }
                 }
             });
@@ -890,6 +1003,7 @@
     }
 
 
+
     $(document).ready( function () {
 
         $('#myTable').parents('div.dataTables_wrapper').first().hide();
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index 9ff26a2..ed4f42c 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -3,331 +3,426 @@
 @section('content')
 
 
-  <!-- Modal HistoryBayaran -->
-  <div class="modal fade" id="denominasiShowModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+<!-- Modal HistoryBayaran -->
+<div class="modal fade" id="denominasiShowModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle"
+    aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header">
 
-          <ul class="nav nav-pills">
-            {{-- <li class="nav-item">
+                <ul class="nav nav-pills">
+                    {{-- <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
             </li> --}}
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
-            </li>
-          </ul>
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="pill" href="#profile" role="tab"
+                            aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
+                    </li>
+                </ul>
 
-         <label class="mt-2 ml-3 hideelem d-none">Bundle:</label><input type="text" class="form-control col-2 ml-3 hideelem d-none" id="amaunbundle" placeholder="0.00" readonly>
-         <label class="mt-2 ml-3 hideelem d-none">Keping:</label><input type="text" class="form-control col-2 ml-3 hideelem d-none" id="amaunkeping" placeholder="0.00" readonly>
-         <label class="mt-2 ml-3">Amaun Deno:</label><input type="text" class="form-control col-2 ml-3" data-amaun="" id="amaunkeseluruhan" placeholder="0.00" readonly>
-         <label class="mt-2 ml-3">Amaun Vault:</label><input type="text" class="form-control col-2 ml-3" id="amaunvault" placeholder="0.00" readonly>
+                <label class="mt-2 ml-3 hideelem d-none">Bundle:</label><input type="text"
+                    class="form-control col-2 ml-3 hideelem d-none" id="amaunbundle" placeholder="0.00" readonly>
+                <label class="mt-2 ml-3 hideelem d-none">Keping:</label><input type="text"
+                    class="form-control col-2 ml-3 hideelem d-none" id="amaunkeping" placeholder="0.00" readonly>
+                <label class="mt-2 ml-3">Amaun Deno:</label><input type="text" class="form-control col-2 ml-3"
+                    data-amaun="" id="amaunkeseluruhan" placeholder="0.00" readonly>
+                <label class="mt-2 ml-3">Amaun Vault:</label><input type="text" class="form-control col-2 ml-3"
+                    id="amaunvault" placeholder="0.00" readonly>
 
-         <button type="button" class="btn btn-warning ml-4 hideelement d-none" data-dismiss="modal">Tukar</button>
-          
-          <button type="button" class="close invisible" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
-          
-        </div>
-        <div class="modal-body">  
+                <button type="button" class="btn btn-warning ml-4 hideelement d-none"
+                    data-dismiss="modal">Tukar</button>
 
-          <div class="alert alert-warning text-center d-none" role="alert">
-            <i class='fas fa-exclamation-triangle text-danger mr-2'></i> is a primary alert—check it out!
-          </div>
-          <div class="tab-content">
-            <div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
-              
-              <table class="table"> 
-                    <tr>
-                          <th></th>
-                          <th>Peti Besi</th>
-                          <th>Jumlah (RM)</th>
-                          <th></th>
-                          <th>Peti Besi</th>
-                          <th>Jumlah (RM)</th>
-                    </tr>
-                    <tr>
-                      <td>RM 1.00</td>
-                      <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" readonly/> </td>
-                      <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
-                      <td> RM 20.00</td>
-                      <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" readonly/> </td>
-                      <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
-                  </tr>
-                  <tr>
-                      <td>RM 5.00</td>
-                      <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" readonly/> </td>
-                      <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
-                      <td>RM 50.00</td> 
-                      <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" readonly/> </td>
-                      <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
-                  </tr>
-                  <tr>
-                      <td>RM 10.00</td>
-                      <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" readonly/> </td>
-                      <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
-                      <td>RM 100.00 </td>
-                      <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" readonly/> </td>
-                      <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
-                  </tr>
-                    </table>
+                <button type="button" class="close invisible" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
 
             </div>
-            <div class="tab-pane fade  show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
-              
-          <table class="table"> 
-            <tr class="bg-warning text-center">
-                  <th width="20%"></th>
-                  <th>Peti Besi</th>
-                  <th>Jumlah (RM)</th>
-                  <th width="20%"></th>
-                  <th>Peti Besi</th>
-                  <th>Jumlah (RM)</th>
-            </tr>
-            <tr>
-              <td class="text-center">RM 0.01</td>
-              <td><input type="text" data-deno="" name="ambilansen1" onchange="totaltukarandeno(this)" class="form-control text-center editfunc" id="sen1" readonly/> </td>
-              <td><input type="text" name="totalsen1" id="totalsen1" class="form-control text-center" value="0.00" readonly/> </td>
-              <td class="text-center">RM 1.00</td>
-              <td><input type="text" data-deno="" name="ambilanring1" class="form-control text-center editfunc" id="ringgit1" onchange="totaltukarandeno(this)" readonly/> </td>
-              <td><input type="text" name="totalring1" id="totalringgit1" class="form-control text-center" value="0.00" readonly/> </td>
-          </tr>
-          <tr>
-              <td class="text-center">RM 0.05</td>
-              <td><input type="text" data-deno="" name="ambilansen5" class="form-control text-center editfunc" id="sen5" onchange="totaltukarandeno(this)" readonly/> </td>
-              <td><input type="text" name="totalsen5" id="totalsen5" class="form-control text-center" value="0.00" readonly/> </td>
-              <td class="text-center">RM 5.00</td>
-              <td><input type="text" data-deno="" name="ambilanring5" class="form-control text-center editfunc" id="ringgit5" onchange="totaltukarandeno(this)" readonly/> </td>
-              <td><input type="text" name="totalring5" id="totalringgit5" class="form-control text-center" value="0.00" readonly/> </td>
-          </tr>
-          <tr>
-              <td class="text-center">RM 0.10</td>
-              <td><input type="text" data-deno="" name="ambilansen10" class="form-control text-center editfunc" id="sen10" onchange="totaltukarandeno(this)" readonly/> </td>
-              <td><input type="text" name="totalsen10" id="totalsen10" class="form-control text-center" value="0.00" readonly/> </td>
-              <td class="text-center">RM 10.00</td>
-              <td><input type="text" data-deno="" name="ambilanring10" class="form-control text-center editfunc" id="ringgit10" onchange="totaltukarandeno(this)" readonly/> </td>
-              <td><input type="text" name="totalring10" id="totalringgit10" class="form-control text-center" value="0.00" readonly/> </td>
-          </tr>
-          <tr>
-            <td class="text-center">RM 0.20</td>
-            <td><input type="text" data-deno="" name="ambilansen20" class="form-control text-center editfunc" id="sen20" onchange="totaltukarandeno(this)" readonly/> </td>
-            <td><input type="text" name="totalsen20" id="totalsen20" class="form-control text-center" value="0.00" readonly/> </td>
-            <td class="text-center"> RM 20.00</td>
-            <td><input type="text" data-deno="" name="ambilanring20" class="form-control text-center editfunc" id="ringgit20" onchange="totaltukarandeno(this)" readonly/> </td>
-            <td><input type="text" name="totalring20" id="totalringgit20" class="form-control text-center" value="0.00" readonly/> </td>
-        </tr>
-        <tr>
-          <td class="text-center">RM 0.50</td>
-          <td><input type="text" data-deno="" name="ambilansen50" class="form-control text-center editfunc" id="sen50" onchange="totaltukarandeno(this)" readonly/> </td>
-          <td><input type="text" name="totalsen50" id="totalsen50" class="form-control text-center" value="0.00" readonly/> </td>
-          <td class="text-center">RM 50.00</td> 
-          <td><input type="text" data-deno="" name="ambilanring50" class="form-control text-center editfunc" id="ringgit50" onchange="totaltukarandeno(this)" readonly/> </td>
-          <td><input type="text" name="totalring50" id="totalringgit50" class="form-control text-center" value="0.00" readonly/> </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td class="text-center">RM 100.00 </td> 
-        <td><input type="text" data-deno="" name="ambilanring100" class="form-control text-center editfunc" id="ringgit100" onchange="totaltukarandeno(this)" readonly/> </td>
-        <td><input type="text" name="totalring100" id="totalringgit100" class="form-control text-center" value="0.00" readonly/> </td>
-      </tr>
-      </table>
+            <div class="modal-body">
+
+                <div class="alert alert-warning text-center d-none" role="alert">
+                    <i class='fas fa-exclamation-triangle text-danger mr-2'></i> is a primary alert—check it out!
+                </div>
+                <div class="tab-content">
+                    <div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
+
+                        <table class="table">
+                            <tr>
+                                <th></th>
+                                <th>Peti Besi</th>
+                                <th>Jumlah (RM)</th>
+                                <th></th>
+                                <th>Peti Besi</th>
+                                <th>Jumlah (RM)</th>
+                            </tr>
+                            <tr>
+                                <td>RM 1.00</td>
+                                <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" readonly />
+                                </td>
+                                <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00"
+                                        readonly /> </td>
+                                <td> RM 20.00</td>
+                                <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" readonly />
+                                </td>
+                                <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00"
+                                        readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td>RM 5.00</td>
+                                <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" readonly />
+                                </td>
+                                <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00"
+                                        readonly /> </td>
+                                <td>RM 50.00</td>
+                                <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" readonly />
+                                </td>
+                                <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00"
+                                        readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td>RM 10.00</td>
+                                <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" readonly />
+                                </td>
+                                <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00"
+                                        readonly /> </td>
+                                <td>RM 100.00 </td>
+                                <td><input type="text" name="ambilanb100" class="form-control" id="bundle100"
+                                        readonly /> </td>
+                                <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00"
+                                        readonly /> </td>
+                            </tr>
+                        </table>
+
+                    </div>
+                    <div class="tab-pane fade  show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
+
+                        <table class="table">
+                            <tr class="bg-warning text-center">
+                                <th width="20%"></th>
+                                <th>Peti Besi</th>
+                                <th>Jumlah (RM)</th>
+                                <th width="20%"></th>
+                                <th>Peti Besi</th>
+                                <th>Jumlah (RM)</th>
+                            </tr>
+                            <tr>
+                                <td class="text-center">RM 0.01</td>
+                                <td><input type="text" data-deno="" name="ambilansen1" onchange="totaltukarandeno(this)"
+                                        class="form-control text-center editfunc" id="sen1" readonly /> </td>
+                                <td><input type="text" name="totalsen1" id="totalsen1" class="form-control text-center"
+                                        value="0.00" readonly /> </td>
+                                <td class="text-center">RM 1.00</td>
+                                <td><input type="text" data-deno="" name="ambilanring1"
+                                        class="form-control text-center editfunc" id="ringgit1"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring1" id="totalringgit1"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td class="text-center">RM 0.05</td>
+                                <td><input type="text" data-deno="" name="ambilansen5"
+                                        class="form-control text-center editfunc" id="sen5"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalsen5" id="totalsen5" class="form-control text-center"
+                                        value="0.00" readonly /> </td>
+                                <td class="text-center">RM 5.00</td>
+                                <td><input type="text" data-deno="" name="ambilanring5"
+                                        class="form-control text-center editfunc" id="ringgit5"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring5" id="totalringgit5"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td class="text-center">RM 0.10</td>
+                                <td><input type="text" data-deno="" name="ambilansen10"
+                                        class="form-control text-center editfunc" id="sen10"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalsen10" id="totalsen10"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                                <td class="text-center">RM 10.00</td>
+                                <td><input type="text" data-deno="" name="ambilanring10"
+                                        class="form-control text-center editfunc" id="ringgit10"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring10" id="totalringgit10"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td class="text-center">RM 0.20</td>
+                                <td><input type="text" data-deno="" name="ambilansen20"
+                                        class="form-control text-center editfunc" id="sen20"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalsen20" id="totalsen20"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                                <td class="text-center"> RM 20.00</td>
+                                <td><input type="text" data-deno="" name="ambilanring20"
+                                        class="form-control text-center editfunc" id="ringgit20"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring20" id="totalringgit20"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td class="text-center">RM 0.50</td>
+                                <td><input type="text" data-deno="" name="ambilansen50"
+                                        class="form-control text-center editfunc" id="sen50"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalsen50" id="totalsen50"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                                <td class="text-center">RM 50.00</td>
+                                <td><input type="text" data-deno="" name="ambilanring50"
+                                        class="form-control text-center editfunc" id="ringgit50"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring50" id="totalringgit50"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                            <tr>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td class="text-center">RM 100.00 </td>
+                                <td><input type="text" data-deno="" name="ambilanring100"
+                                        class="form-control text-center editfunc" id="ringgit100"
+                                        onchange="totaltukarandeno(this)" readonly /> </td>
+                                <td><input type="text" name="totalring100" id="totalringgit100"
+                                        class="form-control text-center" value="0.00" readonly /> </td>
+                            </tr>
+                        </table>
+
+                    </div>
+                </div>
+
+                <input type="hidden" id="jenisjenis" />
+                <input type="hidden" id="kodcawangan" />
+                <input type="hidden" id="tellerla" />
 
             </div>
-          </div>
-
-          <input type="hidden" id="jenisjenis"/>
-          <input type="hidden" id="kodcawangan"/>
-          <input type="hidden" id="tellerla"/>
-
+            <div class="modal-footer">
+                <button type="button" class="btn btn-warning btn-lg" id="editbtn" onclick="editfunc()">Edit</button>
+                <button type="button" class="btn btn-danger btn-lg" id="tutupbtn" data-dismiss="modal">Tutup</button>
+                <button type="button" class="btn btn-success btn-lg d-none" id="simpanbtn"
+                    onclick="simpanfunc()">Simpan</button>
+                <button type="button" class="btn btn-danger btn-lg d-none" id="batalbtn"
+                    onclick="batalfunc()">Batal</button>
+            </div>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-warning btn-lg" id="editbtn" onclick="editfunc()">Edit</button>
-            <button type="button" class="btn btn-danger btn-lg" id="tutupbtn" data-dismiss="modal">Tutup</button>
-            <button type="button" class="btn btn-success btn-lg d-none" id="simpanbtn" onclick="simpanfunc()">Simpan</button>
-            <button type="button" class="btn btn-danger btn-lg d-none" id="batalbtn" onclick="batalfunc()">Batal</button>
-        </div>
-      </div>
     </div>
-  </div>
+</div>
 
 <div class="container">
 
+    <div class="row justify-content-center">
 
-    <div class="row justify-content-center" style="margin-top:60px;">
         <div class="col-md-12">
-            
+
             <div class="card">
 
                 <div class="card-header bg-secondary text-center">{{ __('Paparan Utama') }}</div>
 
                 <div class="card-body text-center">
 
-                 <div class="row form-group justify-content-center">   
-                 <div class="col-3 mx-1">    
-                 <div class="row">    
-                <a href="{{ url('dashboard') }}" disabled class="btn btn-info btn-lg btn-block mb-3">Dashboard</a>
-                 </div>
-                <div class="row">
-                <a href="{{ url('kakitangan') }}" class="btn btn-info btn-lg btn-block mb-3">Kakitangan</a>
-            </div>
-            <div class="row">
-                <a href="{{ url('kelulusan') }}" id="btnkelulusan" class="btn btn-info btn-lg btn-block  mb-3">Kelulusan</a>
-            </div>
-            <div class="row">
-                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Bajet</a>
-            </div>
-            <div class="row">
-              <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Permohonan</a>
-            </div>
-                 </div>
+                    <div class="row form-group justify-content-center">
+                        <div class="col-3 mx-1">
+                            <div class="row">
+                                <a href="{{ url('dashboard') }}" disabled
+                                    class="btn btn-info btn-lg btn-block mb-3">Dashboard</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ url('kakitangan') }}"
+                                    class="btn btn-info btn-lg btn-block mb-3">Kakitangan</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ url('kelulusan') }}" id="btnkelulusan"
+                                    class="btn btn-info btn-lg btn-block  mb-3">Kelulusan</a>
+                            </div>
+                            {{-- <div class="row">
+            <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Bajet</a>
+        </div> --}}
+                            {{-- <div class="row">
+          <a href="{{ url('permohonan') }}" class="btn btn-danger btn-lg btn-block mb-3">Permohonan</a>
+                        </div> --}}
+                        <div class="row">
+                            <a href="#" data-target="#denominasiShowModal" data-backdrop="static" data-keyboard="false"
+                                data-toggle="modal" class="btn btn-info btn-lg btn-block mb-3">Denominasi</a>
+                        </div>
+                    </div>
 
-                <div class="col-3 mx-1">
-                <div class="row">
-                <a href="{{ route('khazanah.pelanggan') }}" class="btn btn-info btn-lg btn-block mb-3">Pelanggan</a>
-            </div>
-            <div class="row">
-                <a href="{{ route('laporan') }}" class="btn btn-info btn-lg btn-block mb-3">Laporan</a>
-            </div>
-            <div class="row">
-                <a href="{{ url('menu') }}" class="btn btn-info btn-lg btn-block mb-3">Khazanah</a>
-            </div>
-            <div class="row">
-                <a href="{{ url('pendahuluanserahan') }}" class="btn btn-info btn-lg btn-block mb-3">Pendahuluan - Serahan</a>
-            </div>
-            <div class="row">
-                <a href="#" data-target="#denominasiShowModal" data-backdrop="static" data-keyboard="false" data-toggle="modal" class="btn btn-info btn-lg btn-block mb-3">Denominasi</a>
-            </div>
-        
-            </div>
-                <div class="col-3 mx-1">
-            <div class="row">
-                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Capaian</a>
-            </div>
-            <div class="row">
-                <a href="{{ route('lelong') }}" class="btn btn-info btn-lg btn-block mb-3">Lelong</a>
-            </div>
-            <div class="row">
-                <a href="{{ url('panjar') }}" class="btn btn-info btn-lg btn-block mb-3">Perbelanjaan</a>
-            </div>
-            <div class="row">
-                <a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block  mb-3">Aliran Tunai</a>
-            </div>
-            </div>
-                       
-            </div>
+                    <div class="col-3 mx-1">
+                        <div class="row">
+                            <a href="{{ route('khazanah.pelanggan') }}"
+                                class="btn btn-info btn-lg btn-block mb-3">Pelanggan</a>
+                        </div>
+                        <div class="row">
+                            <a href="{{ route('laporan') }}" class="btn btn-info btn-lg btn-block mb-3">Laporan</a>
+                        </div>
+                        <div class="row">
+                            <a href="{{ url('menu') }}"
+                                class="btn {{ $countkhazanah > 0 ? 'btn-danger' : 'btn-info' }} btn-lg btn-block mb-3">Khazanah</a>
+                        </div>
+                        <div class="row">
+                            <a href="{{ url('pendahuluanserahan') }}"
+                                class="btn btn-info btn-lg btn-block mb-3">Pendahuluan - Serahan</a>
+                        </div>
+                    </div>
+                    <div class="col-3 mx-1">
+                        {{-- <div class="row">
+            <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Capaian</a>
+        </div> --}}
+                        <div class="row">
+                            <a href="{{ route('lelong') }}" class="btn btn-info btn-lg btn-block mb-3">Lelong</a>
+                        </div>
+                        <div class="row">
+                            <a href="{{ url('panjar') }}" class="btn btn-info btn-lg btn-block mb-3">Perbelanjaan</a>
+                        </div>
+                        <div class="row">
+                            <a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block  mb-3">Aliran
+                                Tunai</a>
+                        </div>
+                    </div>
+
+                </div>
             </div>
         </div>
     </div>
 </div>
+</div>
+
 <script>
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
 
-        const formatter = new Intl.NumberFormat('en-US', {
-            minimumFractionDigits: 2
-        });
+    var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+        cluster: 'ap1',
+        encrypted: true
+    });
 
-        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-            cluster: 'ap1',
-            encrypted: true
-        });
+    var cawangankhazanah = '{{ Auth::user()->cawangan }}';
 
-        var cawangankhazanah = '{{ Auth::user()->cawangan }}';
+    var channel = pusher.subscribe('status-liked');
+    channel.bind('my-event', function (data) {
+        // let message = JSON.stringify(data);
 
-        var channel = pusher.subscribe('status-liked');
-        channel.bind('my-event', function(data) {
-            // let message = JSON.stringify(data);
+        if (cawangankhazanah == data.cawangan) {
+            $('#btnkelulusan').removeClass("btn-primary").addClass("btn-success");
 
-            if(cawangankhazanah == data.cawangan)
-            {
-                $('#btnkelulusan').removeClass("btn-primary").addClass("btn-success");
-
-            }
-        });
-
-        $(function() {
-            getData();
-        });
-
-
-        let api = "{{ config('api.url') }}";
-        let kodcaw = "{{ Auth::user()->cawangan }}";
-
-        const initialambilan = [["bundle1",0,0],["bundle5",0,0],["bundle10",0,0],
-                          ["bundle20",0,0],["bundle50",0,0],["bundle100",0,0],
-                          ["sen1",0,0],["sen5",0,0],["sen10",0,0],
-                          ["sen20",0,0],["sen50",0,0],["ringgit1",0,0],
-                          ["ringgit5",0,0],["ringgit10",0,0],["ringgit20",0,0],
-                          ["ringgit50",0,0],["ringgit100",0,0]
-                          ];
-
-        let arrayambilan = [["bundle1",0,0],["bundle5",0,0],["bundle10",0,0],
-                          ["bundle20",0,0],["bundle50",0,0],["bundle100",0,0],
-                          ["sen1",0,0],["sen5",0,0],["sen10",0,0],
-                          ["sen20",0,0],["sen50",0,0],["ringgit1",0,0],
-                          ["ringgit5",0,0],["ringgit10",0,0],["ringgit20",0,0],
-                          ["ringgit50",0,0],["ringgit100",0,0]
-                          ];
-
-
-        function saveData()
-        {
-          let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
-          let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val();
-          let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();let ringgit100 = $('#ringgit100').val();
-
-
-          $.ajax({
-            method: 'put',
-	    async:false,
-            url: api + '/api/DenominasiUpdate/' + kodcaw,
-            data: { 
-              "bd1" : bundle1,
-              "bd5": bundle5,
-              "bd10": bundle10,
-              "bd20": bundle20,
-              "bd50": bundle50,
-              "bd100": bundle100,
-              "txtring1": ringgit1,
-              "txtring5": ringgit5,
-              "txtsen1": sen1,
-              "txtsen5": sen5,
-              "txtsen10": sen10,
-              "txtsen20": sen20,
-              "txtsen50": sen50,
-              "txtring10": ringgit10,
-              "txtring20": ringgit20,
-              "txtring50": ringgit50,
-              "txtring100": ringgit100,
-              "txtring1000": "0",
-              "jumlahbundle": "0",
-              "txtjumlah": "0",
-              "jumlahkeping" : "0"
-            } ,
-            success:function(data){
-              console.log(data);
-            }
-          });
         }
+    });
 
-        function getData()
-        {
-          $.ajax({
-          method: 'get',
-          url: api + '/api/VaultController/' + kodcaw,
-          success:function(data){
-            $('#amaunvault').val(formatter.format(data[0].bakiakhir));
-          }
-          });
+    $(function () {
+        getData();
+    });
+
+
+    let api = "{{ config('api.url') }}";
+    let kodcaw = "{{ Auth::user()->cawangan }}";
+
+    const initialambilan = [
+        ["bundle1", 0, 0],
+        ["bundle5", 0, 0],
+        ["bundle10", 0, 0],
+        ["bundle20", 0, 0],
+        ["bundle50", 0, 0],
+        ["bundle100", 0, 0],
+        ["sen1", 0, 0],
+        ["sen5", 0, 0],
+        ["sen10", 0, 0],
+        ["sen20", 0, 0],
+        ["sen50", 0, 0],
+        ["ringgit1", 0, 0],
+        ["ringgit5", 0, 0],
+        ["ringgit10", 0, 0],
+        ["ringgit20", 0, 0],
+        ["ringgit50", 0, 0],
+        ["ringgit100", 0, 0]
+    ];
+
+    let arrayambilan = [
+        ["bundle1", 0, 0],
+        ["bundle5", 0, 0],
+        ["bundle10", 0, 0],
+        ["bundle20", 0, 0],
+        ["bundle50", 0, 0],
+        ["bundle100", 0, 0],
+        ["sen1", 0, 0],
+        ["sen5", 0, 0],
+        ["sen10", 0, 0],
+        ["sen20", 0, 0],
+        ["sen50", 0, 0],
+        ["ringgit1", 0, 0],
+        ["ringgit5", 0, 0],
+        ["ringgit10", 0, 0],
+        ["ringgit20", 0, 0],
+        ["ringgit50", 0, 0],
+        ["ringgit100", 0, 0]
+    ];
+
+
+    function saveData() {
+        let bundle1 = $('#bundle1').val();
+        let bundle5 = $('#bundle5').val();
+        let bundle10 = $('#bundle10').val();
+        let bundle20 = $('#bundle20').val();
+        let bundle50 = $('#bundle50').val();
+        let bundle100 = $('#bundle100').val();
+        let sen1 = $('#sen1').val();
+        let sen5 = $('#sen5').val();
+        let sen10 = $('#sen10').val();
+        let sen20 = $('#sen20').val();
+        let sen50 = $('#sen50').val();
+        let ringgit1 = $('#ringgit1').val();
+        let ringgit5 = $('#ringgit5').val();
+        let ringgit10 = $('#ringgit10').val();
+        let ringgit20 = $('#ringgit20').val();
+        let ringgit50 = $('#ringgit50').val();
+        let ringgit100 = $('#ringgit100').val();
+
+
+        $.ajax({
+            method: 'put',
+            async: false,
+            url: api + '/api/DenominasiUpdate/' + kodcaw,
+            data: {
+                "bd1": bundle1,
+                "bd5": bundle5,
+                "bd10": bundle10,
+                "bd20": bundle20,
+                "bd50": bundle50,
+                "bd100": bundle100,
+                "txtring1": ringgit1,
+                "txtring5": ringgit5,
+                "txtsen1": sen1,
+                "txtsen5": sen5,
+                "txtsen10": sen10,
+                "txtsen20": sen20,
+                "txtsen50": sen50,
+                "txtring10": ringgit10,
+                "txtring20": ringgit20,
+                "txtring50": ringgit50,
+                "txtring100": ringgit100,
+                "txtring1000": "0",
+                "jumlahbundle": "0",
+                "txtjumlah": "0",
+                "jumlahkeping": "0"
+            },
+            success: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    function getData() {
+        $.ajax({
+            method: 'get',
+            url: api + '/api/VaultController/' + kodcaw,
+            success: function (data) {
+                $('#amaunvault').val(formatter.format(data[0].bakiakhir));
+            }
+        });
+
+        $.ajax({
+            method: 'get',
+            url: api + '/api/DenominasiController/' + kodcaw,
+            success: function (data) {
+                $.each(data, function (key, val) {
 
-          $.ajax({
-              method: 'get',
-              url: api + '/api/DenominasiController/' + kodcaw,
-              success:function(data)
-              {
-                  $.each(data, function(key,val) {             
-                    
                     initialambilan[0][1] = val.bd1;
                     initialambilan[0][2] = parseFloat(Number(val.b1));
                     initialambilan[1][1] = val.bd5;
@@ -399,107 +494,103 @@
                     arrayambilan[16][1] = val.txtring100;
                     arrayambilan[16][2] = parseFloat(Number(val.k100));
 
-                      $('#bundle1').val(val.bd1);
-                      $('#totalb1').val(formatter.format(val.b1));
+                    $('#bundle1').val(val.bd1);
+                    $('#totalb1').val(formatter.format(val.b1));
 
-                      $('#bundle20').val(val.bd20);
-                      $('#totalb20').val(formatter.format(val.b20));
+                    $('#bundle20').val(val.bd20);
+                    $('#totalb20').val(formatter.format(val.b20));
 
-                      $('#bundle5').val(val.bd5);
-                      $('#totalb5').val(formatter.format(val.b5));
+                    $('#bundle5').val(val.bd5);
+                    $('#totalb5').val(formatter.format(val.b5));
 
-                      $('#bundle50').val(val.bd50);
-                      $('#totalb50').val(formatter.format(val.b50));
+                    $('#bundle50').val(val.bd50);
+                    $('#totalb50').val(formatter.format(val.b50));
 
-                      $('#bundle10').val(val.bd10);
-                      $('#totalb10').val(formatter.format(val.b10));
+                    $('#bundle10').val(val.bd10);
+                    $('#totalb10').val(formatter.format(val.b10));
 
-                      $('#bundle100').val(val.bd100);
-                      $('#totalb100').val(formatter.format(val.b100));
+                    $('#bundle100').val(val.bd100);
+                    $('#totalb100').val(formatter.format(val.b100));
 
-                      $('#sen1').val(val.txtsen1);
-                      $('#sen1').data('deno',val.txtsen1);
-                      $('#totalsen1').val(formatter.format(val.k01));
+                    $('#sen1').val(val.txtsen1);
+                    $('#sen1').data('deno', val.txtsen1);
+                    $('#totalsen1').val(formatter.format(val.k01));
 
-                      $('#sen5').val(val.txtsen5);
-                      $('#sen5').data('deno',val.txtsen5);
-                      $('#totalsen5').val(formatter.format(val.k05));
+                    $('#sen5').val(val.txtsen5);
+                    $('#sen5').data('deno', val.txtsen5);
+                    $('#totalsen5').val(formatter.format(val.k05));
 
-                      $('#sen10').val(val.txtsen10);
-                      $('#sen10').data('deno',val.txtsen10);
-                      $('#totalsen10').val(formatter.format(val.k010));
+                    $('#sen10').val(val.txtsen10);
+                    $('#sen10').data('deno', val.txtsen10);
+                    $('#totalsen10').val(formatter.format(val.k010));
 
-                      $('#sen20').val(val.txtsen20);
-                      $('#sen20').data('deno',val.txtsen20);
-                      $('#totalsen20').val(formatter.format(val.k020));
+                    $('#sen20').val(val.txtsen20);
+                    $('#sen20').data('deno', val.txtsen20);
+                    $('#totalsen20').val(formatter.format(val.k020));
 
-                      $('#sen50').val(val.txtsen50);
-                      $('#sen50').data('deno',val.txtsen50);
-                      $('#totalsen50').val(formatter.format(val.k050));
+                    $('#sen50').val(val.txtsen50);
+                    $('#sen50').data('deno', val.txtsen50);
+                    $('#totalsen50').val(formatter.format(val.k050));
 
-                      $('#ringgit1').val(val.txtring1);
-                      $('#ringgit1').data('deno',val.txtring1);
-                      $('#totalringgit1').val(formatter.format(val.k1));
+                    $('#ringgit1').val(val.txtring1);
+                    $('#ringgit1').data('deno', val.txtring1);
+                    $('#totalringgit1').val(formatter.format(val.k1));
 
-                      $('#ringgit5').val(val.txtring5);
-                      $('#ringgit5').data('deno',val.txtring5);
-                      $('#totalringgit5').val(formatter.format(val.k5));
+                    $('#ringgit5').val(val.txtring5);
+                    $('#ringgit5').data('deno', val.txtring5);
+                    $('#totalringgit5').val(formatter.format(val.k5));
 
-                      $('#ringgit10').val(val.txtring10);
-                      $('#ringgit10').data('deno',val.txtring10);
-                      $('#totalringgit10').val(formatter.format(val.k10));
+                    $('#ringgit10').val(val.txtring10);
+                    $('#ringgit10').data('deno', val.txtring10);
+                    $('#totalringgit10').val(formatter.format(val.k10));
 
-                      $('#ringgit20').val(val.txtring20);
-                      $('#ringgit20').data('deno',val.txtring20);
-                      $('#totalringgit20').val(formatter.format(val.k20));
+                    $('#ringgit20').val(val.txtring20);
+                    $('#ringgit20').data('deno', val.txtring20);
+                    $('#totalringgit20').val(formatter.format(val.k20));
 
-                      $('#ringgit50').val(val.txtring50);
-                      $('#ringgit50').data('deno',val.txtring50);
-                      $('#totalringgit50').val(formatter.format(val.k50));
+                    $('#ringgit50').val(val.txtring50);
+                    $('#ringgit50').data('deno', val.txtring50);
+                    $('#totalringgit50').val(formatter.format(val.k50));
 
-                      $('#ringgit100').val(val.txtring100);
-                      $('#ringgit100').data('deno',val.txtring100);
-                      $('#totalringgit100').val(formatter.format(val.k100));
+                    $('#ringgit100').val(val.txtring100);
+                    $('#ringgit100').data('deno', val.txtring100);
+                    $('#totalringgit100').val(formatter.format(val.k100));
 
-                      $('#amaunkeping').val(formatter.format(val.jumlahkeping));
-                      $('#amaunbundle').val(formatter.format(val.jumlahbundle));
-                      $('#amaunkeseluruhan').val(formatter.format(val.txtjumlah));
-                      $('#amaunkeseluruhan').data('amaun',val.txtjumlah);
+                    $('#amaunkeping').val(formatter.format(val.jumlahkeping));
+                    $('#amaunbundle').val(formatter.format(val.jumlahbundle));
+                    $('#amaunkeseluruhan').val(formatter.format(val.txtjumlah));
+                    $('#amaunkeseluruhan').data('amaun', val.txtjumlah);
 
-                  });     
-              }
-              
-          });
-        }
-        
+                });
+            }
 
-      function editfunc()
-      {
-        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
-        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+        });
+    }
+
+
+    function editfunc() {
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g, "");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g, "");
 
         $('#editbtn').addClass('d-none');
         $('#tutupbtn').addClass('d-none');
         $('#simpanbtn').removeClass('d-none');
         $('#batalbtn').removeClass('d-none');
 
-        if(parseFloat(Number(amaundeno)) > parseFloat(Number(amaunvault)))
-        {
-          $('#amaunkeseluruhan').addClass('bg-success');
-        }else if(parseFloat(Number(amaundeno)) < parseFloat(Number(amaunvault)))
-        {
-          $('#amaunkeseluruhan').addClass('bg-danger');
-        }else{
-          $('#amaunkeseluruhan').removeClass('bg-success');
-          $('#amaunkeseluruhan').removeClass('bg-danger');
+        if (parseFloat(Number(amaundeno)) > parseFloat(Number(amaunvault))) {
+            $('#amaunkeseluruhan').addClass('bg-success');
+        } else if (parseFloat(Number(amaundeno)) < parseFloat(Number(amaunvault))) {
+            $('#amaunkeseluruhan').addClass('bg-danger');
+        } else {
+            $('#amaunkeseluruhan').removeClass('bg-success');
+            $('#amaunkeseluruhan').removeClass('bg-danger');
         }
-        
-        $('.editfunc').prop('readonly',false);
-      }
 
-      function simpanfunc()
-      {
-	// console.log('simpan');
+        $('.editfunc').prop('readonly', false);
+    }
+
+    function simpanfunc() {
+        // console.log('simpan');
         //Swal.fire({
         //      title: 'Adakah anda pasti untuk mengemaskini denominasi?',
         //      text: "Sila pastikan denominasi anda betul!",
@@ -515,68 +606,63 @@
         //    });
 
 
-        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
-        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g, "");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g, "");
         let samacount = 0;
 
-        if(amaundeno !== amaunvault)
-        {
-          $.each(initialambilan, function(index, initial){
-            $.each(arrayambilan, function(index1, arr){
+        if (amaundeno !== amaunvault) {
+            $.each(initialambilan, function (index, initial) {
+                $.each(arrayambilan, function (index1, arr) {
 
-              if(initial[0] === arr[0])
-              {
-                if((initial[1] === arr[1]) && (initial[2] === arr[2]))
-                {
-                  
-                }else{
-                  samacount++;
-                }
-              }
+                    if (initial[0] === arr[0]) {
+                        if ((initial[1] === arr[1]) && (initial[2] === arr[2])) {
 
+                        } else {
+                            samacount++;
+                        }
+                    }
+
+                });
             });
-          });
         }
 
-        if(samacount != 0)
-        {
-          if(amaundeno != amaunvault)
-          {
-            Swal.fire({
-            icon: 'error',
-            title: 'Denominasi dan peti besi masih tidak sama!',
-            text: "Sila pastikan denominasi anda betul!"
-            });
+        if (samacount != 0) {
+            if (amaundeno != amaunvault) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Denominasi dan peti besi masih tidak sama!',
+                    text: "Sila pastikan denominasi anda betul!"
+                });
 
-            return false;
-          }
-        }else{
+                return false;
+            }
+        } else {
 
             Swal.fire({
-              title: 'Adakah anda pasti untuk mengemaskini denominasi?',
-              text: "Sila pastikan denominasi anda betul!",
-              icon: 'warning',
-              showCancelButton: true,
-              confirmButtonColor: '#3085d6',
-              cancelButtonColor: '#d33',
-              confirmButtonText: 'Simpan'
+                title: 'Adakah anda pasti untuk mengemaskini denominasi?',
+                text: "Sila pastikan denominasi anda betul!",
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Simpan'
             }).then((result) => {
 
-              if (result.isConfirmed) {
+                if (result.isConfirmed) {
 
-                saveData();
+                    saveData();
 
-                $('#editbtn').removeClass('d-none');
-                $('#tutupbtn').removeClass('d-none');
-                $('#simpanbtn').addClass('d-none');
-                $('#batalbtn').addClass('d-none');
+                    $('#editbtn').removeClass('d-none');
+                    $('#tutupbtn').removeClass('d-none');
+                    $('#simpanbtn').addClass('d-none');
+                    $('#batalbtn').addClass('d-none');
 
-                $('.editfunc').prop('readonly',true);
+                    $('.editfunc').prop('readonly', true);
 
-                location.reload();
-              }else if(result.isDismissed){
-                
-              }
+                    location.reload();
+                } else if (result.isDismissed) {
+
+                }
             })
 
         }
@@ -586,30 +672,28 @@
         $('#simpanbtn').addClass('d-none');
         $('#batalbtn').addClass('d-none');
 
-        $('.editfunc').prop('readonly',true);
-        
-      }
+        $('.editfunc').prop('readonly', true);
 
-      function batalfunc()
-      {
+    }
+
+    function batalfunc() {
         let totalamaun = 0;
 
-        $.each(initialambilan, function( index, initial ){
-          $('#' + initial[0]).val(Number(initial[1]));
-          $('#total' + initial[0]).val(formatter.format(initial[2]));
+        $.each(initialambilan, function (index, initial) {
+            $('#' + initial[0]).val(Number(initial[1]));
+            $('#total' + initial[0]).val(formatter.format(initial[2]));
 
-          totalamaun += initial[2];
+            totalamaun += initial[2];
 
 
-          $.each(arrayambilan, function( index1, arr ){
+            $.each(arrayambilan, function (index1, arr) {
 
-            if(arr[0] == initial[0])
-            {
-              arr[1] = initial[1];
-              arr[2] = initial[2];
-            }
+                if (arr[0] == initial[0]) {
+                    arr[1] = initial[1];
+                    arr[2] = initial[2];
+                }
 
-          });
+            });
 
         });
 
@@ -620,138 +704,133 @@
         $('#simpanbtn').addClass('d-none');
         $('#batalbtn').addClass('d-none');
 
-        $('.editfunc').prop('readonly',true);
-      }
+        $('.editfunc').prop('readonly', true);
+    }
 
-      function totalamountdeno(idwang,bilangan)
-      {
+    function totalamountdeno(idwang, bilangan) {
         // console.log(idwang + 'asdas');
-          var amount = 0;
-          switch (idwang) { 
-              case 'bundle1': 
-                  amount += (bilangan * 100);
-                  break;
-              case 'bundle20': 
-                  amount += (bilangan * 1000);
-                  break;
-              case 'bundle5': 
-                  amount += (bilangan * 500);
-                  break;		
-              case 'bundle50': 
-                  amount += (bilangan * 5000);
-                  break;
-              case 'bundle10': 
-                  amount += (bilangan * 1000);
-                  break;
-              case 'bundle100': 
-                  amount += (bilangan * 5000);
-                  break;
-              case 'sen1': 
-                  amount += (bilangan * 0.01);
-                  break;
-              case 'sen5': 
-                  amount += (bilangan * 0.05);
-                  break;
-              case 'sen10': 
-                  console.log(bilangan);
-                  amount += (bilangan * 0.10);
-              break;
-              case 'sen20': 
-                  amount += (bilangan * 0.20);
-                  break;		
-              case 'sen50': 
-                  amount += (bilangan * 0.50);
-                  break;
-              case 'ringgit1': 
-                  amount += (bilangan * 1);
-                  break;
-              case 'ringgit5': 
-                  amount += (bilangan * 5);
-                  break;      
-              case 'ringgit10': 
-                  amount += (bilangan * 10);
-                  break;		
-              case 'ringgit20': 
-                  amount += (bilangan * 20);
-                  break;
-              case 'ringgit50': 
-                  amount += (bilangan * 50);
-                  break;
-              case 'ringgit100': 
-                  amount += (bilangan * 100);
-                  break;         
-          }
+        var amount = 0;
+        switch (idwang) {
+            case 'bundle1':
+                amount += (bilangan * 100);
+                break;
+            case 'bundle20':
+                amount += (bilangan * 1000);
+                break;
+            case 'bundle5':
+                amount += (bilangan * 500);
+                break;
+            case 'bundle50':
+                amount += (bilangan * 5000);
+                break;
+            case 'bundle10':
+                amount += (bilangan * 1000);
+                break;
+            case 'bundle100':
+                amount += (bilangan * 5000);
+                break;
+            case 'sen1':
+                amount += (bilangan * 0.01);
+                break;
+            case 'sen5':
+                amount += (bilangan * 0.05);
+                break;
+            case 'sen10':
+                console.log(bilangan);
+                amount += (bilangan * 0.10);
+                break;
+            case 'sen20':
+                amount += (bilangan * 0.20);
+                break;
+            case 'sen50':
+                amount += (bilangan * 0.50);
+                break;
+            case 'ringgit1':
+                amount += (bilangan * 1);
+                break;
+            case 'ringgit5':
+                amount += (bilangan * 5);
+                break;
+            case 'ringgit10':
+                amount += (bilangan * 10);
+                break;
+            case 'ringgit20':
+                amount += (bilangan * 20);
+                break;
+            case 'ringgit50':
+                amount += (bilangan * 50);
+                break;
+            case 'ringgit100':
+                amount += (bilangan * 100);
+                break;
+        }
 
-          return amount;
-      }
+        return amount;
+    }
 
 
 
-      function totaltukarandeno(datakeyin)
-      {
-        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
-        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+    function totaltukarandeno(datakeyin) {
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g, "");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g, "");
         var idkey = $(datakeyin).attr('id');
         var valkey = $(datakeyin).val();
         var deno = $(datakeyin).data('deno');
         var amount = 0;
 
-          // if(parseFloat(Number(valkey)) > parseFloat(Number(deno)))
-          // {
-          //     $('#' + idkey).val(0);
-          //   Swal.fire({
-          //       icon: 'error',
-          //       title: 'Amaun Kiraan lebih banyak daripada Amaun Sebenar!'
-          //     });
+        // if(parseFloat(Number(valkey)) > parseFloat(Number(deno)))
+        // {
+        //     $('#' + idkey).val(0);
+        //   Swal.fire({
+        //       icon: 'error',
+        //       title: 'Amaun Kiraan lebih banyak daripada Amaun Sebenar!'
+        //     });
 
-          //     return ;
-          // }
+        //     return ;
+        // }
 
-          var validate = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
-          
-          let indexarr = 0;
-          $.each(arrayambilan, function( index, arr ){
-            if(arr[0] == idkey)
-            {
+        var validate = $('#amaunvault').val().replace(/[^0-9.-]+/g, "");
+
+        let indexarr = 0;
+        $.each(arrayambilan, function (index, arr) {
+            if (arr[0] == idkey) {
                 arrayambilan[index][1] = Number(valkey);
-                arrayambilan[index][2] = totalamountdeno(idkey,valkey);
+                arrayambilan[index][2] = totalamountdeno(idkey, valkey);
                 indexarr = index;
             }
-                
+
             amount += parseFloat(Number(arr[2]));
 
-          });
+        });
 
-          // if(parseFloat(Number(amount)) > parseFloat(Number(validate)))
-          // {
-          //     // $('#' + idkey).val(0);
-          //     Swal.fire({
-          //       icon: 'error',
-          //       title: 'Amaran',
-          //       text: 'Jumlah deno melebihi peti besi',
-          //     });
-          // }
-          // else
-          // {
-          //   $('#amaunkiraan').val(formatter.format(amount));
-          // }
+        // if(parseFloat(Number(amount)) > parseFloat(Number(validate)))
+        // {
+        //     // $('#' + idkey).val(0);
+        //     Swal.fire({
+        //       icon: 'error',
+        //       title: 'Amaran',
+        //       text: 'Jumlah deno melebihi peti besi',
+        //     });
+        // }
+        // else
+        // {
+        //   $('#amaunkiraan').val(formatter.format(amount));
+        // }
 
-          $('#total' + idkey).val(formatter.format(arrayambilan[indexarr][2]));         
+        $('#total' + idkey).val(formatter.format(arrayambilan[indexarr][2]));
 
-          if(parseFloat(Number(amount)) > parseFloat(Number(amaunvault)))
-          {
+        if (parseFloat(Number(amount)) > parseFloat(Number(amaunvault))) {
             $('#amaunkeseluruhan').addClass('bg-success');
-          }else if(parseFloat(Number(amount)) < parseFloat(Number(amaunvault)))
-          {
+        } else if (parseFloat(Number(amount)) < parseFloat(Number(amaunvault))) {
             $('#amaunkeseluruhan').addClass('bg-danger');
-          }else{
+        } else {
             $('#amaunkeseluruhan').removeClass('bg-success');
             $('#amaunkeseluruhan').removeClass('bg-danger');
-          }
+        }
 
-          $('#amaunkeseluruhan').val(formatter.format(amount));
-            
-      }
+        $('#amaunkeseluruhan').val(formatter.format(amount));
+
+    }
 
 </script>
 @endsection
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index ed3171b..5ff2725 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -5,13 +5,13 @@
     <div class="modal-dialog modal-xl modal-dialog-centered">
         <div class="modal-content">
 
-          <!-- Modal Header -->
+            <!-- Modal Header -->
             <div class="modal-header">
                 <h4 class="modal-title"></h4>
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
             </div>
 
-          <!-- Modal body -->
+            <!-- Modal body -->
             <div class="modal-body">
                 <div class="row">
                     <div class="col-md-12">
@@ -42,13 +42,13 @@
                 </div>
             </div>
 
-          <!-- Modal footer -->
-          <div class="modal-footer">
-              <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-          </div>
+            <!-- Modal footer -->
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+            </div>
 
-      </div>
-  </div>
+        </div>
+    </div>
 </div>
 
 <div class="container">
@@ -58,13 +58,27 @@
 
                 <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('menu') }}">Khazanah</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Kelulusan Gadaian</li>
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                        <li class="breadcrumb-item"><a href="{{ url('menu') }}">Khazanah</a></li>
+                        <li class="breadcrumb-item active" aria-current="page">Kelulusan Gadaian</li>
                     </ol>
-                  </nav>
+                </nav>
 
                 <div class="card-body text-center">
+                    @if (\Session::has('type') == true && Session::get('type') == 'unavailable')
+                    <script>
+                        Swal.fire(
+                            "{!! \Session::get('message') !!}",
+                            "{{ \Session::get('norujukan') }}",
+                            'warning'
+                        )
+
+                    </script>
+                    @elseif(\Session::has('type') == true && Session::get('type') == 'scanned')
+                    <div class="alert alert-success text-bold d-flex mx-auto justify-content-center w-50">
+                        {!! \Session::get('message') !!} <br> {{ \Session::get('norujukan') }}
+                    </div>
+                    @endif
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">
                         </div>
@@ -72,7 +86,8 @@
                             <form action="{{ route('barcode.scanned') }}" method="post">
                                 @csrf
                                 <label>Scan Barcode Kemasukan Marhun Ke Peti Besi</label>
-                                <input type="text" class="form-control col-4 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"/>
+                                <input type="text" class="form-control col-4 mx-auto" name="norujukan_barcode"
+                                    autocomplete="off" id="norujukan_barcode" required />
                                 <input type="submit" id="submit_button" name="submit_button" hidden>
                             </form>
                         </div>
@@ -82,15 +97,19 @@
 
                     <ul class="nav nav-tabs" id="myTab" role="tablist">
                         <li class="nav-item">
-                            <a class="nav-link active" id="gadaian-semasa-tab" data-toggle="tab" href="#gadaian-semasa" role="tab" aria-controls="gadaian-semasa" aria-selected="true">Gadaian Masuk</a>
+                            <a class="nav-link active" id="gadaian-semasa-tab" data-toggle="tab" href="#gadaian-semasa"
+                                role="tab" aria-controls="gadaian-semasa" aria-selected="true">Gadaian Masuk</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false">Pengesahan Marhun</a>
+                            <a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab"
+                                href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah"
+                                aria-selected="false">Pengesahan Marhun</a>
                         </li>
                     </ul>
 
                     <div class="tab-content" id="myTabContent">
-                        <div class="tab-pane fade show active" id="gadaian-semasa" role="tabpanel" aria-labelledby="gadaian-semasa-tab">
+                        <div class="tab-pane fade show active" id="gadaian-semasa" role="tabpanel"
+                            aria-labelledby="gadaian-semasa-tab">
                             <div class="row mb-4">
                                 <div class="col-2">
                                 </div>
@@ -111,27 +130,35 @@
                                 </thead>
                                 <tbody>
                                     @if (is_array($gadai) || is_object($gadai))
-                                        @foreach($gadai as $index=>$gadaian)
-                                            <tr>
-                                                <td>{{ $index+1 }}</td>
-                                                <td>
-                                                    @php
-                                                        $marhun = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
-                                                    @endphp
-                                                    <a  style="user-select: none;" href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}"
-                                                    data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
-                                                </td>
-                                                <td>{{ number_format($gadaian['pinjaman'],2) }}</td>
-                                                <td>{{ number_format($gadaian['nilaimarhun'],2) }}</td>
-                                                <td>{{ $gadaian['teller'] }}</td>
-                                            </tr>
-                                        @endforeach
+                                    @foreach($gadai as $index=>$gadaian)
+                                    <tr>
+                                        <td>{{ $index+1 }}</td>
+                                        <td>
+                                            @php
+                                            $marhun = Http::withOptions(['verify' =>
+                                            config('app.api_verify')])->get($api_url . '/api/marhun/' .
+                                            $gadaian['norujukan'] )->json();
+                                            @endphp
+                                            <a style="user-select: none;" href="#" data-toggle="modal"
+                                                data-berat="{{$gadaian['berat']}}"
+                                                data-marhun="{{ json_encode($marhun) }}"
+                                                data-norujukan="{{$gadaian['norujukan']}}"
+                                                data-hargajualan="{{$gadaian['hargajualan']}}"
+                                                data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#marhunModal">
+                                                {{$gadaian['norujukan']}}</a>
+                                        </td>
+                                        <td>{{ number_format($gadaian['pinjaman'],2) }}</td>
+                                        <td>{{ number_format($gadaian['nilaimarhun'],2) }}</td>
+                                        <td>{{ $gadaian['teller'] }}</td>
+                                    </tr>
+                                    @endforeach
                                     @endif
                                 </tbody>
                             </table>
                         </div>
 
-                        <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
+                        <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel"
+                            aria-labelledby="gadaian-belum-serah-tab">
                             <div class="row mb-4">
                                 <div class="col-1">
                                 </div>
@@ -152,22 +179,29 @@
                                 </thead>
                                 <tbody>
                                     @if (is_array($petibesi) || is_object($petibesi))
-                                        @php $total_nm = 0; @endphp
-                                        @foreach($petibesi as $index=>$marhun)
-                                            @php $total_nm += $marhun['nilaimarhun']; @endphp
-                                            <tr>
-                                                <td>{{ $index+1 }}</td>
-                                                <td>
-                                                    @php
-                                                        $marhun_detail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $marhun['norujukan'] )->json();
-                                                    @endphp
-                                                    <a href="#" data-toggle="modal" data-berat="{{$marhun['berat']}}" data-marhun="{{ json_encode($marhun_detail) }}" data-norujukan="{{$marhun['norujukan']}}" data-hargajualan="{{$marhun['hargajualan']}}" data-kodcaw="{{ $marhun['kodcaw'] }}" data-target="#marhunModal"> {{$marhun['norujukan']}}</a>
-                                                </td>
-                                                <td>{{ number_format($marhun['pinjaman'],2) }}</td>
-                                                <td>{{ number_format($marhun['nilaimarhun'],2) }}</td>
-                                                <td>{{ $marhun['teller'] }}</td>
-                                            </tr>
-                                        @endforeach
+                                    @php $total_nm = 0; @endphp
+                                    @foreach($petibesi as $index=>$marhun)
+                                    @php $total_nm += $marhun['nilaimarhun']; @endphp
+                                    <tr>
+                                        <td>{{ $index+1 }}</td>
+                                        <td>
+                                            @php
+                                            $marhun_detail = Http::withOptions(['verify' =>
+                                            config('app.api_verify')])->get($api_url . '/api/marhun/' .
+                                            $marhun['norujukan'] )->json();
+                                            @endphp
+                                            <a href="#" data-toggle="modal" data-berat="{{$marhun['berat']}}"
+                                                data-marhun="{{ json_encode($marhun_detail) }}"
+                                                data-norujukan="{{$marhun['norujukan']}}"
+                                                data-hargajualan="{{$marhun['hargajualan']}}"
+                                                data-kodcaw="{{ $marhun['kodcaw'] }}" data-target="#marhunModal">
+                                                {{$marhun['norujukan']}}</a>
+                                        </td>
+                                        <td>{{ number_format($marhun['pinjaman'],2) }}</td>
+                                        <td>{{ number_format($marhun['nilaimarhun'],2) }}</td>
+                                        <td>{{ $marhun['teller'] }}</td>
+                                    </tr>
+                                    @endforeach
                                     @endif
                                 </tbody>
                             </table>
@@ -178,13 +212,15 @@
                         <div class="col-md-12">
                             <div class="row form-group justify-content-end">
                                 <label class="label-control mr-3">Nilai Marhun Terkumpul</label>
-                                <input class="form-control col-md-3" type="text" value="{{ number_format($total_nm,2) }}" readonly/>
+                                <input class="form-control col-md-3" type="text"
+                                    value="{{ number_format($total_nm,2) }}" readonly />
                             </div>
                         </div>
 
                     </div>
                     <div class="row mt-2 d-flex justify-content-end">
-                        <a href="{{ route('laporanscanbarcode') }}" target="_blank" class="btn btn-info mr-md-2">Rekod Barcode Gadaian</a>
+                        <a href="{{ route('laporanscanbarcode') }}" target="_blank" class="btn btn-info mr-md-2">Rekod
+                            Barcode Gadaian</a>
                         <!-- <a href="#" class="btn btn-info">Senarai Pembatalan No Rujukan</a> -->
                     </div>
                 </div>
@@ -205,10 +241,10 @@
 
     var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
         //   "scrollX": true
-        });
+    });
 
     var pengesahanmarhun = $('#table-gadaian-belum-serah').DataTable({
-    //   "scrollX": true
+        //   "scrollX": true
     });
 
     var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
@@ -217,19 +253,18 @@
     });
 
     var channel = pusher.subscribe('serahanpenilai-notify');
-    channel.bind('trigger-serahanpenilai', function(data) {
+    channel.bind('trigger-serahanpenilai', function (data) {
 
-        if(cawangan == data.kodcaw)
-        {
+        if (cawangan == data.kodcaw) {
             fetchGadaianEverytime();
         }
     });
 
-    $(document).ready(function(){
+    $(document).ready(function () {
         $('#norujukan_barcode').focus();
     })
 
-    $('#marhunModal').on('show.bs.modal', function(event) {
+    $('#marhunModal').on('show.bs.modal', function (event) {
         var button = $(event.relatedTarget); // button yg trigger
         var arraymarhun = button.data('marhun');
         var norujukan = button.data('norujukan');
@@ -240,19 +275,27 @@
         $('#jumlah_berat').val(total_berat);
         var bil_count = 0;
         $('#tablemarhun').empty();
-        $.each(arraymarhun,function(index,marhun){
-            $.each(marhun, function(index,marhun_detail){
+        $.each(arraymarhun, function (index, marhun) {
+            $.each(marhun, function (index, marhun_detail) {
                 var marhun_name;
                 $.ajax({
-                    method:'GET',
+                    method: 'GET',
                     url: api_url + '/api/jemas/nama_marhun',
                     dataType: 'json',
-                    data:{
-                        marhun:marhun_detail['marhun']
+                    data: {
+                        marhun: marhun_detail['marhun']
                     },
-                    success:function(marhun_ajax){
+                    success: function (marhun_ajax) {
                         bil_count++;
-                        $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
+                        $("#tablemarhun").append("<tr><td>" + bil_count +
+                            "</td><td>" + marhun_ajax['descpt'] + "</td><td>" +
+                            marhun_detail['berat'] + "</td><td>" +
+                            marhun_detail['karat'] + "</td><td>RM " +
+                            marhun_detail['n_marhun'].toLocaleString(
+                                undefined, {
+                                    minimumFractionDigits: 2
+                                }) + "</td><td>" + marhun_detail['nota'] +
+                            "</td></tr>");
                     }
                 });
             });
@@ -260,25 +303,34 @@
 
     })
 
-    function fetchGadaianEverytime(){
+    function fetchGadaianEverytime() {
 
         tablegadaianmasuk.clear().draw();
 
         $.ajax({
-            method:'get',
+            method: 'get',
             url: api_url + '/api/gadai/serah_marhun/khazanah/' + cawangan,
-            success:function(data){
+            success: function (data) {
                 var count = 0;
-                $.each(data,function(index,gadaianmasuk){
+                $.each(data, function (index, gadaianmasuk) {
                     $.ajax({
                         url: api_url + '/api/marhun/' + gadaianmasuk['norujukan'],
-                        method:'get',
-                        success:function(rekodmarhun){
+                        method: 'get',
+                        success: function (rekodmarhun) {
 
                             count++;
                             tablegadaianmasuk.row.add([
                                 count,
-                                '<a style="user-select: none;" href="#" data-toggle="modal" data-berat=' + gadaianmasuk['berat'] + ' data-marhun=' + JSON.stringify(rekodmarhun) + '  data-pinjaman=' + gadaianmasuk['pinjaman'] + ' data-norujukan=' + gadaianmasuk['norujukan'] + ' data-hargajualan=' + gadaianmasuk['hargajualan'] + ' data-kodcaw=' + gadaianmasuk['kodcaw'] + ' data-target="#marhunModal"> ' + gadaianmasuk['norujukan'] + '</a>',
+                                '<a style="user-select: none;" href="#" data-toggle="modal" data-berat=' +
+                                gadaianmasuk['berat'] + ' data-marhun=' + JSON
+                                .stringify(rekodmarhun) + '  data-pinjaman=' +
+                                gadaianmasuk['pinjaman'] + ' data-norujukan=' +
+                                gadaianmasuk['norujukan'] +
+                                ' data-hargajualan=' + gadaianmasuk[
+                                    'hargajualan'] + ' data-kodcaw=' +
+                                gadaianmasuk['kodcaw'] +
+                                ' data-target="#marhunModal"> ' + gadaianmasuk[
+                                    'norujukan'] + '</a>',
                                 formatter.format(gadaianmasuk['pinjaman']),
                                 formatter.format(gadaianmasuk['nilaimarhun']),
                                 gadaianmasuk['teller']
@@ -319,5 +371,6 @@
     //         }
     //     });
     // }
+
 </script>
 @endsection
diff --git a/resources/views/khazanah/laporan/auditcustomer.blade.php b/resources/views/khazanah/laporan/auditcustomer.blade.php
new file mode 100644
index 0000000..53ffae5
--- /dev/null
+++ b/resources/views/khazanah/laporan/auditcustomer.blade.php
@@ -0,0 +1,95 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <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="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Audit Customer</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+
+                    @if(session()->has('errormessage'))
+                  <div class="alert alert-danger">
+                      {{ session()->get('errormessage') }}
+                  </div>
+                @endif
+
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-10">
+                                <form action="{{ route('laporan.auditcustomercetak') }}" method="post">
+                                    @csrf
+                                    <div class="input-group mb-3">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text" id="basic-addon1">Mula</span>
+                                        </div>
+                                        <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula">
+
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                        </div>
+                                        <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga">
+                                        <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                    </div>
+                                
+                            </div>
+                        </div>
+                    </form>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+
+    var tablecustomers = $('#myTable').DataTable({
+        "ordering": false
+    });
+
+    $(document).ready( function () {
+        var today = new Date();
+
+        var dateObject = '';
+        $('#datemula').datepicker({
+            maxViewMode:1,
+            format: 'dd-mm-yyyy',
+            autoclose:true,
+            endDate: "today",
+            maxDate: today
+        });
+
+        $('#datehingga').datepicker({
+            maxViewMode:1,
+            format: 'dd-mm-yyyy',
+            autoclose:true,
+            endDate: "today",
+            maxDate: today
+        });
+        
+        // $('#datemula').change(function() {
+
+        //     $('#datehingga').datepicker('option', 'maxDate', new Date($(this).val()));
+        //     console.log($(this).val());
+
+        // });
+
+    });
+   
+</script>
+@endsection
+
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 77bc3df..5e239ca 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -47,6 +47,9 @@
                             <div class="row">
                                 <a href="{{route('laporan.stokauditbackdate')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Backdate</a>
                             </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.serahmarhungadai') }}" class="btn btn-dark btn-lg btn-block mb-3">Serah Marhun Gadai</a>
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
@@ -76,6 +79,9 @@
                             <div class="row">
                                 <a href="{{ route('laporan.saghilang') }}" class="btn btn-dark btn-lg btn-block mb-3">SAG Hilang</a>
                             </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.serahmarhuntebus') }}" class="btn btn-dark btn-lg btn-block mb-3">Serah Marhun Tebus</a>
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
@@ -102,6 +108,9 @@
                             <div class="row">
                                 <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Perbelanjaan</a>
                             </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.auditcustomer') }}" class="btn btn-dark btn-lg btn-block mb-3">Audit Customer</a>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/khazanah/laporan/serahgadai.blade.php b/resources/views/khazanah/laporan/serahgadai.blade.php
new file mode 100644
index 0000000..6b3fa7f
--- /dev/null
+++ b/resources/views/khazanah/laporan/serahgadai.blade.php
@@ -0,0 +1,70 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <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="{{ route('laporan') }}">Laporan</a></li>
+                        <li class="breadcrumb-item active" aria-current="page">Serah Gadai</li>
+                    </ol>
+                </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-10">
+                            <form action="{{ route('laporan.serahmarhungadaicetak') }}" target="_blank" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh"
+                                        aria-label="Tarikh" id="datemula" name="datemula"
+                                        aria-describedby="basic-addon1">
+
+
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh"
+                                        aria-label="Tarikh" id="datehingga" name="datehingga"
+                                        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>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+
+
+    $('#datemula').datepicker({
+        format: 'dd-mm-yyyy'
+    });
+    $('#datehingga').datepicker({
+        format: 'dd-mm-yyyy'
+    });
+
+ 
+</script>
+@endsection
diff --git a/resources/views/khazanah/laporan/serahmarhun.blade.php b/resources/views/khazanah/laporan/serahmarhun.blade.php
new file mode 100644
index 0000000..51640f0
--- /dev/null
+++ b/resources/views/khazanah/laporan/serahmarhun.blade.php
@@ -0,0 +1,65 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <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="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Serah Marhun Tebus</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-10">
+                            <form action="{{ route('laporan.serahmarhuntebuscetak') }}" target="_blank" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    
+
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" 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>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
+</script>
+@endsection
diff --git a/resources/views/khazanah/menu.blade.php b/resources/views/khazanah/menu.blade.php
index 87f2ca6..7f5ac53 100644
--- a/resources/views/khazanah/menu.blade.php
+++ b/resources/views/khazanah/menu.blade.php
@@ -15,11 +15,11 @@
 
                 <div class="card-body mx-auto">
                    
-                <a href="{{ url('khazanahgadaian') }}" class="btn btn-info mb-4 ml-2 mr-2 btn-lg col-5">Gadai <span class="badge badge-light ">{{ count($gadai) }}</span></a>
-                <a href="{{ url('khazanahtebus') }}" class="btn btn-info mb-4 ml-2 mr-2  btn-lg col-5">Tebus <span class="badge badge-light">{{ count($listserah) }}</span></a>   
+                <a href="{{ url('khazanahgadaian') }}" class="btn {{ count($gadai) > 0 ? 'btn-danger' : 'btn-info' }} mb-4 ml-2 mr-2 btn-lg col-5">Gadai <span class="badge badge-light ">{{ count($gadai) }}</span></a>
+                <a href="{{ url('khazanahtebus') }}" class="btn {{ count($listserah) > 0 ? 'btn-danger' : 'btn-info' }} mb-4 ml-2 mr-2  btn-lg col-5">Tebus <span class="badge badge-light">{{ count($listserah) }}</span></a>   
 
-                <a href="{{ url('pendahuluan') }}" class="btn btn-info  ml-2 mr-2 btn-lg col-5">Pendahuluan <span class="badge badge-light">{{ $countmodal }}</span></a>
-                <a href="{{ url('serahan') }}" class="btn btn-info btn-lg ml-2 mr-2 col-5">Serahan <span class="badge badge-light">{{ $countserahan }}</span></a>
+                <a href="{{ url('pendahuluan') }}" class="btn {{ $countmodal > 0 ? 'btn-danger' : 'btn-info' }}  ml-2 mr-2 btn-lg col-5">Pendahuluan <span class="badge badge-light">{{ $countmodal }}</span></a>
+                <a href="{{ url('serahan') }}" class="btn {{ $countserahan > 0 ? 'btn-danger' : 'btn-info' }} btn-lg ml-2 mr-2 col-5">Serahan <span class="badge badge-light">{{ $countserahan }}</span></a>
                 </div>
             </div>
         </div>
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index 927c24a..1b40fb6 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -54,6 +54,20 @@
                   </nav>
 
                 <div class="card-body text-center">
+                    @if (\Session::has('type') == true && Session::get('type') == 'unavailable')
+                    <script>
+                        Swal.fire(
+                            "{!! \Session::get('message') !!}",
+                            "{{ \Session::get('norujukan') }}",
+                            'warning'
+                        )
+
+                    </script>
+                    @elseif(\Session::has('type') == true && Session::get('type') == 'scanned')
+                    <div class="alert alert-success text-bold d-flex mx-auto justify-content-center w-50">
+                        {!! \Session::get('message') !!} <br> {{ \Session::get('norujukan') }}
+                    </div>
+                    @endif
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">
                         </div>
@@ -61,7 +75,7 @@
                         <form action="{{ route('barcodetebus.scanned') }}" method="post">
                                 @csrf
                             <label>Scan Barcode Keluar Marhun Dari Peti Besi </label>
-                            <input type="text" class="form-control col-6 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"  placeholder="SILA SCAN BARCODE PADA SAG"/>
+                            <input type="text" class="form-control col-6 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"  placeholder="SILA SCAN BARCODE PADA SAG" required/>
                             <input type="submit" id="submit_button" name="submit_button" hidden>
                         </form>
 
@@ -153,7 +167,7 @@
 
                     </div>
                     <div class="form-group d-flex justify-content-end mr-4">
-                        <a href="{{ url('menu') }}" class="btn btn-primary">Cetak</a>
+                        <a href="{{ route('laporanscantebusbarcode') }}" class="btn btn-primary">Cetak</a>
                     </div>
                 </div>
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b3473ab..cc3e4ea 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -332,6 +332,28 @@
                 @else
                 @endif
         @endif
+
+        @if(session()->has('iklan') && session()->get('iklan') == 0)
+
+        <div class="toast" role="alert" aria-live="assertive" aria-atomic="true" style="position: absolute; top: 1rem; right: 1rem; width:100%;z-index:1;" data-autohide="false">
+            <div class="toast-header">
+
+                <i class="text-danger fa-2x fa fa-exclamation-triangle mr-2"></i>
+                <strong class="mr-auto text-danger fa-2x">Amaran</strong>
+                {{-- <small>11 mins ago</small> --}}
+                <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="toast-body">
+                <b style="font-size:18px;">sila tukar kata laluan asal dengan segera!</b>
+            </div>
+        </div>
+            <script>
+                $('.toast').toast('show');
+            </script>
+        @endif
+
         
         <main class="py-4">
             @yield('content')
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index c4ab91a..ddda734 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -221,6 +221,27 @@
             </div>
         </nav>
 
+        @if(session()->has('iklan') && session()->get('iklan') == 0)
+
+        <div class="toast" role="alert" aria-live="assertive" aria-atomic="true" style="position: absolute; top: 1rem; right: 1rem; width:100%;z-index:1;" data-autohide="false">
+            <div class="toast-header">
+
+                <i class="text-danger fa-2x fa fa-exclamation-triangle mr-2"></i>
+                <strong class="mr-auto text-danger fa-2x">Amaran</strong>
+                {{-- <small>11 mins ago</small> --}}
+                <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="toast-body">
+                <b style="font-size:18px;">sila tukar kata laluan asal dengan segera!</b>
+            </div>
+        </div>
+            <script>
+                $('.toast').toast('show');
+            </script>
+        @endif
+
 
 
         <main class="py-4">
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 9b463e9..c6490b7 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1050,6 +1050,7 @@
         if($('#sltjenistebus').find(":selected").val() == 'T'){
 
             var adadah = false;
+            var adaonline = false;
 
             $.ajax({
             method:'get',
@@ -1062,7 +1063,6 @@
 
                 if(count > 0)
                 {
-                    console.log(count);
                     Swal.fire('Amaran!','Tebus sudah dibuat sila tekan butang batal!','error');
                     $("#terima_transaksi").prop('disabled', false);
                     adadah = true;
@@ -1070,7 +1070,25 @@
             }
             });
 
-            if(adadah === true)
+            $.ajax({
+            method:'get',
+            datatype: 'json',
+            url: api + '/api/searchsagonline/',
+            async:false,
+            data: { 'norujukan' : norujukan },
+            success:function(success_data){
+
+                if(success_data == true)
+                {
+                    Swal.fire('Amaran!','Bayaran online belum diproses!','error');
+                    $("#terima_transaksi").prop('disabled', false);
+                    adaonline = true;
+                }
+
+            }
+            });
+
+            if(adadah === true || adaonline === true)
             {
                 return false;
                 event.preventDefault();
@@ -1179,6 +1197,28 @@
             ///////////
 
         }else if($('#sltjenistebus').find(":selected").val() == 'A'){
+
+            $.ajax({
+                method:'get',
+                datatype: 'json',
+                url: api + '/api/listpenebusanhistory/' + kodcaw,
+                async:false,
+                data: { 'norujukan' : norujukan },
+                success:function(success_data){
+                    var count = Object.keys(success_data).length;
+
+                    if(count > 0)
+                    {
+                        Swal.fire('Amaran!','Tebus sudah dibuat sila tekan butang batal!','error');
+                        $("#terima_transaksi").prop('disabled', false);
+
+                        return false;
+                        event.preventDefault();
+                    }
+                }
+            });
+
+
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
diff --git a/resources/views/print/laporan_auditcustomer.blade.php b/resources/views/print/laporan_auditcustomer.blade.php
new file mode 100644
index 0000000..3f7f04e
--- /dev/null
+++ b/resources/views/print/laporan_auditcustomer.blade.php
@@ -0,0 +1,322 @@
+<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: 8px;
+    }
+
+    #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;
+    }
+
+    @media print {
+        .new-page {
+            page-break-before: always;
+        }
+    }
+
+</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 style="font-size:20px;font-weight:bold;">{{ $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 AUDIT CUSTOMER</b></th>
+        <th> </th>
+        <th> </th>
+        <th></th>
+    </tr>
+    <tr>
+        <th colspan="5"><b> TARIKH CETAK:</b>
+            @php
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+            $formattedweddingdate = $myDateTime->format('d-m-Y');
+            echo($formattedweddingdate);
+            @endphp
+        </th>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+    </tr>
+    <tr>
+        <td style="width:20px"> <b>TARIKH:</b></td>
+        <td>@php
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $datemula);
+            $datefirst = $myDateTime->format('d-m-Y');
+            echo($datefirst);
+            @endphp</td>
+        <td style="width:20px"> <b>HINGGA:</b></td>
+     <td>@php 
+           $myDateTime = DateTime::createFromFormat('Y-m-d', $datehingga);
+           $datelast = $myDateTime->format('d-m-Y');
+           echo($datelast);
+         @endphp</td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+        <td> </td>
+    </tr>
+</table>
+
+<br>
+<table id="details">
+    <tr>
+        <th>Bil</th>
+        <th>Nama Pelanggan</th>
+        <th>No IC</th>
+        <th>Data Ditukar</th>
+        <th>Data Lama</th>
+        <th>Data Baru</th>
+        <th>Teller/PPC</th>
+        <th>Tarikh</th>
+        <th>Masa</th>
+    </tr>
+    @php $counter = 1; $jenis = ''; @endphp
+    @foreach($auditcustomer as $index=>$item)
+    <tr>
+        <td>{{ $counter }}</td>
+        <td>{{ $item['customer_name'] }}</td>
+        <td>{{ $item['nokp'] }}</td>
+        <td>
+            @php
+            $tempitem = array_keys((array)$item['old']);
+
+            foreach($tempitem as $temp)
+            {
+              echo ($temp == 'alamat1') ?  'alamat' . '<br>' : $temp . '<br>';
+            }
+            @endphp
+        <td>
+            @foreach($item['old'] as $index=>$old)
+            {{ $old }} <br>
+            @endforeach
+        </td>
+        <td>
+            @foreach($item['new'] as $index=>$new)
+            {{ $new }} <br>
+            @endforeach
+        </td>
+        <td>{{ $item['username'] }}</td>
+        <td>{{ date("d-m-Y",strtotime($item['tarikhmasa'])) }}</td>
+        <td>{{ date("H:i:s A",strtotime($item['tarikhmasa'])) }}</td>
+    </tr>
+    @php $counter++;@endphp
+    @endforeach
+</table>
+<br><br>
+{{-- <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <td colspan="3" style="text-align: center;"><b>JUMLAH {{ $jenis }}</b></td>
+<td style="text-align:center">{{ 'RM ' . number_format($totalamaun,2) }}</td>
+</tr>
+</table> --}}
+
+<br>
+<br><br><br>
+<table id="sign">
+    <tr>
+        <td></td>
+        <td colspan="2"> .................................................................. </td>
+        <td> </td>
+        <td colspan="2"> .................................................................. </td>
+        <td> </td>
+        <td colspan="2">.................................................................. </td>
+        <td> </td>
+    </tr>
+    <tr>
+        <td></td>
+        <td colspan="2"><B> Disediakan </B> </td>
+        <td></td>
+        <td colspan="2"><B> Disemak </B> </td>
+        <td> </td>
+        <td colspan="2"><B> Disahkan </B></td>
+        <td> </td>
+    </tr>
+</table>
diff --git a/resources/views/print/laporan_serahmarhun.blade.php b/resources/views/print/laporan_serahmarhun.blade.php
new file mode 100644
index 0000000..bbf9a93
--- /dev/null
+++ b/resources/views/print/laporan_serahmarhun.blade.php
@@ -0,0 +1,285 @@
+<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:8px;
+  }
+  
+  #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 style="font-size:20px;font-weight:bold;">{{ $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 SERAH MARHUN TEBUS</b></th>
+      <th> </th>
+      <th> </th>
+      <th>
+      </th>
+      <th></th>
+    </tr>
+    <tr>
+      <td><b> Tarikh:</b></td>
+      <td style="text-align:left;"> @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $datemula);
+          $datefirst = $myDateTime->format('d-m-Y');
+          echo($datefirst);
+          echo '<b style="margin-left:20px;margin-right:20px;">Hingga:</b>';
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $datehingga);
+          $datelast = $myDateTime->format('d-m-Y');
+          echo($datelast);
+        @endphp</td>
+      <td style="width:10px"> <b>Tarikh Cetak</b></td>
+      <td style="text-align:left;">@php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $datecetak = $myDateTime->format('d-m-Y');
+        echo($datecetak);
+      @endphp</td>
+    </tr>
+    <tr>
+      <td style="width:50px">   
+      </td>
+      <td> </td>
+      <td> </td>
+      <td> </td>
+      <td> </td>
+      <td> </td>
+      <td> </td>
+    </tr>
+  </table>
+  
+  <br>
+  <table id="details">
+    <tr>
+      <th>Bil</th>
+      <th>Norujukan</th>
+      <th>Tarikh</th>
+      <th>N Marhun</th>
+      <th>Pembiayaan</th>
+      <th>Tag Terima</th>
+    </tr>
+    @php $counter = 1;@endphp
+
+    @foreach($serahmarhun as $index=>$item)
+      @if($index > 0)
+          @if($item['teller'] != $serahmarhun[$index - 1]['teller'])
+              <tr>
+                  <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+              </tr>
+          @endif
+      @else
+          <tr>
+              <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+          </tr>
+      @endif
+      <tr>
+        <td>{{ $counter }}</td>
+        <td style="width:100px">{{$item['norujukan']}}</td>
+        <td>{{ $item['t_tebus'] }}</td>
+        <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+        <td>{{ number_format($item['pinjaman'],2) }}</td>
+        <td>{{ $item['tagterima'] }}</td>
+      </tr>
+      @php $counter++; @endphp
+    @endforeach
+  </table>
+  <br><br>
+  {{-- <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+    <tr>
+      <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $bil }}</b></th>
+      <th style="text-align:center;">Berat (g/m)</th>
+      <th style="text-align:center;">Nilai Marhun (RM)</th>
+      <th style="text-align:center;">Pembiayaan (RM)</th>
+      <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+    </tr>
+    <tr>
+      <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+      <td>{{ number_format($totalberat,2) }}</td>
+      <td>{{ number_format($totalnm,2) }}</td>
+      <td>{{ number_format($totalpinjaman,2) }}</td>
+      <td>{{ number_format($totalupah,2) }}</td>
+    </tr>
+  </table> --}}
+  
+  {{-- <h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5> --}}
+  
+  <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>
+  
+  
+  
+  
+  
+  
+  
\ No newline at end of file
diff --git a/resources/views/print/laporan_serahpetibesigadai.blade.php b/resources/views/print/laporan_serahpetibesigadai.blade.php
new file mode 100644
index 0000000..131ad29
--- /dev/null
+++ b/resources/views/print/laporan_serahpetibesigadai.blade.php
@@ -0,0 +1,293 @@
+<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:8px;
+}
+
+#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 style="font-size:20px;font-weight:bold;">{{ $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 SERAH MARHUN GADAI</b></th>
+    <th> </th>
+    <th> </th>
+    <th>
+    </th>
+    <th></th>
+  </tr>
+  <tr>
+    <td><b> Tarikh:</b></td>
+    <td style="text-align:left;"> @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $datemula);
+          $datefirst = $myDateTime->format('d-m-Y');
+          echo($datefirst);
+          echo '<b style="margin-left:20px;margin-right:20px;">Hingga:</b>';
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $datehingga);
+          $datelast = $myDateTime->format('d-m-Y');
+          echo($datelast);
+      @endphp</td>
+    <td style="width:10px"> <b>Tarikh Cetak</b></td>
+    <td style="text-align:left;">@php 
+      $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+      $datecetak = $myDateTime->format('d-m-Y');
+      echo($datecetak)
+    @endphp</td>
+  </tr>
+  <tr>
+    <td style="width:50px">   
+    </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Bil</th>
+    <th>Norujukan</th>
+    <th>Penilai</th>
+    <th>Tarikh</th>
+    <th>Masa</th>
+    <th>N Marhun</th>
+    <th>Pembiayaan</th>
+    <th>Cetak</th>
+    <th>Tag Serah</th>
+    <th>Semak Barcode</th>
+  </tr>
+  @php $counter = 1;@endphp
+  @foreach($serahbarcode as $index=>$item)
+    @if($index > 0)
+        @if($item['teller'] != $serahbarcode[$index - 1]['teller'])
+            <tr>
+                <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+            </tr>
+        @endif
+    @else
+        <tr>
+            <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+        </tr>
+    @endif
+    <tr>
+      <td>{{ $counter }}</td>
+      <td style="width:100px">{{$item['norujukan']}}</td>
+      <td>
+        {{ $item['penilai'] }}
+      </td>
+      <td>{{ $item['t_gadai'] }}</td>
+      <td>{{ $item['masa'] }}</td>
+      <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ $item['cetak'] }}</td>
+      <td>{{ $item['tagserah'] }}</td>
+      <td>{{ $item['semakbarcode'] }}</td>
+    </tr>
+    @php $counter++; @endphp
+  @endforeach
+</table>
+<br><br>
+{{-- <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $bil }}</b></th>
+    <th style="text-align:center;">Berat (g/m)</th>
+    <th style="text-align:center;">Nilai Marhun (RM)</th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalberat,2) }}</td>
+    <td>{{ number_format($totalnm,2) }}</td>
+    <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>{{ number_format($totalupah,2) }}</td>
+  </tr>
+</table> --}}
+
+{{-- <h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5> --}}
+
+<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/routes/web.php b/routes/web.php
index 731e3b2..3f7bcc0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -254,6 +254,16 @@ Route::get('laporan/lelongan/notistuntutbaki/',['as'=>'lelongan.notistuntutbaki'
 
 Route::get('/laporan/komoditi',['as'=>'laporan.komoditi','uses'=>'KomuditiController@cetakRekodKomoditi']);
 
+Route::get('laporan/serahmarhungadai/',['as'=>'laporan.serahmarhungadai','uses'=>'KhazanahController@Laporan_SerahPetiBesiGadai'])->middleware('auth','khazanah');
+Route::post('/laporan/serahmarhungadai/cetak',['as'=>'laporan.serahmarhungadaicetak','uses'=>'KhazanahController@cetak_serahBarcodeGadai']);
+Route::get('laporan/serahmarhuntebus/',['as'=>'laporan.serahmarhuntebus','uses'=>'KhazanahController@Laporan_SerahMarhunTebus'])->middleware('auth','khazanah');
+Route::post('/laporan/serahmarhuntebus/cetak',['as'=>'laporan.serahmarhuntebuscetak','uses'=>'KhazanahController@cetak_serahMarhunTebus']);
+
+Route::get('laporan/auditcustomer/',['as'=>'laporan.auditcustomer','uses'=>'KhazanahController@Laporan_AuditCustomer'])->middleware('auth','khazanah');
+Route::post('/laporan/auditcustomer/cetak',['as'=>'laporan.auditcustomercetak','uses'=>'KhazanahController@cetak_AuditCustomer']);
+
+Route::get('/laporanscantebusbarcode',['as'=>'laporanscantebusbarcode','uses'=>'KhazanahController@LaporanTebusBarcode'])->middleware('auth','khazanah');
+
 //Resit Ansurans
 Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit'])->middleware('auth','teller');
 Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'GadaianController@resitansurans'])->middleware('auth','teller');