RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-02-05 13:22:56 +00:00
commit 913a7ddb59
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/Inwardgateregister_model.php
View File

@ -416,11 +416,23 @@ class Inwardgateregister_model extends Model
->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left') ->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left')
->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo')
->where('igr.IGRStatus !=', MRIR_CREATED) ->where('igr.IGRStatus !=', MRIR_CREATED)
->where('Date(igr.CreatedDate) >=', "$fromDate") ->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") ->where('Date(igr.CreatedDate) <=', "$toDate")
->groupBy('IGRD.IGRNo')
->orderBy('igr.CreatedDate', 'desc'); ->orderBy('igr.CreatedDate', 'desc');
}
$query = $builder->get(); $query = $builder->get();
$result = $query->getResult(); $result = $query->getResult();