From 71fdcd85120b020fb49c31f736da42b6324d46f4 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 29 Oct 2024 09:48:06 +0530 Subject: [PATCH] changes in listing order in igr listing, purchase order listing -j vadivel --- app/Models/Inwardgateregister_model.php | 10 +++++----- app/Models/Purchaseorder_model.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 03cc1bde..ee992195 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -378,12 +378,12 @@ class Inwardgateregister_model extends Model ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') ->where('igr.IGRStatus !=', MRIR_CREATED) - ->where('igr.CreatedDate >=',"$fromDate") - ->where('igr.CreatedDate <=', "$toDate") + ->where('Date(igr.CreatedDate) >=',"$fromDate") + ->where('Date(igr.CreatedDate) <=', "$toDate") ->groupBy('igr.IGRNo') - ->orderBy('igr.CreatedDate', 'desc'); - $query = $builder->get(); - $result = $query->getResult(); + ->orderBy('igr.CreatedDate', 'desc'); + $query = $builder->get(); + $result = $query->getResult(); $builder2 = $this->db->table('t_igr_details igr_details') ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName,item.MaterialName, igr_details.QuantityAsPerInvoice as ReceivedQuantity , igr_details.NetWeight as NetWeight') diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index cea45580..5f33aeca 100755 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -403,8 +403,8 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, // $builder->orderBy('POMast.Status !=',PO_AMENDED); } - $builder->where('POMast.CreatedDate >=', $fromDate) - ->where('POMast.CreatedDate <=', $toDate); + $builder->where('Date(POMast.CreatedDate) >=', $fromDate) + ->where('Date(POMast.CreatedDate) <=', $toDate); $builder->orderBy('POMast.CreatedDate', 'desc');