diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index f86772a..8254c8f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1937,11 +1937,6 @@ class GadaiController extends Controller // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); - // if($request->tarikh > '2021-04-13') - // { - // $request->tarikh = '2021-04-13'; - // } - $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) @@ -1950,7 +1945,7 @@ class GadaiController extends Controller $gadaibaru = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - ->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']]) + ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;