diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index fbefdaf..3b38bac 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2377,7 +2377,7 @@ class AdminPageController extends Controller $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan'); $lelong = Lelong::on($cawangan['mysql']) - ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') + ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki','lelong.t_jual') ->whereIn('lelong.norujukan',$wtdnorujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') ->get(); @@ -2401,10 +2401,10 @@ class AdminPageController extends Controller $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]); + ->whereMonth('t_jual','>=',$mula[0]) + ->whereMonth('t_jual','<=',$hingga[0]) + ->whereYear('t_jual','>=',$mula[1]) + ->whereYear('t_jual','<=',$hingga[1]); $lelongdetails = $lelong->get()->toArray(); $lelongcount = $lelong->count(); @@ -2413,10 +2413,10 @@ class AdminPageController extends Controller $draft = WTDDraft::on('mysql7') ->whereIn('norujukan',$lelongpluck) ->where('kodcaw',$kodcaw) - ->whereMonth('t_lelong','>=',$mula[0]) - ->whereMonth('t_lelong','<=',$hingga[0]) - ->whereYear('t_lelong','>=',$mula[1]) - ->whereYear('t_lelong','<=',$hingga[1]); + ->whereMonth('t_jual','>=',$mula[0]) + ->whereMonth('t_jual','<=',$hingga[0]) + ->whereYear('t_jual','>=',$mula[1]) + ->whereYear('t_jual','<=',$hingga[1]); $draftcount = $draft->count(); $draftpluck = $draft->pluck('norujukan');