diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 87b9f32..f88e879 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -36,25 +36,57 @@ class KhazanahController extends Controller
 
         $api_url = config('api.url');
         $auth_user = Auth::user();
+        $idtype = 'nokp';
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $bank = Http::get(config('api.url') . '/api/bank')->json();
-        return view('khazanah.index',compact('search','cawangan_info','bank','api_url'));
+        return view('khazanah.index',compact('search','cawangan_info','bank','api_url','idtype'));
+    }
+
+    public function search(Request $request){
+        $noic = $request->noic;
+        $idtype = $request->customerIDType;
+        Session::put('noic', $noic);
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $bank = Http::get(config('api.url') . '/api/bank')->json();
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
+
+        if($customers_info){
+            $customer_info = $customers_info[0];
+        }else{
+            $customer_info = $customers_info;
+        }
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
+
+        $search = true;
+
+        if($customer_info){
+            Session::put('customer_info_khazanah',$customer_info);
+            return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
+        }else{
+            return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
+        }
     }
 
     public function info(Request $request){
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->noic)->json();
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
         if($customers_info){
             $customer_info = $customers_info[0];
         }else{
             $customer_info = $customers_info;
         }
 
+        $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json();
+        $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json();
+        
         $request->session()->forget('page_reload');
         $request->session()->forget('norujukan');
-        return view('khazanah.info',compact('cawangan_info','api_url','customer_info'));
+        return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong'));
     }
 
     public function menu()
@@ -2838,7 +2870,7 @@ class KhazanahController extends Controller
     }
 
     public function cetakLaporanRingkasanHarian(Request $request){
-        // dd($request);
+    
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -2904,11 +2936,11 @@ class KhazanahController extends Controller
 
         $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil'];
         $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil'];
-        $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); 
+        $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; 
     
         $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj'];
         $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'];
-        $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); 
+        $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari;
 
         $totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira;
         $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira;
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index 9769bbe..c70cbe4 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -174,7 +174,7 @@
 
                 <div class="col-3 mx-1">
                 <div class="row">
-                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Pelanggan</a>
+                <a href="{{ route('khazanah.pelanggan') }}" class="btn btn-danger 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>
diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php
index 78fc091..4195a35 100644
--- a/resources/views/khazanah/index.blade.php
+++ b/resources/views/khazanah/index.blade.php
@@ -10,17 +10,31 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
+
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                  <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Pengenalan Diri</li>
+                </ol>
+              </nav>
+
             <div class="card">
                 <div class="card-body">
                     <div class="text-center">
                         <h5 class="text-uppercase">masukkan nombor kad pengenalan</h5>
-                        <form action="{{ route('khazanah.customer_info') }}" method="GET">
+                        <form name="frmsearch" onsubmit="verifynokp()" action="{{ route('khazanah.searchpelanggan') }}" method="GET">
                             <div class="row justify-content-center">
-                                <div class="col-md-7">
+                                <div class="col-md-9">
                                     <div class="input-group my-3">
-                                        <input type="text" class="form-control" name="noic" placeholder="No Kad Pengenalan Pelanggan" aria-label="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}" aria-describedby="button-addon2">
+                                        <input type="text" class="form-control" id="noic" name="noic" placeholder="No Kad Pengenalan Pelanggan" aria-label="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}" aria-describedby="button-addon2">
                                         <div class="input-group-append">
-                                            <button class="btn btn-outline-primary" type="submit" id="button-addon2">Sahkan</button>
+                                            <select class="form-select" id="customerIDType" name="customerIDType" class="form-control">
+                                                <option value="nokp" {{ $idtype == 'nokp' ? 'selected' : ''}}>Kad Pengenalan</option>
+                                                <option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option>
+                                            </select>
+                                        </div>
+                                        <div class="input-group-append">
+                                            <button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button>
                                         </div>
                                     </div>
                                 </div>
@@ -29,14 +43,14 @@
                     </div>
                     @if($search == true )
                     <div class="text-center mt-3">
-                        <button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_pelanggan">
+                        <button type="button" style="margin:auto" class="btn btn-primary" onclick="newcustomer()">
                             Daftar Pelanggan
                         </button>
                     </div>
                     @endif
                 </div>
             </div>
-            <!-- Modal -->
+            <!-- Modal No KP -->
             <div class="modal fade" id="daftar_pelanggan" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
                 <div class="modal-dialog modal-lg">
                     <div class="modal-content">
@@ -44,13 +58,13 @@
                             <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
                         </div>
                         <div class="modal-body">
-                            <form action="{{ route('customer.store') }}" method="POST">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomer()" method="POST">
                                 @csrf
                                 <div class="row form-group">
                                     <div class="col-md-6">
                                         <div class="row form-group">
                                             <div class="col-md-4">Nama</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="name" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="name" autocomplete="off" placeholder="Nama"></div>
                                             <div class="col-md-4">No KP</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="noic" id="noic" value="{{$noic ?? ''}}" readonly></div>
                                             <div class="col-md-4">Tarikh Lahir</div>
@@ -59,26 +73,18 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="negeri_lahir" id="negeri_lahir" readonly></div>
                                             <div class="col-md-4">Jantina</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="jantina" id="jantina" readonly></div>
-                                            <div class="col-md-4">Alamat</div>
-                                            <div class="col-md-8"><textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3"></textarea></div>
-                                            <div class="col-md-4">Poskod</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off"></div>
-                                            <div class="col-md-4">Daerah</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
-                                            <div class="col-md-4">Negeri</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">No Telefon 1</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-4">No Telefon 2</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="alternate_phone" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="alternate_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-12 ml-4">
                                                 <div class="form-group row">
                                                     <div class="form-check form-check-inline">
-                                                        <input class="form-check-input" type="checkbox" id="warganegara" name="warganegara" value="warganegara">
+                                                        <input checked class="form-check-input" type="checkbox" id="warganegara" name="warganegara" value="warganegara">
                                                         <label class="form-check-label" for="warganegara">Warganegara</label>
                                                     </div>
                                                     <div class="form-check form-check-inline">
-                                                        <input class="form-check-input" type="checkbox" id="bumiputera" name="bumiputera" value="bumiputera">
+                                                        <input checked class="form-check-input" type="checkbox" id="bumiputera" name="bumiputera" value="bumiputera">
                                                         <label class="form-check-label" for="bumiputera">Bumiputera</label>
                                                     </div>
                                                 </div>
@@ -86,12 +92,11 @@
                                             <div class="col-md-4">Agama</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="agama" id="agama">
