Merge branch 'adminapi' of https://gitlab.com/online-sistem1/api_arrahn into adminapi

This commit is contained in:
hafifierahman
2022-02-28 10:22:33 +08:00
+18 -8
View File
@@ -1699,21 +1699,31 @@ class AdminPageController extends Controller
$gadai_all = []; $gadai_all = [];
foreach($cawangan_all as $index=>$cawangan){ foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){ if($status == 'belum_tebus' || $status == 'sudah_tebus'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) if($status == 'sudah_tebus')
->get(); {
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
}
if(sizeof($gadai) != 0){ if(sizeof($gadai) != 0){
array_push($gadai_all,$gadai); $gadai_all += $gadai;
$gadai_all[] = $gadai;
} }
}elseif($status == 'lelong'){ }elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql']) $gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get(); ->get()->toArray();
if(sizeof($gadai) != 0){ if(sizeof($gadai) != 0){
// array_merge($gadai_all,$gadai); $gadai_all += $gadai;
$gadai_all[] = $gadai;
} }
} }
} }