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

biasa la

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+13 -1
View File
@@ -1967,12 +1967,24 @@ 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');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
if($request->tarikh <= '2021-02-25')
{
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) ->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman'); ->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]; $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
return response()->json($array_rekodemas); return response()->json($array_rekodemas);
app/Http/Controllers/LelongController.php
+24 -8
View File
@@ -148,14 +148,30 @@ class LelongController extends Controller
$rugilelonglama = imbangdugalama::on($cawangan['mysql']) $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('rugi_lelong'); ->sum('rugi_lelong');
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh) if($request->tarikh <= '2021-02-25')
->where(function($query) use ($tarikhbaru){ {
$query->whereNull('trkhtuntut') $bakilelong = Lelong::on($cawangan['mysql'])
->orWhere('trkhtuntut','>',$tarikhbaru); ->where('t_jual','<=',$request->tarikh)
}) ->where(function($query) use ($tarikhbaru){
->where('baki','>=',0) $query->whereNull('trkhtuntut')
->sum('baki'); ->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql']) $ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran'); ->sum('bayaran');