-                                                    <option disabled selected value> -- Pilih Agama -- </option>
-                                                    <option value="islam">Islam</option>
-                                                    <option value="hindu">Hindu</option>
-                                                    <option value="buddha">Buddha</option>
-                                                    <option value="kristian">Kristian</option>
-                                                    <option value="lain">Lain-lain</option>
+                                                    <option selected value="01">Islam</option>
+                                                    <option value="02">Hindu</option>
+                                                    <option value="03">Buddha</option>
+                                                    <option value="04">Kristian</option>
+                                                    <option value="05">Lain-lain</option>
                                                 </select>
                                             </div>
                                             <div class="col-md-4">Ahli</div>
@@ -106,26 +111,20 @@
                                     </div>
                                     <div class="col-md-6">
                                         <div class="row form-group">
-                                            <div class="col-md-12" style="margin-left:auto;margin-right:auto">
-                                                <img src="" id="preview" style="width:250px;height:250px" class="img-thumbnail">
-                                            </div>
-                                            <div class="col-md-12">
-                                                <input type="file" name="customer_image" id="customer_image" accept="image/*">
-                                                <!-- <input type="file" name="customer_image" id="customer_image" class="file" accept="image/*">
-                                                <div class="input-group my-3">
-                                                    <input type="text" class="form-control" readonly placeholder="Upload File" id="file" name="file">
-                                                    <div class="input-group-append">
-                                                        <button type="button" class="browse btn btn-primary">Browse...</button>
-                                                    </div>
-                                                </div> -->
-                                            </div>
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="bangsa" id="bangsa">
-                                                    <option disabled selected value> -- Pilih Bangsa -- </option>
-                                                    <option value="M">Melayu</option>
+                                                    <option selected value="M">Melayu</option>
                                                     <option value="C">Cina</option>
                                                     <option value="I">India</option>
                                                     <option value="L">Lain-lain</option>
@@ -140,14 +139,162 @@
                                                     @endforeach
                                                 </select>
                                             </div>
-                                            <div class="col-md-4">No Akaun Bank</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun"></div>
+                                            <div class="col-md-4">No Akaun</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun" placeholder="No Akaun Bank"></div>
+                                            <div class="col-md-4">Tujuan Gadai</div>
+                                            @php
+                                                $tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="tujuan_gadai">
+                                                    <option disabled selected value> -- Pilih Tujuan Gadai -- </option>
+                                                    @foreach($tujuangadai as $tujuan)    
+                                                        <option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Pekerjaan</div>
+                                            @php
+                                                $pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="pekerjaan">
+                                                    <option disabled selected value> -- Pilih Pekerjaan -- </option>
+                                                    @foreach($pekerjaan as $kerja)    
+                                                        <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Nota</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div>
                                         </div>
                                     </div>
                                 </div>
                             
                         </div>
                         <div class="modal-footer">
+                            <input type="text" hidden name="idtype"  value="nokp">
+                            <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                        </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <!-- Modal Passport -->
+            <div class="modal fade" id="passport_pelanggan" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
+                <div class="modal-dialog modal-lg">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
+                        </div>
+                        <div class="modal-body">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomerpassport()" method="POST">
+                                @csrf
+                                <div class="row form-group">
+                                    <div class="col-md-6">
+                                        <div class="row form-group">
+                                            <div class="col-md-4">Nama</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="passport_name" autocomplete="off" placeholder="Nama"></div>
+                                            <div class="col-md-4">No Passport</div>
+                                            <div class="col-md-8"><input class="form-control" readonly type="text" name="noic" id="passport_noic" value="{{$noic ?? ''}}"></div>
+                                            <div class="col-md-4">Tarikh Lahir</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" placeholder="Tarikh Lahir" onchange="calculatePassportAge()" name="tarikh_lahir" id="passport_tarikh_lahir"></div>
+                                            <div class="col-md-4">Jantina</div>
+                                            <div class="col-md-8">
+                                                <select name="jantina" id="jantina_passport" class="form-control">
+                                                    <option value="Lelaki" selected>Lelaki</option>
+                                                    <option value="Perempuan">Perempuan</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">No Telefon 1</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="passport_main_phone" autocomplete="off" placeholder="No Telefon"></div>
+                                            <div class="col-md-4">No Telefon 2</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="passport_alternate_phone" autocomplete="off" placeholder="No Telefon"></div>
+                                            <div class="col-md-4">Agama</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="agama" id="passport_agama">
+                                                    <option selected value="01">Islam</option>
+                                                    <option value="02">Hindu</option>
+                                                    <option value="03">Buddha</option>
+                                                    <option value="04">Kristian</option>
+                                                    <option value="05">Lain-lain</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Ahli</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="kumpulan_sahabat" id="passport_kumpulan_sahabat">
+                                                    <option value="0">Tidak</option>
+                                                    <option value="1">Kumpulan PKINK</option>
+                                                    <option value="2">Sahabat</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="row form-group">
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="passport_alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="passport_poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="passport_daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="passport_negeri" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Umur</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="age" id="passport_age" readonly></div>
+                                            <div class="col-md-4">Bangsa</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="bangsa" id="passport_bangsa">
+                                                    <option selected value="M">Melayu</option>
+                                                    <option value="C">Cina</option>
+                                                    <option value="I">India</option>
+                                                    <option value="L">Lain-lain</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Bank</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="passport_bank_name">
+                                                    <option disabled selected value> -- Pilih Bank -- </option>
+                                                    @foreach($bank as $banks)    
+                                                        <option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">No Akaun</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="passport_no_akaun" placeholder="No Akaun Bank"></div>
+                                            <div class="col-md-4">Tujuan Gadai</div>
+                                            @php
+                                                $tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="passport_tujuan_gadai">
+                                                    <option disabled selected value> -- Pilih Tujuan Gadai -- </option>
+                                                    @foreach($tujuangadai as $tujuan)    
+                                                        <option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Pekerjaan</div>
+                                            @php
+                                                $pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="passport_pekerjaan">
+                                                    <option disabled selected value> -- Pilih Pekerjaan -- </option>
+                                                    @foreach($pekerjaan as $kerja)    
+                                                        <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Nota</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="nota" id="passport_nota" placeholder="Nota"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="text" hidden name="idtype" value="passport">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
                             <input type="submit" name="submit" class="btn btn-primary" value="Terima">
                         </div>
@@ -160,12 +307,62 @@
 </div>
 <script>
     var api_url = "<?php echo $api_url ?>";
