merge zone2 server

2022-07-25 23:19:22 +08:00
parent a73d2938c6
commit 8542ca52ff
1 changed files with 8 additions and 4 deletions
@@ -138,17 +138,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(50)->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);
    }