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

server latest

Browse Source
This commit is contained in:
e.arrahn
2021-09-15 21:27:28 +08:00
parent b0251cb4a1
commit 5ac8c01a71
6 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+10 -2
View File
@@ -203,6 +203,10 @@ class TebusController extends Controller
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
if($upah_semasa <= 0){
$upah_semasa = 0;
}
return $upah_semasa;
}
@@ -238,6 +242,10 @@ class TebusController extends Controller
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
if($upah_semasa <= 0){
$upah_semasa = 0;
}
return response()->json($upah_semasa);
}
@@ -568,8 +576,8 @@ class TebusController extends Controller
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');