diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 76693c8..350c705 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -499,7 +499,6 @@ class KhazanahController extends Controller $kelulusan = Http::get(config('api.url') . '/api/RekodDahLepas/' . $auth_user['cawangan'])->json(); $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); - dd($kelulusanmohonid); foreach($kelulusan as $index=>$k) { diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index 184f952..e7874c1 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -883,7 +883,7 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); - let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); // let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|"; let status = errortext; let jumpinjam = $('#pinjaman').val(); @@ -994,7 +994,7 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); - let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|"; let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; let jumpinjam = $('#pinjaman').val(); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 176f6be..fda67c2 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -799,7 +799,7 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); - let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); let status = errortext; let jumpinjam = $('#pinjaman').val(); let teller = "{{ Auth::user()->name }}"; @@ -915,7 +915,7 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); - let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; let jumpinjam = $('#pinjaman').val(); let teller = "{{ Auth::user()->name }}"; diff --git a/resources/views/khazanah/rekodtelahlulus.blade.php b/resources/views/khazanah/rekodtelahlulus.blade.php index 7e51be5..d44f93d 100644 --- a/resources/views/khazanah/rekodtelahlulus.blade.php +++ b/resources/views/khazanah/rekodtelahlulus.blade.php @@ -23,7 +23,6 @@
| JUMLAH | -RM {{ number_format($gadai['nilaimarhun'],2) }} | +RM {{ number_format($gadai['nilaimarhun'],2) }} | RM {{ number_format($nilaihargasemasa,2) }} | {{ number_format($gadai['berat'],2) }} | @@ -1315,7 +1315,7 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; + let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = separuhla; // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; let status = "[Tebus Separuh] Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; let jumpinjam = $('#bakipinjaman').val(); @@ -1436,7 +1436,7 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; + let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = separuhla; let komen = ''; if(pinjamanbaru >= 10000) { @@ -1593,7 +1593,7 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); + let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; let status = "[Tambah Pinjaman] Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; let jumpinjam = $('#hargapembiayaansemasa').val(); @@ -1714,13 +1714,14 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); + let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); let komen = ''; if(pinjamanbaru >= 10000) { komen = "[Tambah Pinjaman] Pembiayaan Melebihi RM 10,000"; } - + + let status = komen; let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""); let teller = "{{ Auth::user()->name }}"; @@ -2110,12 +2111,13 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa; + let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = marginsemasa; let komen = ''; if(pinjamanbaru >= 10000) { komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000"; } + let status = komen; let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); let teller = "{{ Auth::user()->name }}"; | |||