-    
+    var search = "<?php echo $search ?>";
+    var type_id = "<?php echo $idtype ?>";
     $(document).ready(function(){
+        $('#passport_tarikh_lahir').datepicker({
+            format: 'dd/mm/yyyy',
+            endDate: new Date()
+        });
         var noic = $('#noic').val();
         identifyIC(noic);
+
+        if(search == true){
+            Swal.fire({
+                icon: 'info',
+                title: 'Pelanggan Tiada Dalam Rekod!',
+                text: 'Sila Daftar Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
         
     });
+
+    function calculatePassportAge(){
+        var passport_lahir = $('#passport_tarikh_lahir').val();        
+        var split_date = passport_lahir.split('/');
+        var count_leap_year = countLeapYears(split_date[2],split_date[1],split_date[0]) - 1;
+            
+        var start = new Date(split_date[2] + '-' + split_date[1] + '-' + split_date[0]),  
+            end   = new Date(),  
+            diff  = new Date(end - start),  
+            days  = ((diff/1000/60/60/24)- count_leap_year)/365;
+            
+        var age = parseInt(days);
+        $('#passport_age').val(age);
+    }
+
+    function newcustomer(){
+        var id_type = $('#customerIDType').val();
+        if(id_type=='nokp'){
+            $('#daftar_pelanggan').modal('show');
+        }else if(id_type=='passport'){
+            $('#passport_pelanggan').modal('show');
+        }
+    }
+
+    $('#warganegara').on('click',function(){
+        if(this.checked == false) {
+            $('#bumiputera').prop('checked',false);
+        }
+    });
+
+    $('#bumiputera').on('click',function(){
+        if(this.checked) {
+            $('#warganegara').prop('checked',true);
+        }
+    });
     
     $(document).on("click", ".browse", function() {
         var file = $(this).parents().find(".file");
@@ -210,8 +407,277 @@
             }
         });
     });
-    
 
+    $('#passport_poskod').change(function(){
+        var poskod = this.value;
+
+        $.ajax({
+            method:'GET',
+            url:api_url+'/api/poskod/'+poskod,
+            success:function(poskod_detail){
+                var koddaerah = poskod_detail['koddaerah'];
+                var kodnegeri = poskod_detail['kodnegeri'];
+                $.ajax({
+                    url:api_url+'/api/negeri/'+kodnegeri,
+                    method:'GET',
+                    success:function(negeri){
+                        $('#passport_negeri').val(negeri['negeri']);
+                    }
+                });
+                $.ajax({
+                    url:api_url+'/api/daerah/'+koddaerah,
+                    method:'GET',
+                    success:function(daerah){
+                        $('#passport_daerah').val(daerah['namadaerah']);
+                    }
+                });
+            }
+        });
+    });
+
+    function verifycustomer(){
+        var customername = $('#name').val();
+        var customeralamat = $('#alamat').val();
+        var customerposkod = $('#poskod').val();
+        var customerphone = $('#main_phone').val();
+        var customerphone_alternate = $('#alternate_phone').val();
+        var age = $('#age').val();
+        if(age < 18){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Umur Pelanggan Tidak Mencukupi 18 Tahun'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customername == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Nama Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customeralamat == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Alamat Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customerposkod == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Poskod'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerposkod.length != 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Poskod'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerposkod) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Periksa Poskod'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan No Telefon Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if((customerphone.length < 9 || customerphone.length >= 12)){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone_alternate != ''){
+            if(customerphone_alternate.length < 8 && customerphone_alternate.length > 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone_alternate) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    function verifycustomerpassport(){
+        var customername = $('#passport_name').val();
+        var customeralamat = $('#passport_alamat').val();
+        var customerposkod = $('#passport_poskod').val();
+        var customerphone = $('#passport_main_phone').val();
+        var customerphone_alternate = $('#passport_alternate_phone').val();
+        var tarikh_lahir = $('#passport_tarikh_lahir').val();
+        var age = $('#passport_age').val();
+
+        if(age < 18){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Umur Pelanggan Tidak Mencukupi 18 Tahun'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customername == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Nama Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(tarikh_lahir == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Tarikh Lahir Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customeralamat == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Alamat Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customerposkod == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Poskod'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerposkod.length != 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Poskod'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerposkod) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Periksa Poskod'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan No Telefon Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerphone.length <= 9 || customerphone.length >= 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone_alternate != ''){
+            if(customerphone_alternate.length <= 8 && customerphone_alternate.length >= 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone_alternate) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    
     function identifyIC(noic){
         if(noic.match(/^(\d{2})(\d{2})(\d{2})-?\d{2}-?\d{4}$/)) {
             var year = noic.slice(0,2);
@@ -287,9 +753,17 @@
             }else if(unknown_ic.indexOf(nl)>=0){
                 var negeri_lahir = 'Negeri Tidak Diketahui';
             }
-
             var date = new Date(year, (month - 1), day, 0, 0, 0, 0);
-            var age = parseInt(now,10) - date.getFullYear();
+            var tarikh_lahir_test = date.getFullYear() + '-' + month + '-' + day;
+
+            var count_leap_year = countLeapYears(date.getFullYear(),month,day) - 1;
+            
+            var start = new Date(tarikh_lahir_test),  
+                end   = new Date(),  
+                diff  = new Date(end - start),  
+                days  = ((diff/1000/60/60/24)- count_leap_year)/365;
+            
+            var age = parseInt(days);
             $('#age').val(age);
             var tarikh_lahir = day + '/' + month + '/' + date.getFullYear();
             $('#jantina').val(jantina);
@@ -297,5 +771,90 @@
             $('#negeri_lahir').val(negeri_lahir);
         }
     }
+
+    var countLeapYears = function(y,m,d){
+        var yearNow = new Date().getFullYear(),
+            yearThen = y,
+            beginYear = 0,
+            endYear = 0,
+            leapYearCount = 0;
+
+        var isLeapYear = function(year){
+            return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0);
+        }
+
+        if(yearNow < y){
+            beginYear = yearNow;
+            endYear = y;
+        }else if(yearNow > y){
+            beginYear = y;
+            endYear = yearNow;
+        }else if(yearNow == y){
+            beginYear = y;
+            endYear = y;
+        }
+
+        for(i = beginYear; i <= endYear; i++){
+            if(isLeapYear(i)){
+                leapYearCount++;
+            }
+        }
+
+        return leapYearCount;
+    }
+    var regex = /^[a-zA-Z0-9]+$/g;
+    
+    function verifynokp(){
+        var id_type = $('#customerIDType').val();
+        var nokp = $('#noic').val();
+        if(id_type=='nokp'){
+            if($.isNumeric(nokp) == false){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(nokp.length != 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No KP Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }else if(id_type=='passport'){
+            if(nokp.length < 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Passport Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(nokp.indexOf(' ') > 0){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(regex.test(nokp) == false){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Passport Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }
+    }
 </script>
 @endsection
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index dd5df0a..581340f 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -1,5 +1,218 @@
 @extends('layouts.app')
+
+
 @section('content')
+@include('modal.historytebus')
+@include('modal.wakil')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12 col-lg-12">
+            
+            <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('khazanah.pelanggan') }}">Pengenalan Diri</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Pelanggan</li>
+                </ol>
+              </nav>
+            
+            <div class="form-group row col-md-12">
+                <div class="col-md-6">
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Nama</b>
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>No Kad Pengenalan</b>
+                        </div>
+                        <div class="col-md-8">
+                            @php
+                                if($customer_info['kpbaru'] != null){
+                                    $noic = $customer_info['kpbaru'];
+                                }else{
+                                    $noic = $customer_info['kplama'];
+                                }
+                            @endphp
+                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $noic }}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Pembiayaan </b>
+                        </div>
+                        <div class="col-md-8">
+                            @php
+                                $outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa/'.$cawangan_info['kodcaw'])->json();
+                            @endphp
+                            <input type="text" class="form-control" name="outstanding_semasa" id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Limit Pembiayaan </b>
+                        </div>
+                        <div class="col-md-8">
+                            @php
+                                $limit_pinjaman_semasa = 0;
+                            @endphp
+                            <input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ number_format($limit_pinjaman_semasa,2) }}">
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Baki Lelong</b>
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="bakilelong" id="bakilelong" readonly value="{{ number_format($bakilelong,2) }}">
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="col-md-6">
+                   
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>No Telefon</b>
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] }}">
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Nota</b>
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="nota_semasa" id="nota_semasa" readonly value="{{ $customer_info['nota'] }}">
+                        </div>
+                    </div>
+                    
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            <b>Rugi Lelong</b>
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="rugilelong" id="rugilelong" readonly value="{{ number_format($rugilelong,2) }}">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-12 mt-md-3 justify-content-between form-group row">
+                    <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
+                        <label class="btn btn-primary">
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Tebus
+                        </label>
+                        <label class="btn btn-primary">
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Tebus
+                        </label>
+                        <label class="btn btn-primary">
+                            <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
+                        </label>
+                    </div>
+                    <div class='col-md-3 text-right'>
+                    </div>
+                    <div class="col-md-3 text-right">
+                        <button class='btn btn-primary' data-toggle="modal" style="margin-right:-50px" data-target="#customer_detail">Maklumat Pelanggan</button>
+
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-body">
+                    <nav class="mb-3">
+                        <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                            <a class="nav-item nav-link active" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="true">Tawarruq</a>
+                            <a class="nav-item nav-link" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="false">Ar-Rahn</a>
+                        </div>
+                    </nav>
+                    <div class="tab-content" id="nav-tabContent">
+                        <div class="tab-pane fade show active" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
+                            <table class="table table-striped table-hover" id="myTable">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Gadai</th>
+                                        <th>Tarikh Matang</th>
+                                        <th>Baki Harga Jualan</th>
+                                        <th>Baki Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                        <th>Keuntungan</th>
+                                    </tr>
+                                </thead>
+                            </table>
+                        </div>
+                        <div class="tab-pane fade" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
+                            <table id="xtawarruq" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Gadai</th>
+                                        <th>Tarikh Matang</th>
+                                        <th>Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                    </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div>
+
+                    {{-- Sudah Tebus --}}
+
+                    <table id="dahtebusTable" class="table table-striped table-hover">
+                        <thead class="thead-dark">
+                            <tr>
+                                <th>Bil</th>
+                                <th>No Rujukan</th>
+                                <th>Tarikh Tebus</th>
+                                <th>Baki Pembiayaan</th>
+                                <th>Margin</th>
+                                <th>Tempoh</th>
+                            </tr>
+                        </thead>
+                    </table>
+
+                    <table id="lelongTable" class="table table-striped table-hover"> 
+                        <thead class="thead-dark">
+                            <tr>
+                                <th>Bil</th>
+                                <th>No Rujukan</th>
+                                <th>Tarikh Lelong</th>
+                                <th>Tarikh Tuntut</th>
+                                <th>Pembiayaan</th>
+                                <th>Harga Jual</th>
+                                <th>Jum Tuntut/Bayar</th>
+                                <th>Keuntungan</th>
+                                <th>Caj Lelong</th>
+                            </tr>
+                        </thead>
+                    </table>
+
+                    <div class="text-center">
+                        <button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button> 
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <!-- Modal -->
 <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered modal-xl">
