From 942002350256c8fa72751524877e2813e89cf2d0 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Wed, 21 Aug 2024 17:21:51 +0530 Subject: [PATCH] CHANGE_PURCHASE_LIST_MINTON --- app/Views/AmendPOlist.php | 255 ++++++++++++----------- app/Views/POlist.php | 292 ++++++++++++++------------- app/Views/createPOfromRequistion.php | 106 ++++++---- app/Views/dashboard.php | 2 +- app/Views/login.php | 2 +- app/Views/porelease_view.php | 133 +++++++----- app/Views/requisitionlisting.php | 212 ++++++++++--------- app/Views/viewinwardgateregister.php | 188 ++++++++++------- 8 files changed, 658 insertions(+), 532 deletions(-) diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php index e9fdfd32..07efdd7e 100644 --- a/app/Views/AmendPOlist.php +++ b/app/Views/AmendPOlist.php @@ -39,133 +39,133 @@ white-space: nowrap; } -
- - -
-
-
-
-
-
-

Amendment Purchase Order List

-
-
- -
-
- - - - - +
+
+ +
+ +
+
+
+
+

Amendment Purchase Order List

+
+
+
+
+
+
+ + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + - - -
- -
PO DatePONOPO TypeSupplier NameTotal Order ValuePO StatusDelivery OptionDelivery DateDelivery ScheduleAction
PODate); + $PODate = $Pdt->format('d-m-Y'); + echo $PODate + ?>PONO ?>ReqType ?>SupplierName ?>TotalOrderValue ?>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>">         + + + + - - -
PO DatePONOPO TypeSupplier NameTotal Order ValuePO StatusDelivery OptionDelivery DateDelivery ScheduleAction
PODate); - $PODate = $Pdt->format('d-m-Y'); - echo $PODate - ?>PONO ?>ReqType ?>SupplierName ?>TotalOrderValue ?> 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($record->StatusName) && !empty($record->StatusName)) { - if (isset($statusMappings[$record->StatusName])) { - echo $statusMappings[$record->StatusName]; - } else { - echo $record->StatusName; - } - } else { - echo "Status not provided"; - } - ?>DeliveryOption == 1) { - $option = "By Schedule"; - } else if ($record->DeliveryOption == 2) { - $option = "By Dispatch Instruction"; - } - echo $option ?>DeliveryOption == 0) { - $Ddt = new DateTime($record->DeliveryDate); - $Deliverydt = $Ddt->format('d-m-Y'); - echo $Deliverydt; - } else if ($record->DeliveryOption == 1) { - $Deliverydt = ''; - echo $Deliverydt; - } ?>DeliverySchedule ?> 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + + if (isset($record->StatusName) && !empty($record->StatusName)) { + if (isset($statusMappings[$record->StatusName])) { + echo $statusMappings[$record->StatusName]; + } else { + echo $record->StatusName; + } + } else { + echo "Status not provided"; + } + ?> + DeliveryOption == 1) { + $option = "By Schedule"; + } else if ($record->DeliveryOption == 2) { + $option = "By Dispatch Instruction"; + } + echo $option ?>DeliveryOption == 0) { + $Ddt = new DateTime($record->DeliveryDate); + $Deliverydt = $Ddt->format('d-m-Y'); + echo $Deliverydt; + } else if ($record->DeliveryOption == 1) { + $Deliverydt = ''; + echo $Deliverydt; + } ?>DeliverySchedule ?>     +     -         -
-
- -
- - -
- -
- -
- + ?> + + +
+ + + + + + + - -
-
-
-
-
-
-

Purchase Order List

