diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 66c96781..6d05c7a2 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -416,10 +416,22 @@ 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('Date(igr.CreatedDate) >=', "$fromDate") - ->where('Date(igr.CreatedDate) <=', "$toDate") - ->groupBy('IGRD.IGRNo') - ->orderBy('igr.CreatedDate', 'desc'); + ->groupBy('IGRD.IGRNo'); + if(session()->get('roleText') == 'Auditor'){ + + $builder->where('Date(igr.DeliveryChellanDate) >=', "$fromDate") + ->where('Date(igr.DeliveryChellanDate) <=', "$toDate") + ->orderBy('igr.DeliveryChellanDate', 'desc'); + }else{ + $builder->where('Date(igr.CreatedDate) >=', "$fromDate") + ->where('Date(igr.CreatedDate) <=', "$toDate") + ->orderBy('igr.CreatedDate', 'desc'); + + } + + + + $query = $builder->get(); $result = $query->getResult();