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

merge yang lejer am

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-14 03:13:13 +08:00
parent ccf3dab584
commit e22fab7c5c
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+10 -9
View File
@@ -505,12 +505,12 @@ class TebusController extends Controller
// ->whereNotNull('rebate')
// ->sum('rebate');
$keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>','2021-04-13')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('bakiupah')
->sum('bakiupah');
// $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>','2021-04-13')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('bakiupah')
// ->sum('bakiupah');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
@@ -530,10 +530,11 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
$keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq;
return response()->json($total,200);
}