Merge remote-tracking branch 'origin/rebate-anggota' into explore/ismail

DONE:resolve conflict on two files

resources/views/gadaian/v2/edit.blade.php

@@ -1026,7 +1026,7 @@
                     'harga' : harga_edit,
                     'n_marhun' : nilai_marhun_edit,
                     'marhun' : marhun_edit,
-                    // 'nota' : nota,
+                    'nota' : nota,
                     'tag_permata' : tagpermata_edit,
                     'berat_batu_permata' : beratpermata_edit,
                     "teller": "{{ Auth::user()->name }}",

resources/views/gadaian/v2/index.blade.php

@@ -224,6 +224,7 @@
                                 <input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden>
                                 <input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden>
                                 <input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
+                                <input type="text" name="nokp" id="nokp" value="{{ !empty($customer_info['kpbaru']) ? $customer_info['kpbaru'] : ($customer_info['kplama'] ?? '') }}" 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">
                             </div>
@@ -633,6 +634,7 @@
             url: api_url + '/api/kadarujrah',
             async:false,
             data:{
+                'nokp': $('#nokp').val(),
                 'nilaimarhun' : total_nilai_marhun,
                 'kodcaw' : kodcaw_ujrah
             },
@@ -679,6 +681,9 @@
     $('#pinjaman').on('input',function(){
         var pinjaman = Number(this.value);
         var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
+        var nokp = $('#nokp').val();
+        //console.log('DEBUG NOKP:', nokp, kadarupah);
+
 
         // var keuntungan_sebulan = pinjaman * kadarupah;
         // var keuntungan_6bln = keuntungan_sebulan * 6;
@@ -692,6 +697,7 @@
             url: api_url + '/api/onepercent',
             async:false,
             data:{
+                'nokp': nokp,
                 'nilaimarhun' : total_nilai_marhun,
                 'pembiayaan' : pinjaman,
                 'kadarujrah' : kadarupah,
@@ -1217,10 +1223,10 @@
                 icon: 'error',
                 title: 'Amaran!',
                 text: 'Pembiayaan Tidak Lengkap'
-            });
-            event.preventDefault();
-            return false;
-        }
+    });
+    event.preventDefault();
+    return false;
+}
 
         let dataCawangan = await getDataCawangan();
         let bakiAkhir = dataCawangan.baki;