+ | DeliveryChellanDate;
+ if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
+ echo "";
+ }else{
+ $idate = new DateTime($invdate);
+ echo $idate->format('d-m-Y'); }
+ ?> |
|
IGRNO ?>
@@ -218,14 +226,7 @@
|
SupplierName ?> |
DeliveryChellanOrInvoiceNo ?> |
- DeliveryChellanDate;
- if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
- echo "";
- }else{
- $date = new DateTime($invdate);
- echo $date->format('d-m-Y'); }
- ?> |
+
itemCount ?> |
ReceivedQuantity ?> |
NetWeight ?> |
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 94f1b19b..70555f3e 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -211,13 +211,14 @@
+ | Invoice Date |
IGR Date |
IGR Time |
IGR No |
PO No |
Supplier Name |
Invoice No |
- Invoice Date |
+
@@ -248,6 +249,13 @@
$time = $createddate->format('h:i A');
?>
+ | DeliveryChellanDate;
+ if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
+ echo "";
+ }else{
+ $idate = new DateTime($invdate);
+ echo $idate->format('d-m-Y'); } ?> |
|
|
@@ -269,13 +277,6 @@
|
SupplierName ?> |
DeliveryChellanOrInvoiceNo ?> |
- DeliveryChellanDate;
- if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
- echo "";
- }else{
- $date = new DateTime($invdate);
- echo $date->format('d-m-Y'); } ?> |
itemCount ?> |
@@ -2333,7 +2334,7 @@
return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp
};
- var orderColumnIndex = get('roleText') == 'Auditor') ? 6 : 0; ?>;
+ var orderColumnIndex = get('roleText') == 'Auditor') ? 0 : 1; ?>;
table = $('#view_inward_gate_register').DataTable({
dom: 'Blfrtip',
buttons: [
@@ -2900,7 +2901,7 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event)
document.getElementById('exportGasShortage').addEventListener('click',function(){
- exportTableToExcel(tableId, 'gas_shortage_= $date->format('d-m-Y') ?>.xlsx');
+ exportTableToExcel(tableId, 'gas_shortage_= $idate->format('d-m-Y') ?>.xlsx');
})