From 8f58a7b521285c64135742c20f78c2f102b8871d Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 20 Oct 2021 10:39:42 +0800 Subject: [PATCH 1/2] fix ansuran --- resources/views/penebusan/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 1e4cbc2..18d116a 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -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){ From 30c4d412336975f0f8858d95743466e8ade4505f Mon Sep 17 00:00:00 2001 From: afiq Date: Sun, 24 Oct 2021 11:57:59 +0800 Subject: [PATCH 2/2] fix display upah --- resources/views/customers/info.blade.php | 2 +- resources/views/khazanah/info.blade.php | 2 +- resources/views/penebusan/index-khazanah.blade.php | 2 +- resources/views/penebusan/index.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 24eaaa4..7543186 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -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"){ diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index 7160a24..30d37d9 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -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"){ diff --git a/resources/views/penebusan/index-khazanah.blade.php b/resources/views/penebusan/index-khazanah.blade.php index 6145168..cabb651 100644 --- a/resources/views/penebusan/index-khazanah.blade.php +++ b/resources/views/penebusan/index-khazanah.blade.php @@ -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); } }); diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 18d116a..348efac 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1194,7 +1194,7 @@ let jenisbayarantebus = ''; let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1); - var bayar = ;Number(parseFloat($('#bayaran').val().replace(/[^0-9.-]+/g,"")).toFixed(2)); + var bayar = Number(parseFloat($('#bayaran').val().replace(/[^0-9.-]+/g,"")).toFixed(2)); var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran; if(bayar < jumupah){