From 3b8a6af038e61dd87801fb39ee470dc6a6c9a741 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 31 Jan 2025 11:18:23 +0000 Subject: [PATCH] bug fixes : ps --- app/Controllers/Inwardgateregister.php | 11 +++-- app/Helpers/Notification.php | 12 +++--- app/Helpers/datetime_helper.php | 6 +-- app/Models/Inwardgateregister_model.php | 10 +++++ app/Views/inwardgateregister.php | 54 +------------------------ app/Views/viewinwardgateregister.php | 44 ++++++++++---------- 6 files changed, 51 insertions(+), 86 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 7521095c..92d6a4ff 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -400,9 +400,9 @@ class Inwardgateregister extends BaseController $IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder'); $DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo'); $DeliveryChellan = (string)$this->request->getPost('InvoiceDate'); - $DeliveryChellanDate = get_date_time_format_new($DeliveryChellan); + $DeliveryChellanDate = get_date_time_dynamical_format('d-m-Y',$DeliveryChellan); $Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate'); - $MaterialRcvdDt = get_date_time_format_new($Mat_Rcvd_Dt); + $MaterialRcvdDt = get_date_time_dynamical_format('d-m-Y',$Mat_Rcvd_Dt); $VehicleNo = $this->request->getPost('VehicleNo'); $TransporterId = $this->request->getPost('TransporterId'); $DriverName = $this->request->getPost('DriverName'); @@ -830,6 +830,8 @@ function viewIGRDetails() } log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr)); + $getigrstatus = $this->inwardgateregister_model->getigrstatus($IGRNo); + $getigrstatus = $getigrstatus->IGRStatus; $updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo); log_message('error', "Master updated successfully: " . $updateigrmaster); if(!empty($tableData )){ @@ -1083,7 +1085,8 @@ function viewIGRDetails() if ($updateigrmaster > 0 || $updateigrlineitem > 0) { - if ($IGRStatus == IGR_CREATED || $IGRStatus == MRIR_CREATED || $IGRStatus == MRIR_APPROVED ) { + + if ($getigrstatus == 'ST027') { $result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId')); $notification = new Notification(); @@ -1091,7 +1094,7 @@ function viewIGRDetails() for ($i = 0; $i < count($result_for_email['emails']); $i++) { $email_response = $notification->sendEmail([ 'recipient_email' => $result_for_email['emails'][$i]->email, - 'subject' => 'Resico Industries - IGR Notification', + 'subject' => $result_for_email['company'].' - IGR Notification', 'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name')), 'company' => $result_for_email['company'], 'from_mail'=> $result_for_email['from_mail'] diff --git a/app/Helpers/Notification.php b/app/Helpers/Notification.php index 337ea132..accbacf8 100755 --- a/app/Helpers/Notification.php +++ b/app/Helpers/Notification.php @@ -40,9 +40,10 @@ class Notification if (!empty($ccRecipients)) { $this->email->setCC($ccRecipients); } - } else { - $this->email->setCC('vadivel.j@venbainfotech.com'); - } + } + // else { + // $this->email->setCC('vadivel.j@venbainfotech.com'); + // } if ($bcc !== '') { $bccRecipients = explode(',', trim($bcc)); @@ -50,9 +51,10 @@ class Notification if(!empty($bccRecipients)) { $this->email->setBCC($bccRecipients); } - }else{ - $this->email->setCC('gowtham.m@venbainfotech.com'); } + // else{ + // $this->email->setCC('gowtham.m@venbainfotech.com'); + // } if ($this->email->send()) { $message['success'] = 'Email sent successfully'; diff --git a/app/Helpers/datetime_helper.php b/app/Helpers/datetime_helper.php index 6b5e8772..e3638ecb 100755 --- a/app/Helpers/datetime_helper.php +++ b/app/Helpers/datetime_helper.php @@ -32,10 +32,10 @@ if (!function_exists('get_date_time_format')) { } } -if (!function_exists('get_date_time_format_new')) { - function get_date_time_format_new($val) +if (!function_exists('get_date_time_dynamical_format')) { + function get_date_time_dynamical_format($format,$val) { - $date = \DateTime::createFromFormat('d/m/Y', $val, new \DateTimeZone('Asia/Kolkata')); + $date = \DateTime::createFromFormat($format, $val, new \DateTimeZone('Asia/Kolkata')); return $date->format('Y-m-d H:i:s'); } } diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index f77a16d4..3aecbed2 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -1233,5 +1233,15 @@ class Inwardgateregister_model extends Model return $result; } + public function getigrstatus($IGRNo){ + + $builder = $this->db->table('t_igr_master') + ->select('IGRStatus') + ->where('IGRNO',$IGRNo) + ->get(); + $result = $builder->getRow(); + return $result; + } + } \ No newline at end of file diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 5074c371..198d405b 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -14,30 +14,6 @@ outline: 1px solid slategrey; } -
@@ -115,21 +91,7 @@
-
- - - -
- - - 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'InvoiceDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off'); - // echo form_input($data); - ?> +
@@ -137,19 +99,7 @@
-
- - -
- 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off'); - // echo form_input($data); - ?> +
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index f0ee9cb2..51ecd954 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -1,3 +1,7 @@ + + + +