diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 6f5d103..56cd6c2 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -108,7 +108,6 @@ class CustomersController extends Controller
      */
     public function store(Request $request)
     {
-        // dd(request()->all());
         if($request->warganegara){
             $warganegara = 'Y';
         }else{
@@ -141,10 +140,9 @@ class CustomersController extends Controller
         $count = sprintf("%08d", $nosiri_latest);
 
         $no_pelanggan = $request->bangsa . substr($request->noic,6,2).'-'.$count;
-        // dd($tarikh_lahir);
         $detail_poskod = Http::get(config('api.url') . '/api/poskod/' . $request->poskod)->json();
-        // dd($auth_user);
-        $sent_data = [
+
+        $customer_info = Http::post(config('api.url') . '/api/customers/create/'. $auth_user['cawangan'],[
             'kodcaw' => $auth_user['cawangan'],
             'nopelanggan' => $no_pelanggan,
             'nokp' => $request->noic,
@@ -165,10 +163,7 @@ class CustomersController extends Controller
             'teller' => $auth_user['name'],
             'telefon2' => $request->alternate_phone,
             'nosiri' => $nosiri_latest
-        ];
-
-        $customer_info = Http::post(config('api.url') . '/api/customers/'. $auth_user['cawangan'],$sent_data);
-        dd($sent_data);
+        ]);
 
         Session::put('customer_info',$customer_info);
         return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] );
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 27c2acf..16064ae 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -74,11 +74,11 @@
                                             <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,8 +86,7 @@
                                             <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="01">Islam</option>
+                                                    <option selected value="01">Islam</option>
                                                     <option value="02">Hindu</option>
                                                     <option value="03">Buddha</option>
                                                     <option value="04">Kristian</option>
@@ -124,8 +123,7 @@
                                             <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>
@@ -192,6 +190,19 @@
         identifyIC(noic);
         
     });
+
+    $('#warganegara').on('click',function(){
+        // console.log(this);
+        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");
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index aae0f17..2a392f5 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -24,7 +24,10 @@
                             Jumlah Pembiayaan Semasa
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="">
+                            @php
+                                $outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json();
+                            @endphp
+                            <input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
                         </div>
                     </div>
                 </div>
@@ -136,7 +139,6 @@
                                 <input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
                                 <a href="{{ route('gadai.batal',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a>
                                 <input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
-                                <input type="button" class="float-right btn btn-primary mr-2" value="Tambah Gadai">
                             </div>
                         </div>
                     </form>
@@ -533,14 +535,22 @@
         var pembiyaan_max_pelulus = $('#pembiyaan_max_pelulus').val();
         var pembiyaan_max_pelulus = Number(pembiyaan_max_pelulus.replace(/[^0-9.-]+/g,""));
         var min_pinjaman = nilai_marhun_total * 0.10;
-
-
+        var max_pinjaman = nilai_marhun_total * 0.80;
 
         if(pinjaman < min_pinjaman){
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
-                text: 'Sila Masukan Pembiayaan, Minimal Pembiayaan ialah RM '+ min_pinjaman
+                text: 'Sila Masukan Pembiayaan, Minimal Pembiayaan ialah RM '+ formatter.format(min_pinjaman)
+            });
+            event.preventDefault();
+            return false;
+        }
+        else if(pinjaman > max_pinjaman){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Pinjaman Melebihi Margin Yang Dibenarkan'
             });
             event.preventDefault();
             return false;