@@ -56,6 +269,32 @@
                                     <span id="errortelefon2" style="color:red;"></span>
                                 </div>
                             </div>
+                            <div class='form-group row col-md-12'>
+                                <div class='col-md-5'>
+                                    Bank
+                                </div>
+                                <div class='col-md-7'>
+                                    @php
+                                        $bank = Http::get($api_url . '/api/bank')->json();
+                                    @endphp
+                                    <select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
+                                        <option value="-" selected disabled>-</option>
+                                        @foreach($bank as $banks)    
+                                            <option value="{{ $banks['abbreviation'] }}" {{ $banks['abbreviation'] == $customer_info['kodbank'] ? 'selected' : ''}}>{{ $banks['name'] }}</option>
+                                        @endforeach
+                                    </select>
+                                    <span id="errorkodbank" style="color:red;"></span>
+                                </div>
+                            </div>
+                            <div class='form-group row col-md-12'>
+                                <div class='col-md-5'>
+                                    No Akaun
+                                </div>
+                                <div class='col-md-7'>
+                                    <input type="text" readonly name='noakaun' id='noakaun' value="{{ $customer_info['noakaun'] }}" class='form-control'>
+                                    <span id="errornoakaun" style="color:red;"></span>
+                                </div>
+                            </div>
                         </div>
                         <div class='col-md-6'>
                             <div class='form-group row col-md-12'>
@@ -80,7 +319,8 @@
                                 </div>
                                 <div class='col-md-8'>
                                     @php
-                                        $daerah = Http::get($api_url . '/api/daerah/' . $customer_info['koddaerah'])->json();
+                                        $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+                                        $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
                                     @endphp
                                     <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
                                 </div>
@@ -91,16 +331,25 @@
                                 </div>
                                 <div class='col-md-8'>
                                     @php
