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

bug fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-01-31 11:18:23 +00:00
parent ed22d87e1f
commit 3b8a6af038
6 changed files with 51 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controllers/Inwardgateregister.php
View File

@ -400,9 +400,9 @@ class Inwardgateregister extends BaseController
$IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder'); $IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder');
$DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo'); $DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo');
$DeliveryChellan = (string)$this->request->getPost('InvoiceDate'); $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'); $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'); $VehicleNo = $this->request->getPost('VehicleNo');
$TransporterId = $this->request->getPost('TransporterId'); $TransporterId = $this->request->getPost('TransporterId');
$DriverName = $this->request->getPost('DriverName'); $DriverName = $this->request->getPost('DriverName');
@ -830,6 +830,8 @@ function viewIGRDetails()
} }
log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr)); log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr));
$getigrstatus = $this->inwardgateregister_model->getigrstatus($IGRNo);
$getigrstatus = $getigrstatus->IGRStatus;
$updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo); $updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo);
log_message('error', "Master updated successfully: " . $updateigrmaster); log_message('error', "Master updated successfully: " . $updateigrmaster);
if(!empty($tableData )){ if(!empty($tableData )){
@ -1083,7 +1085,8 @@ function viewIGRDetails()
if ($updateigrmaster > 0 || $updateigrlineitem > 0) { 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')); $result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId'));
$notification = new Notification(); $notification = new Notification();
@ -1091,7 +1094,7 @@ function viewIGRDetails()
for ($i = 0; $i < count($result_for_email['emails']); $i++) { for ($i = 0; $i < count($result_for_email['emails']); $i++) {
$email_response = $notification->sendEmail([ $email_response = $notification->sendEmail([
'recipient_email' => $result_for_email['emails'][$i]->email, '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')), 'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name')),
'company' => $result_for_email['company'], 'company' => $result_for_email['company'],
'from_mail'=> $result_for_email['from_mail'] 'from_mail'=> $result_for_email['from_mail']

12
app/Helpers/Notification.php
View File

@ -40,9 +40,10 @@ class Notification
if (!empty($ccRecipients)) { if (!empty($ccRecipients)) {
$this->email->setCC($ccRecipients); $this->email->setCC($ccRecipients);
} }
} else { }
$this->email->setCC('vadivel.j@venbainfotech.com'); // else {
} // $this->email->setCC('vadivel.j@venbainfotech.com');
// }
if ($bcc !== '') { if ($bcc !== '') {
$bccRecipients = explode(',', trim($bcc)); $bccRecipients = explode(',', trim($bcc));
@ -50,9 +51,10 @@ class Notification
if(!empty($bccRecipients)) { if(!empty($bccRecipients)) {
$this->email->setBCC($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()) { if ($this->email->send()) {
$message['success'] = 'Email sent successfully'; $message['success'] = 'Email sent successfully';

6
app/Helpers/datetime_helper.php
View File

@ -32,10 +32,10 @@ if (!function_exists('get_date_time_format')) {
} }
} }
if (!function_exists('get_date_time_format_new')) { if (!function_exists('get_date_time_dynamical_format')) {
function get_date_time_format_new($val) 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'); return $date->format('Y-m-d H:i:s');
} }
} }

10
app/Models/Inwardgateregister_model.php
View File

@ -1233,5 +1233,15 @@ class Inwardgateregister_model extends Model
return $result; return $result;
} }
public function getigrstatus($IGRNo){
$builder = $this->db->table('t_igr_master')
->select('IGRStatus')
->where('IGRNO',$IGRNo)
->get();
$result = $builder->getRow();
return $result;
}
} }

54
app/Views/inwardgateregister.php
View File

@ -14,30 +14,6 @@
outline: 1px solid slategrey; outline: 1px solid slategrey;
} }
</style> </style>
<script>
$(document).ready(function() {
// $("#InvoiceDate").datepicker({
// maxDate: 'now',
// dateFormat: 'dd-mm-yy',
// changeMonth: true,
// changeYear: true,
// yearRange: '-100:+0'
// });
// $("#MaterialRcvdDate").datepicker({
// maxDate: 'now',
// dateFormat: 'dd-mm-yy',
// changeMonth: true,
// changeYear: true,
// yearRange: '-100:+0'
// }).datepicker("setDate", new Date());
});
//jquery for vechicle masking
// $(document).ready(function(){
// Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
// });
</script>
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
<!-- Start Content--> <!-- Start Content-->
@ -115,21 +91,7 @@
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="col-form-label">Invoice Date<span class="text-danger">*</span></label> <label class="col-form-label">Invoice Date<span class="text-danger">*</span></label>
<div class="input-group"> <input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
<input class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
<!-- <input type="text" class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off"> -->
<!-- <div class="input-group-append">
<span class="input-group-text">
<i class="ri-calendar-event-fill"></i>
</span>
</div> -->
</div><!-- input-group -->
<!-- <input type="date" class="form-control" id="invoiceDate" name="invoice_date" value="<?= isset($invoice_details['invoice_date']) ? $invoice_details['invoice_date'] : '' ?>" max="<?= date('d/m/Y'); ?>" required> -->
<?php
// $data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'InvoiceDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off');
// echo form_input($data);
?>
</div> </div>
@ -137,19 +99,7 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="col-form-label">Material Received Date<span class="text-danger">*</span></label> <label class="col-form-label">Material Received Date<span class="text-danger">*</span></label>
<div class="input-group"> <input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
<input class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
<!-- <input type="text" class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
<div class="input-group-append">
<span class="input-group-text">
<i class="ri-calendar-event-fill"></i>
</span>
</div> -->
</div>
<?php
// $data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off');
// echo form_input($data);
?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">

