Merge remote-tracking branch 'origin/prod-kopkb' into annur-rebate

This commit is contained in:
nurafrinaalimi16
2026-09-01 11:08:05 +08:00
66 changed files with 10790 additions and 4036 deletions
+1 -1
View File
@@ -876,7 +876,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 }}",
+43 -29
View File
@@ -29,6 +29,7 @@
<div class="form-group row col-12">
<input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
<input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
<input type="hidden" name="tag_anggota" id="tag_anggota" value="{{ $customer_info['tag_anggota'] ?? 0 }}">
</div>
<div class="col-12 mb-2">
@@ -198,6 +199,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>
@@ -593,17 +595,23 @@
// }
$.ajax({
method:'GET',
url: api_url + '/api/kadarujrah',
async:false,
data:{
'nilaimarhun' : total_nilai_marhun,
'kodcaw' : kodcaw_ujrah
},
success:function(data){
kadarupah = data;
}
});
method:'GET',
url: api_url + '/api/kadarujrah',
async:false,
data:{
'nokp': $('#nokp').val(),
'nilaimarhun' : total_nilai_marhun,
'kodcaw' : kodcaw_ujrah
},
success:function(data){
kadarupah = data;
// Jika anggota (tag_anggota = 1), kadar ujrah dipaksa 0.00
if(Number($('#tag_anggota').val()) === 1){
kadarupah = 0;
}
}
});
$('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
$('#marhun_detail').val(marhun_details);
@@ -636,24 +644,30 @@
$('#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 percent_pinjaman = (pinjaman / total_nilai_marhun) * 100;
let array_keuntungan = {}; // Initialize as an object
$.ajax({
method: 'POST',
url: api_url + '/api/onepercent',
async: false,
data: {
'nilaimarhun': total_nilai_marhun,
'pembiayaan': pinjaman,
'kadarujrah': kadarupah,
'margin': percent_pinjaman,
'kodcaw': "{{ Auth::user()->cawangan }}"
},
success: function (data) {
array_keuntungan = data;
$.ajax({
method:'POST',
url: api_url + '/api/onepercent',
async:false,
data:{
'nokp': nokp,
'nilaimarhun' : total_nilai_marhun,
'pembiayaan' : pinjaman,
'kadarujrah' : kadarupah,
'margin' : percent_pinjaman,
'kodcaw' : "{{ Auth::user()->cawangan }}"
},
success:function(data){
array_keuntungan = data;
}
});
var keuntungan_sebulan = getRoundedMethod(array_keuntungan['keuntungan']);
var keuntungan_6bln = getRoundedMethod(keuntungan_sebulan * 6);
@@ -1193,10 +1207,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;