fix gadai imbangduga
This commit is contained in:
@@ -1937,11 +1937,6 @@ class GadaiController extends Controller
|
|||||||
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
|
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
|
||||||
->sum('pinjaman');
|
->sum('pinjaman');
|
||||||
|
|
||||||
// if($request->tarikh > '2021-04-13')
|
|
||||||
// {
|
|
||||||
// $request->tarikh = '2021-04-13';
|
|
||||||
// }
|
|
||||||
|
|
||||||
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
|
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
|
||||||
->where('tagpalsu','=',0)
|
->where('tagpalsu','=',0)
|
||||||
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
||||||
@@ -1950,7 +1945,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
$gadaibaru = Gadai::on($cawangan['mysql'])
|
$gadaibaru = Gadai::on($cawangan['mysql'])
|
||||||
->where('tagpalsu','=',0)
|
->where('tagpalsu','=',0)
|
||||||
->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']])
|
->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
|
||||||
->sum('pinjaman');
|
->sum('pinjaman');
|
||||||
|
|
||||||
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
|
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
|
||||||
|
|||||||
Reference in New Issue
Block a user