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

FIX_IGR issues and PO alignment

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-08-06 05:21:19 +00:00
parent 84cf062161
commit 7bf4e6488c
16 changed files with 30733 additions and 32580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/Controllers/Inwardgateregister.php
View File

@ -335,24 +335,19 @@ class Inwardgateregister extends BaseController
#Step 2 Master File and Its Details Gathering #Step 2 Master File and Its Details Gathering
$MasterFile = $this->request->getFile('MasterFile'); $MasterFile = $this->request->getFile('MasterFile');
$requestMasterFileName = NULL;
if (!empty($MasterFile)) {
$requestMasterFileName = $MasterFile->getName(); $requestMasterFileName = $MasterFile->getName();
if (!empty($requestMasterFileName)) {
if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) { if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) { if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
log_message('error', 'File already exists in the database'.$requestMasterFileName); log_message('error', 'File already exists in the database'.$requestMasterFileName);
$requestMasterFileName = NULL;
} }
else{ else{
$MasterFile->move($path, $requestMasterFileName); $MasterFile->move($path, $requestMasterFileName);
$fileupdated_count++; $fileupdated_count++;
$fileupdated_name[] = $requestMasterFileName; $fileupdated_name[] = $requestMasterFileName;
} }
}else{
$requestMasterFileName = NULL;
} }
}else{
$requestMasterFileName = NULL;
} }
#Step 3 Master Details Gathering to Save In DB #Step 3 Master Details Gathering to Save In DB
@ -595,10 +590,11 @@ function viewIGRDetails()
$IGRNo = $this->request->getPost('igr'); $IGRNo = $this->request->getPost('igr');
$DeliveryChellan = $this->request->getPost('invdate'); $DeliveryChellan = $this->request->getPost('invdate');
$DeliveryChellanDate = get_date_time_format($DeliveryChellan); $DeliveryChellanDate = !$DeliveryChellan || $DeliveryChellan === null ? NULL : get_date_time_format($DeliveryChellan);
$Mat_Rcvd_Dt = $this->request->getPost('mrc'); $Mat_Rcvd_Dt = $this->request->getPost('mrc');
$MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt); $MaterialRcvdDt = !$Mat_Rcvd_Dt || $Mat_Rcvd_Dt === null ? NULL : get_date_time_format($Mat_Rcvd_Dt);
$VehicleNo = $this->request->getPost('vehicle_no'); $VehicleNo = $this->request->getPost('vehicle_no');
$DriverName = $this->request->getPost('driver'); $DriverName = $this->request->getPost('driver');
@ -618,9 +614,9 @@ function viewIGRDetails()
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby);
$MasterFile = $this->request->getfile('MasterFile'); $MasterFile = $this->request->getfile('MasterFile');
$requestMasterFileName = $MasterFile->getName();
if (!empty($requestMasterFileName)) { if ($MasterFile) {
$requestMasterFileName = $MasterFile->getName();
if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) { if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) { if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
log_message('error', 'File already exists in the database'.$requestMasterFileName); log_message('error', 'File already exists in the database'.$requestMasterFileName);
@ -700,8 +696,8 @@ function viewIGRDetails()
$tareWeightDate = $row['TareWeightDate']; $tareWeightDate = $row['TareWeightDate'];
$netWeight = $row['NetWeight']; $netWeight = $row['NetWeight'];
$igrItemNo = $row['IGRItemNo']; $igrItemNo = $row['IGRItemNo'];
$GrossWtDt = get_date_time_format($grossWeightDate); $GrossWtDt = !empty($grossWeightDate) && strtolower($grossWeightDate) !== 'null' ? get_date_time_format($grossWeightDate) : NULL;
$TareWtDt = get_date_time_format($tareWeightDate); $TareWtDt = !empty($tareWeightDate) && strtolower($tareWeightDate) !== 'null' ? get_date_time_format($tareWeightDate) : NULL;
$igrline = array( $igrline = array(
'QuantityAsPerInvoice' => $quantityAsPerInvoice, 'QuantityAsPerInvoice' => $quantityAsPerInvoice,
@ -901,9 +897,11 @@ function viewIGRDetails()
$requestdata = $this->request->getPost('data'); $requestdata = $this->request->getPost('data');
$updateby = $this->session->get('userId'); $updateby = $this->session->get('userId');
$GrossWeightDate = (string)$this->request->getPost('GrossWeightDate'); $GrossWeightDate = (string)$this->request->getPost('GrossWeightDate');
$GrossWtDt = get_date_time_format($GrossWeightDate); $GrossWtDt = !empty($GrossWeightDate) ? get_date_time_format($GrossWeightDate) : NULL;
$TareWeightDate = (string)$this->request->getPost('TareWeightDate'); $TareWeightDate = (string)$this->request->getPost('TareWeightDate');
$TareWtDt = get_date_time_format($TareWeightDate); $TareWtDt = !empty($TareWeightDate) ? get_date_time_format($TareWeightDate) : NULL;
// Check if request data is not null and is a string // Check if request data is not null and is a string
@ -1168,7 +1166,10 @@ function updateIGRWeight(){
$IGRItemNo = $this->request->getPost('IGRlineitem'); $IGRItemNo = $this->request->getPost('IGRlineitem');
$updateby = $this->session->get('userId'); $updateby = $this->session->get('userId');
$WeightFile = $this->request->getfile('WeightFile'); $WeightFile = $this->request->getfile('WeightFile');
$requestWeightFileName = $WeightFile->getName(); $GrossWtDt = !empty($GrossWeightDate) ? get_date_time_format($GrossWeightDate) : null;
$TareWtDt = !empty($TareWeightDate) ? get_date_time_format($TareWeightDate) : null;
$path = ROOTPATH.'public/uploads/Igrfiles/'; $path = ROOTPATH.'public/uploads/Igrfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
@ -1230,7 +1231,7 @@ function updateIGRWeight(){
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} }
} }
if($GrossWeightDate){ if($GrossWtDt){
$grossdate = $this->inwardgateregister_model->get_igr_history('GrossWeightDate',$IGRNO, $IGRItemNo); $grossdate = $this->inwardgateregister_model->get_igr_history('GrossWeightDate',$IGRNO, $IGRItemNo);
if(!empty($grossdate)){ if(!empty($grossdate)){
$old_data = NULL; $old_data = NULL;
@ -1239,17 +1240,17 @@ function updateIGRWeight(){
$old_data = $row->new_data; $old_data = $row->new_data;
} }
} }
$igr_history = array('field' => 'GrossWeightDate','new_data' => $GrossWeightDate,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo); $igr_history = array('field' => 'GrossWeightDate','new_data' => $GrossWtDt,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ; ($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ;
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} else{ } else{
$igr_history = array('field' => 'GrossWeightDate','is_edit' => 1,'new_data' => $GrossWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo); $igr_history = array('field' => 'GrossWeightDate','is_edit' => 1,'new_data' => $GrossWtDt,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} }
} }
if($TareWeightDate){ if($TareWtDt){
$taredate = $this->inwardgateregister_model->get_igr_history('TareWeightDate',$IGRNO, $IGRItemNo); $taredate = $this->inwardgateregister_model->get_igr_history('TareWeightDate',$IGRNO, $IGRItemNo);
if(!empty($taredate)){ if(!empty($taredate)){
@ -1259,12 +1260,12 @@ function updateIGRWeight(){
$old_data = $row->new_data; $old_data = $row->new_data;
} }
} }
$igr_history = array('field' => 'TareWeightDate','new_data' => $TareWeightDate,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo); $igr_history = array('field' => 'TareWeightDate','new_data' => $TareWtDt,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ; ($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ;
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} else{ } else{
$igr_history = array('field' => 'TareWeightDate','is_edit' => 1,'new_data' => $TareWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo); $igr_history = array('field' => 'TareWeightDate','is_edit' => 1,'new_data' => $TareWtDt,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} }
@ -1272,8 +1273,9 @@ function updateIGRWeight(){
$IGRItemNo = $this->request->getPost('IGRlineitem'); $IGRItemNo = $this->request->getPost('IGRlineitem');
$igr_lineitem = array('GrossWeight' => $GrossWeight,'GrossWeightDate' => $GrossWeightDate,'TareWeightDate' => $TareWeightDate,'TareWeight' => $TareWeight,'NetWeight' => $NetWeight,'UpdateBY' => $updateby); $igr_lineitem = array('GrossWeight' => $GrossWeight,'GrossWeightDate' => $GrossWtDt,'TareWeightDate' => $TareWtDt,'TareWeight' => $TareWeight,'NetWeight' => $NetWeight,'UpdateBY' => $updateby);
$requestWeightFileName =null ;
if($WeightFile){
if (!empty($requestWeightFileName)) { if (!empty($requestWeightFileName)) {
if ($WeightFile && $WeightFile->isValid() && !$WeightFile->hasMoved()) { if ($WeightFile && $WeightFile->isValid() && !$WeightFile->hasMoved()) {
if (!empty($this->inwardgateregister_model->isFileExistsInIGRdetails($requestWeightFileName))) { if (!empty($this->inwardgateregister_model->isFileExistsInIGRdetails($requestWeightFileName))) {
@ -1285,6 +1287,8 @@ function updateIGRWeight(){
} }
} }
} }
}
$update = $this->inwardgateregister_model->updateIGRLineItem($igr_lineitem, $IGRItemNo); $update = $this->inwardgateregister_model->updateIGRLineItem($igr_lineitem, $IGRItemNo);
if ($update) { if ($update) {

33
app/Controllers/Purchaseorder.php
View File

@ -1102,10 +1102,10 @@ $mpdf->use_kwt = true;
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) { if (!empty($file)) {
if ($file->isValid() && !$file->hasMoved()) { if ($file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
@ -1284,9 +1284,11 @@ $mpdf->use_kwt = true;
$POList['ReleasedBy'] = $this->session->get('userId'); $POList['ReleasedBy'] = $this->session->get('userId');
} }
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) { if (!empty($file)) {
if ($file && $file->isValid() && !$file->hasMoved()) { if ($file && $file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
@ -1905,10 +1907,11 @@ $mpdf->use_kwt = true;
$lastPONO = $this->purchaseorder_model->lastPONO(); $lastPONO = $this->purchaseorder_model->lastPONO();
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) { if (!empty($file)) {
if ($file->isValid() && !$file->hasMoved()) { if ($file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
@ -2131,9 +2134,11 @@ $mpdf->use_kwt = true;
$POList['ReleasedBy'] = $this->session->get('userId'); $POList['ReleasedBy'] = $this->session->get('userId');
} }
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) {
if (!empty($file)) {
if ($file && $file->isValid() && !$file->hasMoved()) { if ($file && $file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
@ -2564,10 +2569,11 @@ try{
$lastPONO = $this->purchaseorder_model->lastPONO(); $lastPONO = $this->purchaseorder_model->lastPONO();
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) { if (!empty($file)) {
if ($file->isValid() && !$file->hasMoved()) { if ($file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
@ -2851,9 +2857,10 @@ try{
$POList['ReleasedBy'] = $this->session->get('userId'); $POList['ReleasedBy'] = $this->session->get('userId');
} }
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = NULL;
if (!empty($requestfilename)) { if (!empty($file)) {
if ($file && $file->isValid() && !$file->hasMoved()) { if ($file && $file->isValid() && !$file->hasMoved()) {
$requestfilename = $file->getName();
$path = ROOTPATH.'public/uploads/POfiles/'; $path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); } if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {

32
app/Views/EditservicePurchaseorder.php
View File

@ -145,7 +145,6 @@ if (!empty($getlogpodtl)) {
var minDate = $(this).datepicker("getDate"); var minDate = $(this).datepicker("getDate");
var maxDate = new Date(minDate.getFullYear() + 1, minDate.getMonth(), minDate.getDate()); var maxDate = new Date(minDate.getFullYear() + 1, minDate.getMonth(), minDate.getDate());
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
tinymce.init({ tinymce.init({
@ -381,7 +380,10 @@ if (!empty($getlogpodtl)) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : d, materialcode: id }, data: {
supplierid: d,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -422,7 +424,10 @@ if (!empty($getlogpodtl)) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : d, materialcode: id }, data: {
supplierid: d,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -718,6 +723,7 @@ if (!empty($getlogpodtl)) {
.num { .num {
text-align: right; text-align: right;
} }
.header-container { .header-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -730,16 +736,24 @@ if (!empty($getlogpodtl)) {
text-align: center; text-align: center;
margin: 0; margin: 0;
} }
.centered { .centered {
display: flex; display: flex;
/* justify-content: center; */ /* justify-content: center; */
align-items: center; align-items: center;
height: 10vh; height: 10vh;
} }
.centered label, .centered input {
.centered label,
.centered input {
margin: 0 5px; margin: 0 5px;
} }
.mandatory { color:red;text-align:right;background-color: white;}
.mandatory {
color: red;
text-align: right;
background-color: white;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -749,7 +763,7 @@ if (!empty($getlogpodtl)) {
<section class="content"> <section class="content">
<div id="content"></div> <div id="content"></div>
<div style="border:2px solid #333"> <div class="box">
<div id="content"></div> <div id="content"></div>
<div class="header-container"> <div class="header-container">
<?php if ($parentPO == '') { ?> <?php if ($parentPO == '') { ?>
@ -2289,7 +2303,8 @@ if (!empty($getlogpodtl)) {
// $logdate = date('d-m-Y', strtotime($oldpo->logDate)); // $logdate = date('d-m-Y', strtotime($oldpo->logDate));
// } else { // } else {
// $logdate = '-'; // $logdate = '-';
// } ?> // }
?>
--> -->
<td><?php echo $oldpo->LineItemNos; ?></td> <td><?php echo $oldpo->LineItemNos; ?></td>
<td><?php echo $oldpo->entity ?></td> <td><?php echo $oldpo->entity ?></td>
@ -2334,7 +2349,8 @@ if (!empty($getlogpodtl)) {
<div class="modal-content" style="width:950px;"> <div class="modal-content" style="width:950px;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Update Bill <!-- <?php //echo $getdata[0]->BillNo ?> --> <span id="bill"><span> Details</h4> <h4 class="modal-title">Update Bill <!-- <?php //echo $getdata[0]->BillNo
?> --> <span id="bill"><span> Details</h4>
</div> </div>
<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data"> <form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
<div class="modal-body" style="padding:0px;"> <div class="modal-body" style="padding:0px;">

1398
app/Views/capitalpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

944
app/Views/editCapitalAmendPO.php
View File

File diff suppressed because it is too large Load Diff

1619
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

604
app/Views/editImportAmendPO.php
View File

File diff suppressed because it is too large Load Diff

16
app/Views/editRevenueAmendPO.php
View File

@ -938,14 +938,14 @@ if (!empty($INRSYMBOL)) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<div> <div>
<center><b> <center><b>
</b></center> </b></center>
</div> </div>
<div class="header-container"> <div class="header-container">
<h2>Amendment Revenue Purchase Order- <?php echo $PONO; ?></h2> <h2>Amendment Revenue Purchase Order- <?php echo $PONO; ?></h2>
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a> <!-- <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a> -->
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
@ -1281,9 +1281,9 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetFreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="PackagingOption" onclick="SetFreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -1318,8 +1318,8 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -1349,8 +1349,8 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -1378,8 +1378,8 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -1757,8 +1757,8 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 col-md-offset-9"> <div class="col-md-3 col-md-offset-9">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a> <a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -2012,6 +2012,7 @@ if (!empty($INRSYMBOL)) {
<?php } ?> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -2021,7 +2022,6 @@ if (!empty($INRSYMBOL)) {
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<!-- <input type="reset" class="btn btn-success" value = "OK"> --> <!-- <input type="reset" class="btn btn-success" value = "OK"> -->

20
app/Views/editRevenuepurchaseorder.php
View File

@ -420,7 +420,10 @@ if (!empty($getlogpodtl)) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : d, materialcode: id }, data: {
supplierid: d,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -458,7 +461,10 @@ if (!empty($getlogpodtl)) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : d, materialcode: id }, data: {
supplierid: d,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -1837,6 +1843,7 @@ if (!empty($getlogpodtl)) {
.num { .num {
text-align: right; text-align: right;
} }
.header-container { .header-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -1867,7 +1874,6 @@ if (!empty($getlogpodtl)) {
text-align: right; text-align: right;
background-color: white; background-color: white;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -1876,7 +1882,7 @@ if (!empty($getlogpodtl)) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<div id="content"></div> <div id="content"></div>
<div class="header-container"> <div class="header-container">
<?php if ($parentPO == '') { ?> <?php if ($parentPO == '') { ?>
@ -4707,8 +4713,7 @@ if (!empty($getlogpodtl)) {
stat = '<?php echo PO_CREATED; ?>'; stat = '<?php echo PO_CREATED; ?>';
} else if (status == '4') { } else if (status == '4') {
stat = '<?php echo PO_RELEASED; ?>'; stat = '<?php echo PO_RELEASED; ?>';
} } else {
else {
stat = '<?php echo $PONOStatus; ?>'; stat = '<?php echo $PONOStatus; ?>';
} }
var deladd = $('#DeliveryAddr').val(); var deladd = $('#DeliveryAddr').val();
@ -4770,7 +4775,8 @@ if (!empty($getlogpodtl)) {
alert("Error"); alert("Error");
} }
},error: function(jqXHR, textStatus, errorThrown) { },
error: function(jqXHR, textStatus, errorThrown) {
console.error("AJAX Error: " + textStatus + ": " + errorThrown); console.error("AJAX Error: " + textStatus + ": " + errorThrown);
alert("Error: " + textStatus); alert("Error: " + textStatus);
} }

35
app/Views/editServiceAmendPO.php
View File

@ -86,7 +86,6 @@ if (!empty($POMaster)) {
$DescriptionOfPo = $Req->Description_Of_Service; $DescriptionOfPo = $Req->Description_Of_Service;
$BudgetType = $Req->BudgetType; $BudgetType = $Req->BudgetType;
$PrePOFile = $Req->POFile; $PrePOFile = $Req->POFile;
} }
} }
@ -257,7 +256,8 @@ foreach ($PaymentTerms as $TER) {
$("#SupAddress").val("MSME :" + obj.MSME + "\n" + obj.Address); $("#SupAddress").val("MSME :" + obj.MSME + "\n" + obj.Address);
} else { } else {
$("#SupAddress").val(obj.Address); $("#SupAddress").val(obj.Address);
} $("#PaymentTerms").val(obj.PaymentID); }
$("#PaymentTerms").val(obj.PaymentID);
@ -407,7 +407,10 @@ foreach ($PaymentTerms as $TER) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : drpSupplier, materialcode: id }, data: {
supplierid: drpSupplier,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -447,7 +450,10 @@ foreach ($PaymentTerms as $TER) {
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO", url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
type: 'POST', type: 'POST',
data: {supplierid : d, materialcode: id }, data: {
supplierid: d,
materialcode: id
},
success: function(response) { success: function(response) {
if (response) alert(response); if (response) alert(response);
} }
@ -644,6 +650,7 @@ foreach ($PaymentTerms as $TER) {
.num { .num {
text-align: right; text-align: right;
} }
.header-container { .header-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -656,16 +663,24 @@ foreach ($PaymentTerms as $TER) {
text-align: center; text-align: center;
margin: 0; margin: 0;
} }
.centered { .centered {
display: flex; display: flex;
/* justify-content: center; */ /* justify-content: center; */
align-items: center; align-items: center;
height: 10vh; height: 10vh;
} }
.centered label, .centered input {
.centered label,
.centered input {
margin: 0 5px; margin: 0 5px;
} }
.mandatory { color:red;text-align:right;background-color: white;}
.mandatory {
color: red;
text-align: right;
background-color: white;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -674,14 +689,12 @@ foreach ($PaymentTerms as $TER) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<div id="content"></div> <div id="content"></div>
<div class="header-container"> <div class="header-container">
<?php if ($parentPO == '') { ?>
<h2> Edit Service Purchase Order-<?php echo "$PONO"?></h2>
<?php } else {?>
<h2> Amended Service Purchase Order-<?php echo "$PONO" ?></h2> <h2> Amended Service Purchase Order-<?php echo "$PONO" ?></h2>
<?php } ?>
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a> <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">

983
app/Views/editimportpo.php
View File

File diff suppressed because it is too large Load Diff

5
app/Views/importpo.php
View File

@ -228,6 +228,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
.num { .num {
text-align: right; text-align: right;
} }
.header-container { .header-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -258,7 +259,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
text-align: right; text-align: right;
background-color: white; background-color: white;
} }
</style> </style>
@ -272,7 +272,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<div style="border:2px solid #333"> <div class="box">
<div class="header-container"> <div class="header-container">
<h2>Import Purchase Order</h2> <h2>Import Purchase Order</h2>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a> <a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
@ -396,6 +396,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3">

14
app/Views/purchaseorder.php
View File

@ -1734,16 +1734,24 @@ if (!empty($INRSYMBOL)) {
text-align: center; text-align: center;
margin: 0; margin: 0;
} }
.centered { .centered {
display: flex; display: flex;
/* justify-content: center; */ /* justify-content: center; */
align-items: center; align-items: center;
height: 10vh; height: 10vh;
} }
.centered label, .centered input {
.centered label,
.centered input {
margin: 0 5px; margin: 0 5px;
} }
.mandatory { color:red;text-align:right;background-color: white;}
.mandatory {
color: red;
text-align: right;
background-color: white;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -1751,7 +1759,7 @@ if (!empty($INRSYMBOL)) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<div id="content"></div> <div id="content"></div>
<div class="header-container"> <div class="header-container">
<h2>Revenue Purchase Order</h2> <h2>Revenue Purchase Order</h2>

14
app/Views/servicePurchaseorder.php
View File

@ -593,6 +593,7 @@ if (!empty($INRSYMBOL)) {
.num { .num {
text-align: right; text-align: right;
} }
.header-container { .header-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -605,17 +606,24 @@ if (!empty($INRSYMBOL)) {
text-align: center; text-align: center;
margin: 0; margin: 0;
} }
.centered { .centered {
display: flex; display: flex;
/* justify-content: center; */ /* justify-content: center; */
align-items: center; align-items: center;
height: 10vh; height: 10vh;
} }
.centered label, .centered input {
.centered label,
.centered input {
margin: 0 5px; margin: 0 5px;
} }
.mandatory { color:red;text-align:right;background-color: white;}
.mandatory {
color: red;
text-align: right;
background-color: white;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -624,7 +632,7 @@ if (!empty($INRSYMBOL)) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<div id="content"></div> <div id="content"></div>
<div class="header-container"> <div class="header-container">
<h2>Service Purchase Order</h2> <h2>Service Purchase Order</h2>

31
app/Views/servicepo.php
View File

@ -1,13 +1,22 @@
<style> <style>
.table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;} .table-bordered>thead>tr>th,
.table-bordered>tbody>tr>th,
.table-bordered>tfoot>tr>th,
.table-bordered>thead>tr>td,
.table-bordered>tbody>tr>td,
.table-bordered>tfoot>tr>td {
border: 1px solid #333;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div class="box">
<center><b><h2>Service Purchase Order.</h2></b></center> <center><b>
<h2>Service Purchase Order.</h2>
</b></center>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -18,8 +27,7 @@
$options = array("0" => 'Requistion No'); $options = array("0" => 'Requistion No');
//print_r( $options); //print_r( $options);
if(!empty($POType)) if (!empty($POType)) {
{
foreach ($SupplierName as $SID) : foreach ($SupplierName as $SID) :
@ -58,8 +66,7 @@
$options = array("0" => 'Supplier'); $options = array("0" => 'Supplier');
//print_r( $options); //print_r( $options);
if(!empty($POType)) if (!empty($POType)) {
{
foreach ($SupplierName as $SID) : foreach ($SupplierName as $SID) :
@ -115,7 +122,9 @@
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Item </h4></center> <center>
<h4>Add Item </h4>
</center>
</div> </div>
<div align="left"> <div align="left">
@ -127,8 +136,7 @@
$options = array("0" => 'Req No'); $options = array("0" => 'Req No');
//print_r( $options); //print_r( $options);
if(!empty($POType)) if (!empty($POType)) {
{
foreach ($SupplierName as $SID) : foreach ($SupplierName as $SID) :
@ -179,8 +187,7 @@
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
//print_r( $options); //print_r( $options);
if(!empty($POType)) if (!empty($POType)) {
{
foreach ($SupplierName as $SID) : foreach ($SupplierName as $SID) :

61
app/Views/viewinwardgateregister.php
View File

@ -258,9 +258,9 @@
</div> </div>
<div class="buttonContainer"> <div class="buttonContainer">
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
<a class="btn btn-primary" id="draftIGR" value="draftIGR">Draft IGR</a> <a class="btn btn-primary" id="draftIGR" value="draftIGR">Draft IGR</a>
<a class="btn btn-primary" id="generateIGR" value="generateIGR">Generate IGR</a> <a class="btn btn-primary" id="generateIGR" value="generateIGR">Generate IGR</a>
<a class="btn btn-primary" data-dismiss="modal" value="Close">Close</a>
</div> </div>
</div> </div>
@ -345,7 +345,7 @@
<div class="modal-footer"> <div class="modal-footer">
<center> <center>
<a class="btn btn-primary" onclick="modalSave()" id="modalsave">&nbsp;&nbsp;<span class="bold">Save</span> <a class="btn btn-primary" onclick="modalSave()" id="modalsave">&nbsp;&nbsp;<span class="bold">Save</span>
<a class="btn btn-primary" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
</center> </center>
</div><!-- footer div closed --> </div><!-- footer div closed -->
</div><!-- modal content div closed--> </div><!-- modal content div closed-->
@ -365,7 +365,7 @@
</div> </div>
<div style="margin:20px;" id="HisStatement"></div> <div style="margin:20px;" id="HisStatement"></div>
<div style="text-align: right; margin:5px;"> <div style="text-align: right; margin:5px;">
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
</div> </div>
<br /> <br />
</div> </div>
@ -386,7 +386,7 @@
<div style="margin:20px;" id="CCStatement"></div> <div style="margin:20px;" id="CCStatement"></div>
<div style="text-align: right; margin:5px;"> <div style="text-align: right; margin:5px;">
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
</div> </div>
<br /> <br />
</div> </div>
@ -430,7 +430,7 @@
</tbody> </tbody>
</table> </table>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-primary" data-dismiss="modal" value="close">Close</a> <a class="btn btn-cancel" data-dismiss="modal" value="close">Close</a>
</div> </div>
</div> </div>
</form> </form>
@ -468,7 +468,6 @@
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<div class="col-md-4 col-md-offset-8"> <div class="col-md-4 col-md-offset-8">
<a class="btn btn-success" onclick="fileupdate()">&nbsp;&nbsp;<span class="bold">Update</span> <a class="btn btn-success" onclick="fileupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
</div> </div>
</div> </div>
@ -607,10 +606,10 @@
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); $("#Invoice_Date").val(dcd2);
console.log(item.MaterialRcvdDate) console.log(item.MaterialRcvdDate)
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(new Date(item.MaterialRcvdDate)); var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(item.MaterialRcvdDate,1);
$("#MaterialRcvdDate").val(GrossWeightDate); $("#MaterialRcvdDate").val(Mat_rcv_date);
console.log(item.MaterialRcvdDate) console.log(item.MaterialRcvdDate)
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(new Date(item.GrossWeightDate)); var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(item.GrossWeightDate,2);
$("#ser").val(item.ServiceDescription); $("#ser").val(item.ServiceDescription);
i = i + 1; i = i + 1;
@ -869,7 +868,7 @@
function constructSentence(record) { function constructSentence(record) {
let str = record.field; let str = record.field;
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2'); let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
let sentence = record.FullName + ' on ' + formatDateTime(record.history_dated) + " " + fieldName + " "; let sentence = record.FullName + ' on ' + formatDateTime(record.history_dated,2) + " " + fieldName + " ";
if (parseInt(record.is_add) === 1) { if (parseInt(record.is_add) === 1) {
sentence += record.new_data + " was added."; sentence += record.new_data + " was added.";
} else if (parseInt(record.is_edit) === 1) { } else if (parseInt(record.is_edit) === 1) {
@ -1150,9 +1149,9 @@ function deleteBill(Billno,i){
// Set modal inputs with the retrieved values // Set modal inputs with the retrieved values
$("#GrossWeight").val(v1); $("#GrossWeight").val(v1);
$("#GrossWeightDate").val(v2); $("#GrossWeightDate").val(formatDateTime(v2,2));
$("#TareWeight").val(v3); $("#TareWeight").val(v3);
$("#TareWeightDate").val(v4); $("#TareWeightDate").val(formatDateTime(v4,2) );
$("#NetWeight").val(v5); $("#NetWeight").val(v5);
$("#CurrentInx").val(inx); $("#CurrentInx").val(inx);
@ -1257,13 +1256,32 @@ function deleteBill(Billno,i){
</script> </script>
<script> <script>
function formatDateTime(dateString) { function formatDateTime(dateString,flag) {
// Check if the date string is null // Note 1 means DATE only
if (dateString === null) { // 2 means DATE and Time
// Check if the date string is null or empty
if (!dateString || dateString === null || dateString === '0000-00-00 00:00:00') {
return ''; return '';
} else { } else {
// Create a new Date object from the date string
var date = new Date(dateString); console.log("Received date string:", dateString);
// Split the date string into date and time components
var dateTimeParts = dateString.split(' ');
var dateParts = dateTimeParts[0].split('-');
var timeParts = dateTimeParts[1].split(':');
// Extract individual components
var year = parseInt(dateParts[0], 10);
var month = parseInt(dateParts[1], 10) - 1; // Months are zero-based in JavaScript
var day = parseInt(dateParts[2], 10);
var hours = parseInt(timeParts[0], 10);
var minutes = parseInt(timeParts[1], 10);
var seconds = parseInt(timeParts[2], 10);
// Create a new Date object
var date = new Date(year, month, day, hours, minutes, seconds);
// Extract date components // Extract date components
var day = date.getDate().toString().padStart(2, '0'); var day = date.getDate().toString().padStart(2, '0');
@ -1274,10 +1292,13 @@ function deleteBill(Billno,i){
var hours = date.getHours().toString().padStart(2, '0'); var hours = date.getHours().toString().padStart(2, '0');
var minutes = date.getMinutes().toString().padStart(2, '0'); var minutes = date.getMinutes().toString().padStart(2, '0');
var seconds = date.getSeconds().toString().padStart(2, '0'); var seconds = date.getSeconds().toString().padStart(2, '0');
var formattedDate = '';
// Format the date and time in DD-MM-YYYY HH:MM:SS format // Format the date and time in DD-MM-YYYY HH:MM:SS format
var formattedDate = `${day}-${month}-${year} ${hours}:${minutes}:${seconds}`; if(flag == 1){
formattedDate = `${day}-${month}-${year}`;
}else if (flag == 2){
formattedDate = `${day}-${month}-${year} ${hours}:${minutes}:${seconds}`;
}
return formattedDate; return formattedDate;
} }
} }