diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 302655e..f86a035 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -982,36 +982,36 @@ class KhazanahController extends Controller //dd($latestVault); - $masuk_V=0;$pendahuluan_V=0;$keluar_V=0;$serahan_V=0; + $masuk_V = 0;$pendahuluan_V = 0;$keluar_V = 0;$serahan_V = 0; - if($masukV==0) + if($masukV == 0) { - $masuk_V=0+$kurang_T; + $masuk_V = 0 + $kurang_T; } else { - $masuk_V=$masukV; + $masuk_V=$masukV + $kurang_T; } - if($keluarV==0) - $keluar_V=0; + if($keluarV == 0) + $keluar_V = 0; else $keluar_V=$keluarV; - if($pendahuluanV==0) - $pendahuluan_V=0; + if($pendahuluanV == 0) + $pendahuluan_V = 0; else - $pendahuluan_V=$pendahuluanV; + $pendahuluan_V = $pendahuluanV; - if($serahanV==0) - $serahan_V=0; + if($serahanV == 0) + $serahan_V = 0; else - $serahan_V=$serahanV; + $serahan_V = $serahanV; } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 8a6a245..ac7cfa2 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -463,6 +463,7 @@ if(tarikhgadai >= tarikhtawarruq) array_marhun.push(marhun); array_berat.push(berat); + totalmarhun = totalmarhun - parseFloat(nilaimarhun); console.log("Nilai Marhun: " + nilaimarhun); console.log("Max Bayaran Marhun: " + totalmarhun); @@ -475,21 +476,17 @@ if(tarikhgadai >= tarikhtawarruq) var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); - array_recno.splice(rm); - array_nm.splice(rmnilai); - array_marhun.splice(rmmarhun); - array_berat.splice(rmberat); + array_recno.splice(rm,1); + array_nm.splice(rmnilai,1); + array_marhun.splice(rmmarhun,1); + array_berat.splice(rmberat,1); totalmarhun = totalmarhun + parseFloat(nilaimarhun); - console.log("Nilai Marhun: " + nilaimarhun); - console.log("Max Bayaran Marhun: " + totalmarhun); - console.table(array_recno[0]); } if(numbernotchecked != totalCheckboxes) { - console.log('masuk'); $.ajax({ method:'GET', url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan, @@ -514,6 +511,7 @@ if(tarikhgadai >= tarikhtawarruq) console.log(textStatus); } }); + } else { @@ -548,7 +546,6 @@ if(tarikhgadai >= tarikhtawarruq) array_marhun.push(marhun); array_berat.push(berat); - console.log("Nilai Marhun: " + nilaimarhun); } else{ @@ -556,15 +553,12 @@ if(tarikhgadai >= tarikhtawarruq) var rmnilai = array_nm.findIndex(y => y == nilaimarhun); var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); - array_recno.splice(rm); array_nm.splice(rmnilai); array_marhun.splice(rmmarhun); array_berat.splice(rmberat); - console.log("Nilai Marhun: " + rmnilai); - } if (checkedOne == false) { @@ -1056,9 +1050,6 @@ function bayaransemua() return false; } - alert('masuk'); - return false; - var sumnilaimarhun = 0; var sumberat = 0; var marhun = "{{ $gadai['marhun'] }}";