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/LelongController.php
+27 -15
View File
@@ -142,33 +142,45 @@ class LelongController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$bakilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('baki_lelong');
// $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
// ->sum('baki_lelong');
$rugilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('rugi_lelong');
// $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
// ->sum('rugi_lelong');
if($request->tarikh <= '2021-02-25')
if($kodcaw == 'KB2')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->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');
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}
}