from server

This commit is contained in:
e.arrahn
2022-07-25 22:19:13 +08:00
parent a73d2938c6
commit 113ef50df1
2 changed files with 9 additions and 3 deletions
+8 -2
View File
@@ -1121,7 +1121,7 @@ class TebusController extends Controller
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31'],['t_jual','<=','2022-07-24']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
@@ -1708,7 +1708,13 @@ class TebusController extends Controller
// dd($ansuran);
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran + $upahlelong);
}