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

Merge branch 'Laporan#TuntutBaki' into 'master'

Browse Source 
add jenis tuntutan

See merge request online-sistem1/api_arrahn!175
This commit is contained in:
hafifie rahman
2023-02-04 14:20:21 +00:00
parent 6452d7d2fc 0428c448d8
commit eff0ee4078
1 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+44 -15
View File
@@ -3514,21 +3514,50 @@ class AdminPageController extends Controller
}else{ }else{
$sortBy = null; $sortBy = null;
} }
$batchleltuntutbaki = Lelong::on($cawangan['mysql']) if($request->jenistuntut == 'belumtuntut'){
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki') $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan') ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]]) ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
->whereNotNull('gad.upah12') ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
->whereNotNull('lelong.hargajual') ->whereNotNull('gad.upah12')
->whereNull('lelong.trkhtuntut') ->whereNotNull('lelong.hargajual')
->when($sortBy, function ($query) use ($sortBy) { ->whereNull('lelong.trkhtuntut')
return $query->where('baki',$sortBy,'0'); ->when($sortBy, function ($query) use ($sortBy) {
}, function ($query) { return $query->where('baki',$sortBy,'0');
return $query->where('baki','!=','0'); }, function ($query) {
}) return $query->where('baki','!=','0');
->get()->toArray(); })
->get()->toArray();
}else if($request->jenistuntut == 'sudahtuntut'){
$batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
->whereNotNull('gad.upah12')
->whereNotNull('lelong.hargajual')
->whereNotNull('lelong.trkhtuntut')
->when($sortBy, function ($query) use ($sortBy) {
return $query->where('baki',$sortBy,'0');
}, function ($query) {
return $query->where('baki','!=','0');
})
->get()->toArray();
}else{
$batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
->whereNotNull('gad.upah12')
->whereNotNull('lelong.hargajual')
->when($sortBy, function ($query) use ($sortBy) {
return $query->where('baki',$sortBy,'0');
}, function ($query) {
return $query->where('baki','!=','0');
})
->get()->toArray();
}
return response()->json($batchleltuntutbaki); return response()->json($batchleltuntutbaki);
} }
} }