-
-
-
- getFlashdata('error'); - if($error){ - $type = "error"; - echo show_alert($type, $error); - } - $success = session()->getFlashdata('success'); - if($success){ - $type = "success"; - echo show_alert($type, $success); - } - ?> -
-
- listErrors('
', '
'); - ?>
-
-
-
-
- -
-
- - - +
+
+ +
+ +
+
+
+
+

Purchase Order List

+
+
+
getFlashdata('error'); + if($error){ + $type = "error"; + echo show_alert($type, $error); + } + $success = session()->getFlashdata('success'); + if($success){ + $type = "success"; + echo show_alert($type, $success); + } + ?> +
+
+
+ + + + - - + + - - -
- - - - - - - - - - - - - - - - - - - + + + + + + +
PO DatePONO#PO TypeSupplier NameTotal Order ValuePO StatusDelivery OptionDelivery DateDelivery ScheduleAction
PODate); - $PODate = $Pdt->format('d-m-Y'); - echo $PODate + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - - + StatusCode; - StatusCode; - - if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { ?> - - - - - - - - -
PO DatePONO#PO TypeSupplier NameTotal Order ValuePO StatusDelivery OptionDelivery DateDelivery ScheduleAction
PODate); + $PODate = $Pdt->format('d-m-Y'); + echo $PODate + ?>PONO ?>ReqType ?>SupplierName ?>TotalOrderValue ?> 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + + if (isset($record->StatusName) && !empty($record->StatusName)) { + if (isset($statusMappings[$record->StatusName])) { + echo $statusMappings[$record->StatusName]; + } else { + echo $record->StatusName; + } + } else { + echo "Status not provided"; + } ?>PONO ?>ReqType ?>SupplierName ?>TotalOrderValue ?>DeliveryOption == 1) { + $option = "By Schedule"; + } else if ($record->DeliveryOption == 2) { + $option = "By Dispatch Instruction"; + } + echo $option ?>DeliveryOption == 0) { + $Ddt = new DateTime($record->DeliveryDate); + $Deliverydt = $Ddt->format('d-m-Y'); + echo $Deliverydt; + } else if ($record->DeliveryOption == 1) { + $Deliverydt = ''; + echo $Deliverydt; + } ?>DeliverySchedule ?> 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($record->StatusName) && !empty($record->StatusName)) { - if (isset($statusMappings[$record->StatusName])) { - echo $statusMappings[$record->StatusName]; - } else { - echo $record->StatusName; - } - } else { - echo "Status not provided"; - } - ?>DeliveryOption == 1) { - $option = "By Schedule"; - } else if ($record->DeliveryOption == 2) { - $option = "By Dispatch Instruction"; - } - echo $option ?>DeliveryOption == 0) { - $Ddt = new DateTime($record->DeliveryDate); - $Deliverydt = $Ddt->format('d-m-Y'); - echo $Deliverydt; - } else if ($record->DeliveryOption == 1) { - $Deliverydt = ''; - echo $Deliverydt; - } ?>DeliverySchedule ?>                
-
- - - - - - - - - - + if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { ?> + 		               
+
+
+
+
+
+
+
@@ -349,4 +338,25 @@ $(document).ready(function() { ] }); }); - --> \ No newline at end of file + --> + + \ No newline at end of file diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index 8e9451cc..652435f9 100644 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -16,7 +16,7 @@ .dataTables_wrapper { padding-bottom: 0px; - margin-top: -3%; + /* margin-top: -3%; */ } .content-wrapper { @@ -37,22 +37,26 @@ float: inline-end; } -
+ + +
+
'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO', 'method' => 'post', 'role' => 'form'); echo form_open(base_url() . 'purchaseOrder', $attributes); ?> -
- -
-
-
-

Create Purchase Order from Requistion

-
-
- -
-
-
+ +
+ + +
+
+
+

Create Purchase Order from Requistion

+ +
+
+
+
-
-
+
+

@@ -105,14 +109,16 @@

-
+
-
- -
- -
+
+
+
+
+
+
+ + - \ No newline at end of file + + \ No newline at end of file diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index c3b55be1..ace42034 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -1,4 +1,4 @@ -
- \ No newline at end of file + +$(document).ready(function() { + $('#view_inward_gate_register').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options + responsive: true, // Responsive table + order: [[0, 'desc']], // Default ordering (column index 0, ascending) + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + } + } + }); +}); + + \ No newline at end of file