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

fix lelong skit je

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-09-19 16:09:26 +08:00
parent ef7bf342a9 5ac8c01a71
commit decf5c62e7
1 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+17 -42
View File
@@ -171,7 +171,7 @@ class LelongController extends Controller
->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');
@@ -238,57 +238,18 @@ class LelongController extends Controller
$tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($kodcaw == 'KB2')
{
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->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->mula)
->where('t_jual','<=',$request->hingga)
->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('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
// ->where(function($query) use ($tarikhbaru){
// $query->whereNull('trkhtuntut')
// ->orWhere('trkhtuntut','>',$tarikhbaru);
// })
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
//->where(function($query) use ($tarikhbaru)
//{
// $query->whereNull('t_jual')
// ->orWhere('t_jual','>',$tarikhbaru);
//})
->where('baki','<',0)
->sum('baki');
// $rugitotal = $rugilelong + $ansrugi;
$rugitotal = $rugilelong;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -426,6 +387,20 @@ class LelongController extends Controller
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTarikh($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tuntutbaki = TuntutBaki::on($cawangan['mysql'])
->where('tarikh','=', $request->tarikh)
->get();
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTeller($kodcaw,Request $request){
$current = Carbon::now();
@@ -563,10 +538,10 @@ class LelongController extends Controller
$list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray();
$list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray();
$gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
$gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
'taglel' => 0
]);
$gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
$gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
'sttebus' => '',
'taglel' => 0
]);