diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a22daef..45b1353 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2299,15 +2299,20 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - // $gadai = Gadai::on($cawangan['mysql']) - // ->where([['sttebus','=',$gadai_status],['nokp','=',$ic],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) - // ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') - // ->get(); - $lelong = Lelong::on($cawangan['mysql']) - ->where([['baki','>',0],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) - ->get(); + + $mula = explode('-', $request->mula); + $hingga = explode('-', $request->hingga); - return response()->json($lelong,200); + + $lelong = Lelong::on($cawangan['mysql']) + ->where([['baki','>',0],['trkhtuntut',null]]) + ->whereMonth('t_lelong','>=',$mula[0]) + ->whereMonth('t_lelong','<=',$hingga[0]) + ->whereYear('t_lelong','>=',$mula[1]) + ->whereYear('t_lelong','<=',$hingga[1]) + ->get()->toArray(); + + return response()->json($lelong,200); } public function InsertDraftWTD(Request $request){