From 8542ca52ffa14a7ce737fe7ac2f0d4f7e89a1f22 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Mon, 25 Jul 2022 23:19:22 +0800 Subject: [PATCH] merge zone2 server --- app/Http/Controllers/CustomerController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 4e38b3d..3a38793 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -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); }