-                                        $negeri = Http::get($api_url . '/api/negeri/' . $customer_info['kodnegeri'])->json();
+                                        $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
                                     @endphp
                                     <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
                                 </div>
                             </div>
+                            <div class='form-group row col-md-12'>
+                                <div class='col-md-4'>
+                                    Nota
+                                </div>
+                                <div class='col-md-8'>
+                                    <textarea style="resize:none" name="nota" id="nota" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['nota'] }}</textarea>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </form>
                 <div class="mr-5 form-group float-right">
                     <button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Kemaskini</button>
+                    <button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Save</button>
                     <button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button>
                 </div> 
             </div>
@@ -151,271 +400,529 @@
     </div>
 </div>
 
-
-
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-12 col-lg-12">
-            <a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
-            <h3 class="text-center text-uppercase">maklumat pelanggan</h3>
-            
-            <div class="form-group row col-md-12">
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            Nama
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            No Kad Pengenalan
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="col-md-12 mt-md-3 justify-content-between form-group row">
-                    <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Tebus
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Tebus
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
-                        </label>
-                    </div>
-                    <div class='col-md-3'>
-                        <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
-                    </div>
-                </div>
-            </div>
-            <div class="card">
-                <div class="card-body">
-                    <table id="myTable">
-                        <thead>
-                            <tr>
-                                <th>Bil</th>
-                                <th>No Rujukan</th>
-                                <th>Tarikh Gadai</th>
-                                <th>Pembiayaan</th>
-                                <th>Nilai Marhun</th>
-                                <th>Tempoh</th>
-                                <th>Keuntungan</th>
-                                <th>Tarikh Matang</th>
-                                <th>Margin</th>
-                                <th>Kos Keuntungan</th>
-                                <th>Hapus Gadai</th>
-                                <!-- <th>Tebus/Upah</th> -->
-                            </tr>
-                        </thead>
-                    </table>
-
-                    {{-- Sudah Tebus --}}
-
-                    <table id="dahtebusTable">
-                        <thead>
-                            <tr>
-                                <th>Bil</th>
-                                <th>No Rujukan</th>
-                                <th>Tarikh Gadai</th>
-                                <th>Pembiayaan</th>
-                                <th>Nilai Marhun</th>
-                                <th>Tempoh</th>
-                                <th>Keuntungan</th>
-                                <th>Tarikh Matang</th>
-                                <th>Margin</th>
-                                <th>Kos Keuntungan</th>
-                                <th>Hapus Gadai</th>
-                                <!-- <th>Tebus/Upah</th> -->
-                            </tr>
-                        </thead>
-                    </table>
-
-                    <table id="lelongTable">
-                        <thead>
-                            <tr>
-                                <th>Bil</th>
-                                <th>No Rujukan</th>
-                                <th>Tarikh Gadai</th>
-                                <th>Pembiayaan</th>
-                                <th>Nilai Marhun</th>
-                                <th>Tempoh</th>
-                                <th>Keuntungan</th>
-                                <th>Tarikh Matang</th>
-                                <th>Margin</th>
-                                <th>Kos Keuntungan</th>
-                                <th>Hapus Gadai</th>
-                                <!-- <th>Tebus/Upah</th> -->
-                            </tr>
-                        </thead>
-                    </table>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 <script>
     var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
 
     var tablegadai = $('#myTable').DataTable({
         "scrollX": true
     });
 
+    var xtawarruq = $('#xtawarruq').DataTable({
+        "scrollX": false
+    });
+
     var tabledahtebus = $('#dahtebusTable').DataTable({
-        "scrollX": true
     });
 
     var tablelelong = $('#lelongTable').DataTable({
         "scrollX": true
     });
 
+    var historybayarandatatable = $('#tablehistorybayaran').DataTable({
+        "ordering": false
+    });
+
     const formatter = new Intl.NumberFormat('en-US', {
         minimumFractionDigits: 2
-    })
-    function gadaiTable(data,jenistebus){
-        var counter = 1;
+    });
 
+    function checkserah(data){
+        var urlpenebusan = $(data).data("url");
+        var norujukan = $(data).data("norujukan");
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/check/serah/gadai',
+            datatype:'json',
+            data:{
+                'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'norujukan': norujukan
+            },
+            success:function(data){
+                if(data == 'true'){
+                    window.location = urlpenebusan;
+                }else if(data == 'false'){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Gadaian Belum Scan Barcode'
+                    });
+                }
+            }
+        });
+    }
+
+    function gadaiTable(data,jenistebus){
+
+        var counter = 1;
         tablegadai.clear().draw();
         tabledahtebus.clear().draw();
         tablelelong.clear().draw();
-
-        $.each(data,function(index,gadai){
-            $.each(gadai, function(index,gadai_detail){
-
-                if(jenistebus == "belum_tebus")
-                {
-                        var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg'];
-                        
+        xtawarruq.clear().draw();
+        $.each(data,function(index,gadai_detail){
+            $.ajax({
+                method:'get',
+                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+                success:function(upahsemasa){
+                    if(jenistebus == "belum_tebus"){
                         var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-
-                        tablegadai.row.add([
-                        counter,
-                        '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_gadai'],
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format(keuntungan_semasa),
-                        gadai_detail['t_matang'],
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
-                        ''
-                    ]).draw();
-                }
-                else if(jenistebus == "sudah_tebus")
-                {
-                        var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg'];
+                        if(gadai_detail["bakihargajualan"] == null){
+                            xtawarruq.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                                '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_gadai'],
+                                gadai_detail['t_matang'],
+                                'RM '+formatter.format(gadai_detail['pinjaman']),
+                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                                gadai_detail['jbg']
+                            ]).draw();
+                        }else{
+                            tablegadai.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                                '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_gadai'],
+                                gadai_detail['t_matang1'],
+                                'RM '+ formatter.format(gadai_detail['bakihargajualan']),
+                                'RM '+formatter.format(gadai_detail['bakipjm']),
+                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                                gadai_detail['tempoh'],
+                                'RM '+ formatter.format(upahsemasa)
+                            ]).draw();
+                        }
+                    }else if(jenistebus == "sudah_tebus"){
+                        
                         tabledahtebus.row.add([
-                        counter,
-                        gadai_detail['norujukan'],
-                        gadai_detail['t_gadai'],
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format(keuntungan_semasa),
-                        gadai_detail['t_matang'],
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
-                        ''
-                    ]).draw();
-                }
-                else if(jenistebus == "lelong")
-                {
-                        var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg'];
+                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
+                            gadai_detail['norujukan'],
+                            gadai_detail['t_update'],
+                            'RM '+formatter.format(gadai_detail['bakipjm']),
+                            (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                            gadai_detail['jbg']
+                        ]).draw();
+                    }else if(jenistebus == "lelong"){
+                        var urlroute = '{{ route("lelongan", ":id") }}';
+                        urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
                         tablelelong.row.add([
-                        counter,
-                        gadai_detail['norujukan'],
-                        gadai_detail['t_gadai'],
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format(keuntungan_semasa),
-                        gadai_detail['t_matang'],
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
-                        ''
-                    ]).draw();
+                            counter,
+                            '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
+                            gadai_detail['t_lelong'],
+                            gadai_detail['trkhtuntut'],
+                            'RM '+ formatter.format(gadai_detail['pinjaman']),
+                            'RM '+formatter.format(gadai_detail['hargajual']),
+                            'RM '+formatter.format(gadai_detail['baki']),
+                            'RM '+formatter.format(gadai_detail['bakiupah']),
+                            'RM '+formatter.format(gadai_detail['cajlelong'])
+                        ]).draw();
+                    }
+                    counter = counter + 1;
                 }
