From f8ce413fa0fec87f55f003743dec85c4a07cf1f4 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 3 Apr 2025 10:04:06 +0000 Subject: [PATCH] labstaff --- app/Controllers/Inwardgateregister.php | 8 ++-- app/Controllers/User.php | 2 +- app/Views/alterpurchaseorder.php | 4 +- app/Views/driverListing.php | 3 +- app/Views/employeeListing.php | 7 ++-- app/Views/expense_list.php | 18 +++++++-- app/Views/includes/new_header.php | 10 +++-- app/Views/viewinwardgateregister.php | 55 +++++++++++++++++++------- 8 files changed, 74 insertions(+), 33 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 83d65b46..879ccbc7 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -995,9 +995,9 @@ function viewIGRDetails() $to_email_addr = ""; for ($i = 0; $i < count($result_for_email['to_mails']); $i++) { - // $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , "; + $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , "; } - $to_email_addr .= "sanjeev.p@venbainfotech.com,gowtham.m@venbainfotech.com"; + // $to_email_addr .= "sanjeev.p@venbainfotech.com,gowtham.m@venbainfotech.com"; $to_email_addr = rtrim($to_email_addr, " ,"); $email_response = $notification->sendEmail([ 'recipient_email' => $to_email_addr, @@ -1438,9 +1438,9 @@ function updateIGRWeight(){ $to_email_addr = ''; for ($i = 0; $i < count($result_for_email['to_mails']); $i++) { - // $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , "; + $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , "; } - $to_email_addr = " venbalap08@gmail.com , sanjeev.p@venbainfotech.com"; + // $to_email_addr = " venbalap08@gmail.com , sanjeev.p@venbainfotech.com"; $to_email_addr = rtrim($to_email_addr, " ,"); $content = 'A new remark was created by '.$result_for_email['full_name'].' against IGR no '.$IGRNo.',

"'.$remark.'"'; diff --git a/app/Controllers/User.php b/app/Controllers/User.php index 2cc02934..66466711 100755 --- a/app/Controllers/User.php +++ b/app/Controllers/User.php @@ -1020,7 +1020,7 @@ class User extends BaseController // Validation passed $EmpID = $this->request->getPost('EmpList'); - $roleId = '2'; + $roleId = !empty($this->request->getPost('role')) ? $this->request->getPost('role') : '2' ; $password = (string)$this->request->getPost('password'); $Createddt = date('Y-m-d H:i:s'); $email = $this->request->getPost('MailID'); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index b656caef..fc1ba2d2 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1975,12 +1975,12 @@ if (!empty($INRSYMBOL)) { } if (isChecked) { - if (PO == 'REVENUE') { + if (POTy == 'REVENUE') { //alert('normalemergency'); $('#txtSpecial').val(0); // $('#content').loader('show'); RevenueSave(1) - } else if (PO == 'SERVICE') { + } else if (POTy == 'SERVICE') { ///alert('normal SERVICE emergency'); $('#txtSpecialservice').val(0); Save(1) diff --git a/app/Views/driverListing.php b/app/Views/driverListing.php index 157abc92..8de90ef8 100755 --- a/app/Views/driverListing.php +++ b/app/Views/driverListing.php @@ -55,7 +55,7 @@ is_driver){ ?>     - +     @@ -122,6 +122,7 @@