From a3a80cd0ba34a3bc70fbccd0317f837e38100321 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 5 Oct 2021 15:27:57 +0800 Subject: [PATCH] fix kelulusan --- app/Http/Controllers/KhazanahController.php | 1 - resources/views/gadaian/edit.blade.php | 4 ++-- resources/views/gadaian/index.blade.php | 4 ++-- .../views/khazanah/rekodtelahlulus.blade.php | 1 - resources/views/penebusan/index.blade.php | 16 +++++++++------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ba25597..338e57c 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 52c6f24..e4b1be5 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -879,7 +879,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(); @@ -990,7 +990,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 dcbdd78..f722083 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -797,7 +797,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 }}"; @@ -913,7 +913,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 @@
- {{ dd($kelulusanmohonid)}} diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 40ffee5..833951a 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -164,7 +164,7 @@ - + @@ -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(); @@ -1439,7 +1439,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(separuhla > 75 && separuhla <= 80) { @@ -1599,7 +1599,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(); @@ -1723,7 +1723,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 = ''; if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80)) { @@ -1732,7 +1732,8 @@ { komen = "[Tambah Pinjaman] Pembiayaan Melebihi RM 10,000"; } - + + let status = komen; let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""); let teller = "{{ Auth::user()->name }}"; @@ -2125,7 +2126,7 @@ }).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(marginsemasa > 75 && marginsemasa <= 80) { @@ -2134,6 +2135,7 @@ { komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000"; } + let status = komen; let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); let teller = "{{ Auth::user()->name }}";
JUMLAHRM {{ number_format($gadai['nilaimarhun'],2) }}RM {{ number_format($gadai['nilaimarhun'],2) }} RM {{ number_format($nilaihargasemasa,2) }} {{ number_format($gadai['berat'],2) }}