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

2022-07-26 22:14:27 +08:00
parent 1abdfe524a 27f8a56fb2
commit 102d75c7ed
3 changed files with 50 additions and 15 deletions
@@ -141,17 +141,21 @@ class CustomerController extends Controller

        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
        
-        if($status == 'belum_tebus' || $status == 'sudah_tebus'){
+	if($status == 'belum_tebus'){
+            $gadai = Gadai::on($cawangan['mysql'])
+            ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
+            ->get();
+        }elseif($status == 'sudah_tebus'){
            $gadai = Gadai::on($cawangan['mysql'])
                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                ->get();
+                ->orderBy('t_update', 'desc')
+                ->take(100)->get();
        }elseif($status == 'lelong'){
            $gadai = Gadai::on($cawangan['mysql'])
                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
                ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
                ->get();
-        }
-        
+        }        
        return response()->json($gadai);
    }