44
app/Views/viewinwardgateregister.php
View File

@ -1,3 +1,7 @@
<!-- Flatpickr CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
<!-- Flatpickr JS -->
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
<style> <style>
@ -97,14 +101,14 @@
var mindt = year - 70; var mindt = year - 70;
var maxdt = year - 15; var maxdt = year - 15;
$("#Invoice_Date , #MaterialRcvdDate").datepicker({ // $("#Invoice_Date , #MaterialRcvdDate").datepicker({
minDate: new Date(year - SIAStartYear, 1, 1), // minDate: new Date(year - SIAStartYear, 1, 1),
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
}); });
</script> </script>
<style> <style>
@ -382,19 +386,13 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label class="col-form-label">Invoice Date <span class="text-danger">*</span></label> <label class="col-form-label">Invoice Date <span class="text-danger">*</span></label>
<?php <input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" required autocomplete="off">
$data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'Invoice_Date', 'class' => 'form-control', 'required=>"true"');
echo form_input($data);
?>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label class="col-form-label">Material Received Date <span class="text-danger">*</span></label> <label class="col-form-label">Material Received Date <span class="text-danger">*</span></label>
<?php <input type="date" class="form-control" id="MaterialRcvdDate" name="MaterialRcvdDate" required autocomplete="off">
$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control');
echo form_input($data);
?>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -795,7 +793,7 @@
// alert(igrstatus); // alert(igrstatus);
var buttonContainer = $(".buttonContainer"); var buttonContainer = $(".buttonContainer");
var modal = $(this); // Reference to the modal itself var modal = $(this); // Reference to the modal itself
var invoiceDateInput = modal.find('#Invoice_Date'); var invoiceDateInput = modal.find('#InvoiceDate');
var invoiceNoInput = modal.find('#Invoice_No'); var invoiceNoInput = modal.find('#Invoice_No');
var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate'); var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate');
var VehicleNoInput = modal.find('#Vehicle_No'); var VehicleNoInput = modal.find('#Vehicle_No');
@ -848,6 +846,8 @@
var parsedData = JSON.parse(data); var parsedData = JSON.parse(data);
console.log(parsedData); console.log(parsedData);
flatpickr("#InvoiceDate", { dateFormat: "d-m-Y",});
flatpickr("#MaterialRcvdDate", { dateFormat: "d-m-Y",});
if (parsedData['details'].length === 0) { if (parsedData['details'].length === 0) {
console.log("No data available"); console.log("No data available");
// Reset all relevant fields and table // Reset all relevant fields and table
@ -866,7 +866,7 @@
$("#Supplier").val(''); $("#Supplier").val('');
$("#Add1").val(''); $("#Add1").val('');
$("#Invoice_No").val(''); $("#Invoice_No").val('');
$("#Invoice_Date").val(''); $("#InvoiceDate").val('');
$("#MaterialRcvdDate").val(''); $("#MaterialRcvdDate").val('');
$("#ser").val(''); $("#ser").val('');
$("#tbleIGRAppend").empty(); // Clear the table $("#tbleIGRAppend").empty(); // Clear the table
@ -923,7 +923,7 @@
// Format dates // Format dates
var dcd = new Date(item.DeliveryChellanDate); var dcd = new Date(item.DeliveryChellanDate);
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear()); var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
$("#Invoice_Date").val(dcd2); $("#InvoiceDate").val(dcd2);
console.log(item.MaterialRcvdDate) console.log(item.MaterialRcvdDate)
var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1); var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1);
$("#MaterialRcvdDate").val(Mat_rcv_date); $("#MaterialRcvdDate").val(Mat_rcv_date);
@ -1099,7 +1099,7 @@
// $('#content').loader('show'); // $('#content').loader('show');
var igrno = $("#IGRNO1").val(); var igrno = $("#IGRNO1").val();
var materialrcv_date = $("#MaterialRcvdDate").val(); var materialrcv_date = $("#MaterialRcvdDate").val();
var inv_date = $("#Invoice_Date").val(); var inv_date = $("#InvoiceDate").val();
$.ajax({ $.ajax({
data: { data: {
@ -1146,7 +1146,7 @@
formData.append('po', pono); formData.append('po', pono);
formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('mrc', $("#MaterialRcvdDate").val());
formData.append('invno', $("#Invoice_No").val()); formData.append('invno', $("#Invoice_No").val());
formData.append('invdate', $("#Invoice_Date").val()); formData.append('invdate', $("#InvoiceDate").val());
formData.append('vehicle_no', $('#Vehicle_No').val()); formData.append('vehicle_no', $('#Vehicle_No').val());
formData.append('Transporter_Id', $('#Transporter_Id').val()); formData.append('Transporter_Id', $('#Transporter_Id').val());
formData.append('driver', $('#Driver_Name').val()); formData.append('driver', $('#Driver_Name').val());
@ -1206,7 +1206,7 @@
formData.append('po', pono); formData.append('po', pono);
formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('mrc', $("#MaterialRcvdDate").val());
formData.append('invno', $("#Invoice_No").val()); formData.append('invno', $("#Invoice_No").val());
formData.append('invdate', $("#Invoice_Date").val()); formData.append('invdate', $("#InvoiceDate").val());
formData.append('vehicle_no', $('#Vehicle_No').val()); formData.append('vehicle_no', $('#Vehicle_No').val());
formData.append('Transporter_Id', $('#Transporter_Id').val()); formData.append('Transporter_Id', $('#Transporter_Id').val());
formData.append('driver', $('#Driver_Name').val()); formData.append('driver', $('#Driver_Name').val());