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

Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter

Browse Source
This commit is contained in:
afiq
2021-02-10 09:42:04 +08:00
parent 7f082e1185 20c7c7e48f
commit dc3b466e01
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+12 -12
View File
@@ -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;
}
resources/views/penebusan/index.blade.php
+6 -15
View File
@@ -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'] }}";