-
-                
-
-                counter = counter + 1;
             });
         });
-
-
-
-
     }
+
+    function checktuntutbaki(e)
+    {
+        let tarikhtuntut = $(e).data('tarikhtuntut');
+        let norujukan = $(e).data('norujukan');
+
+        var urlroute = '{{ route("lelongan", ":id") }}';
+        urlroute = urlroute.replace(':id', norujukan);
+
+        if (tarikhtuntut == null)
+        {
+            window.location.href = urlroute;
+        }else{
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Lelongan telah dibayar!'
+            });
+        }
+
+        return false;
+    }
+
+
     $(document).ready( function () {
+
         $('#myTable').parents('div.dataTables_wrapper').first().hide();
         $('#dahtebusTable').parents('div.dataTables_wrapper').first().hide();
         $('#lelongTable').parents('div.dataTables_wrapper').first().hide();
+        $('#btnsave').css('display','none');
 
         var noic = $("#noic").val();
+        
         $.ajax({
             method:"GET",
-            url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
+            url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
             success: function(data){
                 $('#myTable').parents('div.dataTables_wrapper').first().show();
                 gadaiTable(data,"belum_tebus");
             }
         });
-        $("input[name='options']").click(function(){
-            gadaiOptionButton(noic)
+
+        $('#myTable td').click( function () {
+            alert('dasdsa');
         });
-    } );
+
+        $("input[name='options']").click(function(){
+            gadaiOptionButton(noic);
+        });
+    });
+
+    function histfunc(){
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let histid = $('input[name="belum"]:checked').val();
+            if(histid == null){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Sila pilih salah satu SAG'
+                });
+            }else{
+                $.ajax({
+                    method:'get',
+                    url:'{{ route("gadai.history") }}',
+                    data:{ "norujukan" : histid},
+                    success:function(data)
+                    {
+                        $('#historytebusModal').modal();
+                        historytebustable(data);
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+                $.ajax({
+                    method: 'get',
+                    url: api_url + '/api/transaction/' + histid,
+                    success: function(data){
+                        historybayarantable(data);
+                    }
+                });
+                $.ajax({
+                    method:'get',
+                    url: api_url + '/api/gadai/norujukan/'+histid,
+                    success:function(gadai){
+                        rekodasal(gadai);
+                    }
+                });
+            }
+        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+            let histid = $('input[name="sudahtebus"]:checked').val();
+
+            if(histid == null){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Sila pilih salah satu SAG'
+                });
+            }else{
+                $.ajax({
+                    method:'get',
+                    url:'{{ route("gadai.history") }}',
+                    data:{ "norujukan" : histid},
+                    success:function(data){
+                        $('#historytebusModal').modal();
+                        historytebustable(data);
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+                $.ajax({
+                    method: 'get',
+                    url: api_url + '/api/transaction/' + histid,
+                    success: function(data){
+                        historybayarantable(data);
+                    }
+                });
+                $.ajax({
+                    method:'get',
+                    url:api_url + '/api/gadai/norujukan/'+histid,
+                    success:function(gadai){
+                        rekodasal(gadai);
+                    }
+                });
+            }
+        }
+    }
+
+    function rekodasal(gadaian){
+        $('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan']));
+        $('#pembiayaanmodal').text('RM ' + formatter.format(gadaian[0][0]['pinjaman']));
+        $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun']));
+    }
+
+    function historybayarantable(data){
+        var counter = 1;
+        
+        historybayarandatatable.clear().draw();
+        $.each(data,function(index,bayaran){
+
+            var urlroute = '{{ route("resit.ansuran", ":id") }}';
+            urlroute = urlroute.replace(':id', bayaran['id']);
+            historybayarandatatable.row.add([
+                    counter,
+                    bayaran['created_at'], 
+                    "RM " + bayaran['duit_masuk'],
+                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                ]).draw();
+                counter = counter + 1;
+        });
+    }
+
+    var historytebusbayaran = $('#tablehistorytebus').DataTable({
+        "ordering": false
+    });
+
+    function historytebustable(data){
+
+        var counter = 1;
+        historytebusbayaran.clear().draw();
+
+        $.each(data,function(index,tebusaz){
+
+            switch(tebusaz['jenistebus']) {
+                case 'P':
+                    var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
+                    urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                    break;
+                case 'T':
+
+                    if(tebusaz['hargajualan'] === '')
+                    {
+                        var urlroute = '{{ route("resit.belumtebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+
+                    }else{
+                        var urlroute = '{{ route("resit.tebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                    }
+                  
+                    break;
+                case 'A':
+                    var urlroute = '{{ route("resit.belumansurans", ":id") }}';
+                    urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                    break;
+                case 'S':
+                var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
+                urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                break;
+                }
+   
+            historytebusbayaran.row.add([
+                counter,
+                tebusaz['norujukan'], 
+                tebusaz['jenistebus'],
+                tebusaz['pinjaman'],
+                tebusaz['jbg'],
+                tebusaz['t_tebus'],
+                '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+            ]).draw();
+            counter = counter + 1;
+        });
+    }
+
+    function daftarwakil()
+    {
+        let nopelanggan = $('#nopelangganwakil').val();
+        let nowakil = $('#nowakil').val();
+        let nama = $('#namawakil').val();
+        let hubungan = $('#slthubungan').val();
+        let alamat = $('#alamatwakil').val();
+        let telefon = $('#notelwakil').val();
+        let nota = $('#notawakil').val();
+        let nokp = $('#nokpwakil').val();
+        let norujukan = $('#norujukanwakil').val();
+
+        
+        $.ajax({
+            method:'POST',
+            url: "{{ route('wakil.create') }}",
+            data:{ 
+                "_token": "{{ csrf_token() }}",
+                "nopelanggan" : nopelanggan,
+                "nowakil" : nowakil,
+                "nama" : nama,
+                "hubungan" : hubungan,
+                "alamat" : alamat,
+                "telefon" : telefon,
+                "nota" : nota,
+                "icno" : nokp
+                },
+            success:function(data){
+
+                if(data == 1)
+                {
+                    $('#WakilModal').hide();
+                    $('#WakilModal').modal('hide');
+                    nw = nowakil;
+                    Swal.fire({
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false,
+                        confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
+                        icon: 'success',
+                        title: 'Berjaya Mendaftar Wakil Pelanggan!'
+                    }).then(function(){
+                          
+                        $.ajax({
+                            method:'put',
+                            url: api_url + '/api/ubahwakil/' + kodcaw,
+                            data:{ 'nowakil' : nw,
+                                'norujukan' : norujukan},
+                            success:function(data){
+
+                                if(data === 1)
+                                {
+                                    Swal.fire({
+                                        icon: 'success',
+                                        title: 'Berjaya!',
+                                        text: 'Penukaran Wakil berjaya' 
+                                    }).then(async function(){
+                                        return true;
+                                        location.reload();
+                                        });
+                                }else{
+                                    Swal.fire({
+                                        icon: 'info',
+                                        title: 'Pemberitahuan!',
+                                        text: 'Wakil telah didaftarkan dengan IC tersebut!' 
+                                    }).then(async function(){
+                                        return true;
+                                        location.reload();
+                                    });
+                                }
+                            
+                            }
+                        });
+                    });
+                }
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+        });
+    }
+
+    function daftarwakilfunction(nokp,norujukan)
+    {
+        $('#nokpwakil').val(nokp);
+        $('#norujukanwakil').val(norujukan);
+
+        $.ajax({
+            method:'GET',
+            url: "{{ route('wakil.caricustomer') }}",
+            data:{ "icno" : nokp },
+            success:function(data){
+
+                $('#WakilModal').modal();
+                $('#namawakil').val('');
+                $('#alamatwakil').val(data['']);
+                $('#notelwakil').val(data['']);
+
+                //get first wakil
+                $.ajax({
+                    method:'GET',
+                    url: "{{ route('wakil.first') }}",
+                    success:function(getfirstwakil)
+                    {
+                        let firstwakil = parseInt(getfirstwakil);
+
+                        $('#nowakil').val(firstwakil+1);
+                    }
+                });
+
+                if(data != 'no-data')
+                {
+                    $('#namawakil').val(data['nama']);
+                    $('#alamatwakil').val(data['alamat1']);
+                    $('#notelwakil').val(data['telefon']);
+                    $('#nopelangganwakil').val(data['nopelanggan']);
+                }
+            
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+
+        });
+    }
+
+
+    $('#poskod').change(function(){
+        var poskod = this.value;
+        console.log(poskod);
+        $.ajax({
+            method:'GET',
+            url:api_url+'/api/poskod/'+poskod,
+            success:function(poskod_detail){
+                var koddaerah = poskod_detail['koddaerah'];
+                var kodnegeri = poskod_detail['kodnegeri'];
+                $.ajax({
+                    url:api_url+'/api/negeri/'+kodnegeri,
+                    method:'GET',
+                    success:function(negeri){
+                        console.log(negeri);
+                        $('#kodnegeri').val(negeri['negeri']);
+                    }
+                });
+                $.ajax({
+                    url:api_url+'/api/daerah/'+koddaerah,
+                    method:'GET',
+                    success:function(daerah){
+                        $('#koddaerah').val(daerah['namadaerah']);
+                    }
+                });
+            }
+        });
+    });
+
 
     function gadaiOptionButton(noic){
         tablegadai.clear().draw();
         if($("input[name='options']:checked").val() == 'belum_tebus'){
-            
+            $('#nav-tab').show();
             $('#myTable').parents('div.dataTables_wrapper').first().show();
+            $('#xtawarruq').parents('div.dataTables_wrapper').first().show();
             $('#dahtebusTable').parents('div.dataTables_wrapper').first().hide();
             $('#lelongTable').parents('div.dataTables_wrapper').first().hide();
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"belum_tebus");
                 }
             });
         }
         if($("input[name='options']:checked").val() == 'sudah_tebus'){
-
+            $('#nav-tab').hide();
             $('#myTable').parents('div.dataTables_wrapper').first().hide();
+            $('#xtawarruq').parents('div.dataTables_wrapper').first().hide();
             $('#dahtebusTable').parents('div.dataTables_wrapper').first().show();
             $('#lelongTable').parents('div.dataTables_wrapper').first().hide();
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"sudah_tebus");
                 }
             });
         }
         if($("input[name='options']:checked").val() == 'lelong'){
-
+            $('#nav-tab').hide();
             $('#myTable').parents('div.dataTables_wrapper').first().hide();
+            $('#xtawarruq').parents('div.dataTables_wrapper').first().hide();
             $('#dahtebusTable').parents('div.dataTables_wrapper').first().hide();
             $('#lelongTable').parents('div.dataTables_wrapper').first().show();
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/lelong",
+                url: api_url + "/api/customers/"+noic+"/gadai/lelong/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"lelong");
                 }
