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

baiki backdate imbangduga

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-19 00:19:14 +08:00
parent 957d3c82a2
commit 1f9b8bbea9
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+10 -8
View File
@@ -1939,16 +1939,16 @@ class GadaiController extends Controller
$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','<=','2021-04-13'],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
->sum('pinjaman'); ->sum('pinjaman');
$gadaibaru = Gadai::on($cawangan['mysql']) // $gadaibaru = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) // ->where('tagpalsu','=',0)
->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]]) // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman'); // ->sum('pinjaman');
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru; // $rekod_pinjamandiberi;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -1963,8 +1963,10 @@ class GadaiController extends Controller
if($request->tarikh > '2021-04-13'){ if($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],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]]) // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->sum('pinjaman'); ->sum('pinjaman');
} }