Merged in bugfix/update-laporan-stokaudit-tak-aktif (pull request #184)

Fix tag palsu = 1 , stok audit tak aktif
This commit is contained in:
nur amirah zulkipli
2024-06-20 08:59:32 +00:00
+4 -2
View File
@@ -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');