@@ -429,115 +936,125 @@
         $('#btnkemaskini').removeClass('btn-primary');
         $('#btnkemaskini').text('Cancel');
         $('#btnkemaskini').attr('onclick','cancelbutton()');
-        $('#btnotp').text('Save');
-        $('#btnotp').attr('onclick','kemaskinipelanggan()');
-
+        $('#btnsave').show();
+        $('#btnotp').css('display','none');
         //attribute nak readonly false
         $('#telefon').attr('readonly', false);
         $('#telefon2').attr('readonly', false);
-
+        $('#kodbank').attr('disabled', false);
+        $('#noakaun').attr('readonly', false);
+        $('#nota').attr('readonly', false);
+        $('#nama').attr('readonly', false);
+        $('#alamat').attr('readonly', false);
+        $('#poskod').attr('readonly', false);
     }
 
-    function cancelbutton()
-    {
+    function cancelbutton(){
         $('#btnkemaskini').removeClass('btn-danger');
         $('#btnkemaskini').addClass('btn-primary');
         $('#btnkemaskini').text('Kemaskini');
         $('#btnkemaskini').attr('onclick','kemaskinifunc()');
-        $('#btnotp').text('Daftar Akuan Online');
-        $('#btnotp').attr('onclick','#');
+        $('#btnsave').css('display','none');
+        $('#btnotp').show();
 
         document.getElementById("kemaskiniform").reset();
 
         //attribute nak readonly false
         $('#telefon').attr('readonly', true);
         $('#telefon2').attr('readonly', true);
+        $('#kodbank').attr('disabled', true);
+        $('#noakaun').attr('readonly', true);
+        $('#nota').attr('readonly', true);
+        $('#nama').attr('readonly', true);
+        $('#alamat').attr('readonly', true);
+        $('#poskod').attr('readonly', true);
 
+        /* Error Telefon */
+        $('#errortelefon').hide();
+        $('#errortelefon').text("");
+        $('#telefon').removeClass('is-invalid');
+
+        $('#errortelefon2').hide();
+        $('#errortelefon2').text("");
+        $('#telefon2').removeClass('is-invalid');
     }
 
-        $("#kemaskiniform").submit(function(event) {
-            event.preventDefault();
+    $("#kemaskiniform").submit(function(event) {
+        event.preventDefault();
 
-            var alamat = $('#alamat').val();
-            var nokp = $('#icno').val();
-            var poskod = $('#poskod').val();
-            var telefon1 = $('#telefon').val();
-            var telefon2 = $('#telefon2').val();
+        var nokp = $('#icno').val();
+        var telefon1 = $('#telefon').val();
+        var telefon2 = $('#telefon2').val();
+        var kodbank = $('#kodbank').val();
+        var noakaun = $('#noakaun').val();
+        var nota = $('#nota').val();
+        var nama = $('#nama').val();
+        var alamat = $('#alamat').val();
+        var poskod = $('#poskod').val();
 
-                    $.ajax({
-                    method:"put",
-                    url: api_url + "/api/customersonline/" + nokp,
-                    data:{
-                            "alamat": alamat,
-                            "poskod": poskod,
-                            "telefon1": telefon1,
-                            "telefon2": telefon2
-                        },
-                    success: function(success){
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Berjaya',
-                            text: 'Anda telah berjaya mengemaskini maklumat pelanggan'
-                        })
-                    },
-                    error: function (request, status, error) {
-                        alert(request.responseText);
-                    }
-
-                    });
-    
+        $.ajax({
+            method:"put",
+            url: api_url + "/api/customers/update/khazanah/" + nokp,
+            data:{
+                "telefon1": telefon1,
+                "telefon2": telefon2,
+                "kodbank":kodbank,
+                "noakaun":noakaun,
+                'nota':nota,
+                'nama':nama,
+                'alamat':alamat,
+                'poskod':poskod
+            },
+            success: function(success){
+                $('#btnsave').css('display','none');
+                $('#btnotp').show();
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berjaya',
+                    text: 'Berjaya mengemaskini maklumat pelanggan'
+                })
+            },
+            error: function (request, status, error) {
+                alert(request.responseText);
+            }
 
         });
+    });
 
