Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into lapfix
This commit is contained in:
@@ -754,7 +754,7 @@
|
||||
'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)
|
||||
'RM '+ upahsemasa
|
||||
]).draw();
|
||||
}
|
||||
}else if(jenistebus == "sudah_tebus"){
|
||||
|
||||
@@ -523,7 +523,7 @@
|
||||
'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)
|
||||
'RM '+ upahsemasa
|
||||
]).draw();
|
||||
}
|
||||
}else if(jenistebus == "sudah_tebus"){
|
||||
|
||||
@@ -417,7 +417,7 @@
|
||||
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#jumlahupah').val(formatter.format(data));
|
||||
$('#jumlahupah').val(data);
|
||||
$('#bayaranditerima').val(data);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1194,7 +1194,7 @@
|
||||
let jenisbayarantebus = '';
|
||||
let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
|
||||
|
||||
var bayar = $('#bayaran').val();
|
||||
var bayar = Number(parseFloat($('#bayaran').val().replace(/[^0-9.-]+/g,"")).toFixed(2));
|
||||
var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
|
||||
|
||||
if(bayar < jumupah){
|
||||
|
||||
Reference in New Issue
Block a user