diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index ccc68c16..5302d616 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -125,11 +125,7 @@ class TrpProductionModel extends Model tpwd.edWaste, tpwd.coolerBags, tpwd.edPlus20Waste, - tpwd.cycloneWaste, - - - -' + tpwd.cycloneWaste' ); @@ -165,8 +161,7 @@ class TrpProductionModel extends Model ->join('ip_invoices inv', 'inv.client_id = clients.client_id') ->join('ip_invoice_items invItems', 'inv.invoice_id = invItems.invoice_id') ->whereIn('invItems.item_product_id', [81, 93]) - ->where('invItems.item_date_added >=', $startDate) - ->where('invItems.item_date_added <=', $endDate) + ->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering ->get() ->getResultArray(); @@ -199,8 +194,7 @@ class TrpProductionModel extends Model ->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left') ->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left') ->whereIn('invItems.item_product_id', [81, 93]) - ->where('invItems.item_date_added >=', $startDate) - ->where('invItems.item_date_added <=', $endDate) + ->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering ->groupBy('invItems.item_date_added') ->getCompiledSelect(false); // Convert Query Builder to raw SQL; @@ -223,10 +217,8 @@ class TrpProductionModel extends Model ->join('t_igr_master tigm', 'tigm.IGRNo = tigrd.IGRNo', 'left') ->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left') ->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left') - ->whereIn('tigrd.MaterialCode', $materialCodes) - ->where('tigrd.CreatedDate >=', $startDate) - ->where('tigrd.CreatedDate <=', $endDate) - ->groupBy('DATE(tigrd.CreatedDate)') + ->whereIn('tigrd.MaterialCode', $materialCodes) + ->where("DATE(tigrd.CreatedDate) BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering ->get() ->getResultArray(); @@ -260,8 +252,7 @@ class TrpProductionModel extends Model ->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left') ->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left') ->whereIn('tigrd.MaterialCode', $materialCodes) - ->where('tigrd.CreatedDate >=', $startDate) - ->where('tigrd.CreatedDate <=', $endDate) + ->where("DATE(tigrd.CreatedDate) BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering ->groupBy('DATE(tigm.CreatedDate)') ->getCompiledSelect(false); // Convert Query Builder to raw SQL