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

fix wcy dan kb2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-07 16:52:04 +08:00
parent c9fe61ebbb
commit 0ab4c4966a
4 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+14 -5
View File
@@ -2168,6 +2168,17 @@ class GadaiController extends Controller
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$tarikhtawarruq = '';
switch ($kodcaw) {
case 'KB2':
$tarikhtawarruq = '2021-04-13';
break;
case 'WCY':
$tarikhtawarruq = '2021-05-04';
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
@@ -2176,10 +2187,8 @@ class GadaiController extends Controller
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
// ->where([['hargajualan','=','NULL'],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','=','NULL']])
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman');
// $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2203,7 +2212,7 @@ class GadaiController extends Controller
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->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],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->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']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])