diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index d53238e..e00ed96 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3240,8 +3240,10 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $audit = Gadai::on($cawangan['mysql']) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->where([['tagpalsu','=',1],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->orderBy('t_gadai', 'ASC') ->orderBy('sirig', 'ASC');