This commit is contained in:
fifi97
2021-03-28 08:02:49 +08:00
parent b39dc33827
commit da8ed07029
2 changed files with 37 additions and 9 deletions
+13 -1
View File
@@ -1967,12 +1967,24 @@ class GadaiController extends Controller
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
if($request->tarikh <= '2021-02-25')
{
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
}
else{
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
}
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
return response()->json($array_rekodemas);