KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into lapfix

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-10-25 12:49:14 +08:00
parent 25147a616d b2d7cc6009
commit fbde222433
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+1 -1
View File
@@ -754,7 +754,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']), 'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'], gadai_detail['tempoh'],
'RM '+ formatter.format(upahsemasa) 'RM '+ upahsemasa
]).draw(); ]).draw();
} }
}else if(jenistebus == "sudah_tebus"){ }else if(jenistebus == "sudah_tebus"){
resources/views/khazanah/info.blade.php
+1 -1
View File
@@ -523,7 +523,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']), 'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'], gadai_detail['tempoh'],
'RM '+ formatter.format(upahsemasa) 'RM '+ upahsemasa
]).draw(); ]).draw();
} }
}else if(jenistebus == "sudah_tebus"){ }else if(jenistebus == "sudah_tebus"){
resources/views/penebusan/index-khazanah.blade.php
+1 -1
View File
@@ -417,7 +417,7 @@
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan, url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json', dataType: 'json',
success:function(data){ success:function(data){
$('#jumlahupah').val(formatter.format(data)); $('#jumlahupah').val(data);
$('#bayaranditerima').val(data); $('#bayaranditerima').val(data);
} }
}); });
resources/views/penebusan/index.blade.php
+1 -1
View File
@@ -1194,7 +1194,7 @@
let jenisbayarantebus = ''; let jenisbayarantebus = '';
let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1); 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; var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
if(bayar < jumupah){ if(bayar < jumupah){