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

fix skit2

Browse Source
This commit is contained in:
fifi97
2021-05-16 07:22:57 +08:00
parent e7a9a92699
commit 0f96ef1efe
12 changed files with 408 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+11 -2
View File
@@ -1502,14 +1502,23 @@ class AliranTunaiController extends Controller
}
$totaltuntutbaki = 0;
$bakilelong = 0;
$rugilelong = 0;
foreach($tuntutbaki as $index1=>$tb)
{
if($tb['jenis'] == 'T')
{
$bakilelong += $tb['jumlah'];
}else{
$rugilelong += -($tb['jumlah']);
}
$totaltuntutbaki += $tb['jumlah'];
}
$penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama) + $rugilelong;
$gadaian = floatval($totalgadai) + $bakilelong;
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
app/Http/Controllers/LelongController.php
+6 -1
View File
@@ -91,10 +91,15 @@ class LelongController extends Controller
$bakiakhir = $baki;
if($request->jenis == 'T')
if($request->jenis == 'T'){
$bakiakhir -= $request->jumlah;
$keluar += $request->jumlah;
}
else
{
$bakiakhir += -($request->jumlah);
$masuk += -($request->jumlah);
}
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [