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

Merge branch 'apiaku' into 'master'

Browse Source 
fix gadai imbangduga

See merge request online-sistem1/api_arrahn!81
This commit is contained in:
hafifie rahman
2021-04-16 09:06:48 +00:00
parent 01c0348e00 8855d0da7e
commit f014b44974
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+1 -6
View File
@@ -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;