-
-
-    function kemaskinipelanggan()
-    {
+    function kemaskinipelanggan(){
 
         var errortelefon1 = 0;
         var errortelefon2 = 0;
        
-        if(!($('#telefon').val().length > 10 && $('#telefon').val().length < 12))
-        {
+        if(!($('#telefon').val().length >= 9 && $('#telefon').val().length < 12)){
             $('#errortelefon').show();
             $('#errortelefon').text("*lebih kecil dari 10 dan lebih besar dari 12");
             $('#telefon').addClass('is-invalid');
             errortelefon1++;
-        }
-        else
-        {
+        }else{
             $('#errortelefon').hide();
             $('#telefon').removeClass('is-invalid');
             errortelefon1--;
         }
 
-        if($('#telefon2').val() != '')
-        {
-            if(!($('#telefon2').val().length > 10 && $('#telefon2').val().length < 12))
-            {
+        if($('#telefon2').val() != ''){
+            if(!($('#telefon2').val().length >= 9 && $('#telefon2').val().length < 12)){
                 $('#errortelefon2').show();
                 $('#errortelefon2').text("*lebih kecil dari 10 dan lebih besar dari 12");
                 $('#telefon2').addClass('is-invalid');
                 errortelefon2++;
-            }
-            else
-            {
+            }else{
                 $('#errortelefon2').hide();
                 $('#telefon2').removeClass('is-invalid');
                 errortelefon2--;
             }
-        }
-        else
-        {
+        }else{
             $('#errortelefon2').hide();
             $('#telefon2').removeClass('is-invalid');
             errortelefon2--;
         }
         
-
-
-        if(errortelefon1 <= 0 && errortelefon2 <= 0)
-        {
+        if(errortelefon1 <= 0 && errortelefon2 <= 0){
             $('#btnkemaskini').removeClass('btn-danger');
             $('#btnkemaskini').addClass('btn-primary');
             $('#btnkemaskini').text('Kemaskini');
@@ -548,10 +1065,15 @@
             //attribute nak readonly false
             $('#telefon').attr('readonly', true);
             $('#telefon2').attr('readonly', true);
+            $('#noakaun').attr('readonly', true);
+            $('#kodbank').attr('disabled', true);
+            $('#nota').attr('readonly', true);
+            $('#nama').attr('readonly', true);
+            $('#alamat').attr('readonly', true);
+            $('#poskod').attr('readonly', true);
 
             $('#kemaskiniform').trigger('submit');
         }
-            
     }
 
     $('#btnotp').click(function(){
@@ -568,11 +1090,10 @@
             method:'get',
             url: "{{ route('customer.otp') }}",
             data:{
-                'noic' : noic
+                'noic_otp' : noic
             },
             dataType:'json',
             success: function(otp_token){
-                console.log(otp_token['error']);
                 if(otp_token['error']){
                     Swal.fire({
                         icon: 'error',
@@ -586,12 +1107,9 @@
                 } 
             },
             error: function(xhRequest, ErrorText, thrownError){
-                // alert('Gadai Tidak Berjaya');
                 console.log(xhRequest);
             }
         });
-    })
-
-
+    });
 </script>
 @endsection
diff --git a/routes/web.php b/routes/web.php
index bf260ff..eefb395 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -125,6 +125,7 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l
 Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah');
 Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah');
 Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
+Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah');
 Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
 
 Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
@@ -143,7 +144,7 @@ Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahControlle
 Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah');
 Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah');
 Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah');
-Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
+Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
 Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah');
 Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah');
 Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller');