From 598148a969639c5bfa66e2fa1e5fd6d2489d4b81 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 29 Aug 2024 08:51:04 +0530 Subject: [PATCH 1/4] CHANGE_INWARD_RIASE --- app/Config/Routes.php | 1 + app/Controllers/Expense.php | 22 +- app/Views/addEmployee.php | 2 +- app/Views/addSupplier.php | 2 +- app/Views/addasset.php | 2 +- app/Views/addconfig.php | 2 +- app/Views/adddepartment.php | 2 +- app/Views/editrequisitionform.php | 139 ++++--- app/Views/expense_list.php | 245 +++++++----- app/Views/includes/new_header.php | 34 +- app/Views/inwardgateregister.php | 366 ++++++++++++++---- app/Views/requisitionform.php | 13 + app/Views/viewinwardgateregister.php | 556 ++++++++++++++------------- 13 files changed, 854 insertions(+), 532 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index cf3212bb..33bc631f 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -270,6 +270,7 @@ $routes->post('editExpense', 'Expense::editExpense'); $routes->post('getExpenseDetails', 'Expense::getExpenseDetails'); $routes->get('uploads/(:any)', 'Expense::downloads/$1'); $routes->post('deleteFile', 'Expense::deleteFile'); +$routes->get('downloadFile/(:any)', 'Expense::downloads/$1'); // Application OGR Page diff --git a/app/Controllers/Expense.php b/app/Controllers/Expense.php index 7465b323..64c0d7ab 100644 --- a/app/Controllers/Expense.php +++ b/app/Controllers/Expense.php @@ -39,18 +39,21 @@ class Expense extends BaseController $file->move(WRITEPATH . 'uploads', $fileName); } + $status = $this->request->getPost('status'); + $paymentMethod = $status === 'Paid' ? $this->request->getPost('payment_method') : 0; + $data = [ 'transporter_file' => $fileName, 'supplier_id' => $this->request->getPost('supplierid'), 'remarks' => $this->request->getPost('remarks'), 'cost' => $this->request->getPost('cost'), 'gst' => $this->request->getPost('gst'), - 'total' => $this->request->getPost('total'), - 'status' => $this->request->getPost('status'), - 'payment_method' => $this->request->getPost('payment_method') + 'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'), + 'status' => $status, + 'payment_method' => $paymentMethod ]; - $insert_id = $this->expense_model->insertExpense($data); + $insert_id = $this->expense_model->insertExpense($data); if ($insert_id) { return json_encode('true'); } else { @@ -83,18 +86,23 @@ class Expense extends BaseController $fileName = $this->request->getPost('existing_file'); // Use existing file if no new file is uploaded } + $status = $this->request->getPost('status'); + $paymentMethod = $status === 'Paid' ? $this->request->getPost('payment_method') : 0; + $data = [ 'supplier_id' => $this->request->getPost('supplierid'), 'remarks' => $this->request->getPost('remarks'), 'cost' => $this->request->getPost('cost'), 'gst' => $this->request->getPost('gst'), - 'total' => $this->request->getPost('total'), - 'status' => $this->request->getPost('status'), - 'payment_method' => $this->request->getPost('payment_method') + 'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'), + 'status' => $status, + 'payment_method' => $paymentMethod ]; if(!empty($fileName)){ $data['transporter_file'] = $fileName; } + $data['payment_method'] = $this->request->getPost('payment_method'); + if ($id) { $result = $this->expense_model->updateExpense($id, $data); diff --git a/app/Views/addEmployee.php b/app/Views/addEmployee.php index 50ae509a..936c609f 100644 --- a/app/Views/addEmployee.php +++ b/app/Views/addEmployee.php @@ -465,7 +465,7 @@ legend {
- Back + Back
diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index 16590348..d92f3f0c 100644 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -46,7 +46,7 @@
- Back + Back
diff --git a/app/Views/addasset.php b/app/Views/addasset.php index 8228925b..67086ce0 100644 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -10,7 +10,7 @@
- Back + Back
diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index 603ab023..45db9225 100644 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -16,7 +16,7 @@
- Back + Back
- Back + Back
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index 9f02ab4d..45f098d3 100644 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -34,6 +34,19 @@ if (!empty($ReqPOType)) { $strReqPOType = $ReqPOType; } ?> + + + + +
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 86434473..0fa89a14 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -1,6 +1,6 @@
@@ -764,12 +758,12 @@ if (!empty($getlogpodtl)) {
- -

- -

- - Back + +

+ +

+ + Back
@@ -779,2009 +773,2073 @@ if (!empty($getlogpodtl)) {
- - 'form-label-left ServicePO ', 'name' => 'ServicePO', 'id' => 'ServicePO', 'enctype' => 'multipart/form-data'); echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> - -
-
-
-
-
- - 'Selected Requisition Numbers'); - if (!empty($ReqList)) { - foreach ($ReqList as $SID) : - - $options[$SID->ReqNo] = $SID->ReqNo; - endforeach; - } - echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"'); - - ?> -
-
- -
- - 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- - 'Select Supplier'); - //print_r( $options); - - if (!empty($Suplist)) { - foreach ($Suplist as $SID) : - $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; - endforeach; - } - - echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2'); - - ?> - - - -
-
- -
- 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
- -
-
-
-
-
- - StatusCode) { - $optionsWork[$WorkSID->StatusCode] = $WorkSID->StatusName; - } - - - endforeach; - foreach ($WorkStatus as $SID) : - if ($WrkStatus != $SID->StatusCode) { - $optionsWork[$SID->StatusCode] = $SID->StatusName; - } - - - endforeach; - } - - echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2'); - - ?> -
-
- Select Delivery By*
-
- 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> -
- -
-
- -
- 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); - ?> -
-
- -
- -
- 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> - -
-
- -
-
-
-
-
- -
- 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); - ?> -
-
-
- -
- - 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
-
- -
- - 'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference', 'class' => 'form-control', 'maxlength' => '40'); - echo form_input($data); - ?> -
-
-
- -
- - 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno', 'class' => 'form-control'); - echo form_input($data); - ?> -
- -
-
-
-
-
-
-
- - -
- - 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
- -
-
- - - -
- - 'Select Work Status'); - - - if (!empty($PoTypeOptions)) { - foreach ($PoTypeOptions as $POpt) : - - if ($ServiceTypeOptions == $POpt->ConfigValue) { - $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; - } - endforeach; - foreach ($PoTypeOptions as $POpt1) : - - if ($ServiceTypeOptions != $POpt1->ConfigValue) { - $optionsPO[$POpt1->ConfigValue] = $POpt1->ConfigValue; - } - endforeach; - } - - echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2'); - - - ?> -
- - - -
-
- - PaymentID) { - $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms; - } - endforeach; - foreach ($Payment as $pay1) : - if ($Terms != $pay1->PaymentID) { - $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; - } - endforeach; - } - echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); - ?> -
- -
-
-
-
-
- -
- - -
- - - - -
-
- -
- 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); - echo form_input($data); - ?> -
-
-
- - -
-
-
-
-
-
- -
- -
- > IS THIS OPEN ORDER FORMAT -
-
- -
- - -
-
- -
- - - - - -
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - Schedule_Type != 'Recurring') { - $FrequencyNo = intval(1); - $Frequency = 'One Time'; - } else { - $FrequencyNo = $record->NumberOfService; - $Frequency = $record->Service_Period; - } - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - After_CGST; - $TotalSgst = $TotalSgst + $record->After_SGST; - $TotalIgst = $TotalIgst + $record->After_IGST; - $OtherAmt = $OtherAmt + $record->otherallowance; - $TotalSummary = $TotalSummary + $record->TotalValue; - - - $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo; - } - ?> +
+
+
+ 'Selected Requisition Numbers'); + if (!empty($ReqList)) { + foreach ($ReqList as $SID) : + $options[$SID->ReqNo] = $SID->ReqNo; + endforeach; } - ?> -
-
SNoRequisition NoItem CodeItem NameQuantityUOMRate Basic Amount Tax Amount Total Order Amount Action
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>     - -    
-
-
-
-
+ echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"'); -
- - 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($TotalBasicAmount, 2, '.', '')), 'id' => 'txtTotBasicAmount', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCgst, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); ?>
+
+ +
- -
- - 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSgst, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> + 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
- +
+ 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIgst, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
+ $options = array("0" => 'Select Supplier'); + //print_r( $options); -
- - 'ToatalOtherAllowances', 'value' => set_value('ToatalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'ToatalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> + if (!empty($Suplist)) { + foreach ($Suplist as $SID) : + $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; + endforeach; + } + + echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2'); + + ?> + +
-
- - 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($TotalSummary, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> - +
+ +
+ 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
-
- -
- -
+
+
+ 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); - echo form_textarea($data); - ?> -
-
- -
-
- 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); - echo form_textarea($data); - ?> -
- -
+ if (!empty($WorkStatus)) { - - -
-
- - -
- - -
- -
- - -
- - - - -
- - - - - - - - - - - - - - - $gd) { - - ?> - - - - - - - - - - - - - StatusCode) { + $optionsWork[$WorkSID->StatusCode] = $WorkSID->StatusName; } - ?> - -
Bill No FileAction
BillNo ?>FilePath)) ? $gd->FilePath : "No File"; ?> - FilePath)) { ?> - - -
+ + + endforeach; + foreach ($WorkStatus as $SID) : + if ($WrkStatus != $SID->StatusCode) { + $optionsWork[$SID->StatusCode] = $SID->StatusName; + } + + + endforeach; + } + + echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2'); + + ?> +
+
+ Select Delivery By*
+
+ 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> + 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> +
+ +
+
+ +
+ 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> +
+
+ +
+ +
+ 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> + +
+
+ +
+
+
+ +
+ 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference', 'class' => 'form-control', 'maxlength' => '40'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+ + 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+ +
+
+ +
- -
-
- - - - - - - - - - - - - + - + //$optionsWork = array("0"=>'Select Work Status'); - - - + if (!empty($PoTypeOptions)) { + foreach ($PoTypeOptions as $POpt) : - - - - - - - entity == 'PO DateChanged') { - $oldValue = date('d-m-Y', strtotime($oldpo->oldValue)); - } else { - $oldValue = $oldpo->oldValue; - } ?> - - - entity == 'PO DateChanged') { - $newValue = date('d-m-Y', strtotime($oldpo->newValue)); - } else { - $newValue = $oldpo->newValue; - } ?> - - - - - - - - ConfigValue) { + $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; } - ?> - - -
SnoPONOLineItemNoEntityOldValueNewValueUpdatedByUpdateOn
PONO ?>LineItemNos; ?>entity ?>SupplierName; ?>FirstName ?>UpdatedOn); - echo $date->format('d-m-Y'); ?>
-
-
+ endforeach; + foreach ($PoTypeOptions as $POpt1) : + + if ($ServiceTypeOptions != $POpt1->ConfigValue) { + $optionsPO[$POpt1->ConfigValue] = $POpt1->ConfigValue; + } + endforeach; + } + + echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2'); - - - - - - - - - - - - -
- -

- - - - - - - - -   Cancel - -   Save - -   Submit -   Approve - -   OK -   Submit - -   OK -   Submit - - + ?>
+ +
+
+ + PaymentID) { + $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms; + } + endforeach; + foreach ($Payment as $pay1) : + if ($Terms != $pay1->PaymentID) { + $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; + } + endforeach; + } + echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); + ?> +
+ +
+
+
+ +
-
- -
- - - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; + +
+ + + + +
+
+ +
+ 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ + +
+
+
+
+ +
+ +
+ > IS THIS OPEN ORDER FORMAT +
+
+ +
+ + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + Schedule_Type != 'Recurring') { + $FrequencyNo = intval(1); + $Frequency = 'One Time'; } else { - echo $StatusName; + $FrequencyNo = $record->NumberOfService; + $Frequency = $record->Service_Period; } - } else { - echo "Status not provided"; + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + After_CGST; + $TotalSgst = $TotalSgst + $record->After_SGST; + $TotalIgst = $TotalIgst + $record->After_IGST; + $OtherAmt = $OtherAmt + $record->otherallowance; + $TotalSummary = $TotalSummary + $record->TotalValue; + + + $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo; } ?> - - - - + + +
SNoRequisition NoItem CodeItem NameQuantityUOMRate Basic Amount Tax Amount Total Order Amount Action
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>     + +    
+
+
+
+ + 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($TotalBasicAmount, 2, '.', '')), 'id' => 'txtTotBasicAmount', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCgst, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSgst, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIgst, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'ToatalOtherAllowances', 'value' => set_value('ToatalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'ToatalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+ + 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($TotalSummary, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ +
+ 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> +
+
+ +
+ + 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); + echo form_textarea($data); + ?> +
-
-
-
+
+ + + +
+ + +
+ +
+ + +
+ + + + +
+ + + + + + + + + + + + + + + $gd) { + + ?> + + + + + + + + + +
Bill No FileAction
BillNo ?>FilePath)) ? $gd->FilePath : "No File"; ?> + FilePath)) { ?> + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + entity == 'PO DateChanged') { + $oldValue = date('d-m-Y', strtotime($oldpo->oldValue)); + } else { + $oldValue = $oldpo->oldValue; + } ?> + + + entity == 'PO DateChanged') { + $newValue = date('d-m-Y', strtotime($oldpo->newValue)); + } else { + $newValue = $oldpo->newValue; + } ?> + + + + + + + + + + +
SnoPONOLineItemNoEntityOldValueNewValueUpdatedByUpdateOn
PONO ?>LineItemNos; ?>entity ?>SupplierName; ?>FirstName ?>UpdatedOn); + echo $date->format('d-m-Y'); ?>
+
+
+ +
+ +

+ + + + + + + + +   Cancel + +   Save + +   Submit +   Approve + +   OK +   Submit + +   OK +   Submit + + +
+ +
+ +
+ +
+ + + 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + + if (isset($StatusName) && !empty($StatusName)) { + if (isset($statusMappings[$StatusName])) { + echo $statusMappings[$StatusName]; + } else { + echo $StatusName; + } + } else { + echo "Status not provided"; + } + ?> +
+
+
+
+
+
+
+
+
+ + -
-
+
+ + - - - - - - - - - + + + + + + + - - - \ No newline at end of file + }); + \ No newline at end of file diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 9d688d81..886e6b22 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1,6 +1,7 @@ "NO", "value" => "0"), array("name" => "YES", "value" => "1") + array("name" => "NO", "value" => "0"), + array("name" => "YES", "value" => "1") ); $ReqType = ''; $CompanyAddress = ''; @@ -172,40 +173,40 @@ if (!empty($INRSYMBOL)) { $(function() { - $("#PODate").datepicker({ - // minDate : 'now', - // maxDate : 'now', - dateFormat: 'dd-mm-yy', - changeMonth: true, - changeYear: true, - yearRange: '-100:+0' - }); - $("#Deliverydt").datepicker({ - minDate: 'now', - dateFormat: 'dd-mm-yy', - changeMonth: true, - changeYear: true, - yearRange: '0:+10' - }); + // $("#PODate").datepicker({ + // // minDate : 'now', + // // maxDate : 'now', + // dateFormat: 'dd-mm-yy', + // changeMonth: true, + // changeYear: true, + // yearRange: '-100:+0' + // }); + // $("#Deliverydt").datepicker({ + // minDate: 'now', + // dateFormat: 'dd-mm-yy', + // changeMonth: true, + // changeYear: true, + // yearRange: '0:+10' + // }); - $("#Date1").datepicker({ - // minDate : 'now', - dateFormat: 'dd-mm-yy', - changeMonth: true, - changeYear: true, - yearRange: '0:+10' - }); + // $("#Date1").datepicker({ + // // minDate : 'now', + // dateFormat: 'dd-mm-yy', + // changeMonth: true, + // changeYear: true, + // yearRange: '0:+10' + // }); - $("#MRC").datepicker({ - // minDate : 'now', - dateFormat: 'dd-mm-yy', - changeMonth: true, - changeYear: true, - yearRange: '0:+10' - }); + // $("#MRC").datepicker({ + // // minDate : 'now', + // dateFormat: 'dd-mm-yy', + // changeMonth: true, + // changeYear: true, + // yearRange: '0:+10' + // }); var SelectedMaterialList = { Mat: [] @@ -1910,10 +1911,11 @@ if (!empty($INRSYMBOL)) { $("#EditRevenueMaterialCode").select2(); $("#MaterialCode").select2(); $("#ServiceMaterialCode").select2(); + $("#emergency_itemcode").select2(); + }); - $("#emergency_itemcode").select2(); @@ -2020,140 +2022,146 @@ if (!empty($INRSYMBOL)) { .num { text-align: right; } + .header-container { - display: flex; - justify-content: space-between; - align-items: center; - padding: 25px; - } + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } - .header-container h2 { - flex: 1; - text-align: center; - margin: 0; - } + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } - .centered { - display: flex; - /* justify-content: center; */ - align-items: center; - height: 10vh; - } + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } - .centered label, - .centered input { - margin: 0 5px; - } + .centered label, + .centered input { + margin: 0 5px; + } - .mandatory { - color: red; - text-align: right; - background-color: white; - } + .mandatory { + color: red; + text-align: right; + background-color: white; + } -
- 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO'); + - echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?> - -
-
-
-
-

Emergency Purchase Order

-
-
+
+
+
-
-
- - 'Select Request Type'); +
+
+

Emergency Purchase Order

+
+
+
- if (!empty($RequestType)) { + 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO'); - foreach ($RequestType as $RID) : - if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") { - $options[$RID->ConfigValue] = $RID->ConfigValue; - } - endforeach; - } - - echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"'); - - ?> - -
-
- -
+ echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?> +
+
+
+
+
+
+ 'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'Select Supplier'); - //print_r( $options); + $options = array("-1" => 'Select Request Type'); - if (!empty($Suplist)) { - foreach ($Suplist as $SID) : - $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; + if (!empty($RequestType)) { + + foreach ($RequestType as $RID) : + if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") { + $options[$RID->ConfigValue] = $RID->ConfigValue; + } endforeach; } - echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"'); + echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"'); ?>
-
-
- -
- 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> +
+ +
+ + 'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'Select Supplier'); + //print_r( $options); + + if (!empty($Suplist)) { + foreach ($Suplist as $SID) : + $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; + endforeach; + } + + echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"'); + + ?> +
+
+
+ +
+ 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
-
-
-
-
-
-
+ + - - + + \ No newline at end of file diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index b467baf5..0bfda90c 100644 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -1,14 +1,16 @@ + .Date-filter-form { + display: flex; + align-items: center; + gap: 10px; + /* Adjust the gap as needed */ + } + + .Date-filter-form input, + .Date-filter-form button { + padding: 5px; + font-size: 14px; + } + + .Date-filter-form button { + background-color: #007bff; + color: white; + border: none; + cursor: pointer; + } + + .Date-filter-form button:hover { + background-color: #0056b3; + } + + .icon-button { + background: none; + border: none; + cursor: pointer; + color: #007bff; + font-size: 18px; + } + + .icon-button:hover { + color: #0056b3; + } +
-
+
'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

+
+
+
- getFlashdata('error'); - if ($error) { - ?> -
- - getFlashdata('error'); ?> -
+ getFlashdata('error'); + if ($error) { + ?> +
+ + getFlashdata('error'); ?> +
getFlashdata('success'); if ($success) { ?> -
- +
+ getFlashdata('success'); ?> -
+
listErrors('
', '
'); - ?> + ?>
getFlashdata('listErrors'); if ($listErrors) { ?> -
-
-
- +
+
+
+ getFlashdata('listErrors'); ?> +
-

-

- - - - Create Purchase Order - - -
+
+ + + + Create Purchase Order + + +

- -
- - - - - - +
+ + + + + + + + + + +
+ +
- - -
- -
- @@ -291,9 +343,9 @@ span.highlight { - - - + + + @@ -305,85 +357,179 @@ span.highlight { $index = 1; foreach ($ReqList as $record) { ?> - - - - - - - - - - - - - - + + + + + + + + + + + + + +
Requistion Number Requistion Type Requested ByTot. No. Of Line ItemsPo Created Line ItemsPartial PO Created Line ItemsTot Line ItemsPo Line ItemsPartial PO Line Items New Line Items Status Department
  - ReqDate); - $RequestedDate = $dt->format('d-m-Y'); - echo $RequestedDate; - ?> - ReqNo; ?> ReqType; ?>FirstName; ?>TotalNoofLineItems; ?>PolineItems; ?>PartilallyLineItems; ?>newLineItem; ?>StatusName; ?>DepartmentName; ?>Designation; ?>
  + ReqDate); + $RequestedDate = $dt->format('d-m-Y'); + echo $RequestedDate; + ?> + ReqNo; ?> ReqType; ?>FirstName; ?>TotalNoofLineItems; ?>PolineItems; ?>PartilallyLineItems; ?>newLineItem; ?>StatusName; ?>DepartmentName; ?>Designation; ?>
- +
-
-
+
+
+ + + + + - - \ No newline at end of file diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php index 5ce3392d..b57abb59 100644 --- a/app/Views/employeeListing.php +++ b/app/Views/employeeListing.php @@ -63,12 +63,18 @@ color: #0056b3; } -
-
-
-
- +
+ +
+ +
+ getFlashdata('error'); if ($error) { @@ -81,50 +87,39 @@ echo show_alert($type, $success); } ?> -
-
- listErrors('
', '
'); - ?>
-
-
-
-
-
-
-

Employee Details

-
-
-
-
-
-
- - - - - - - - - -
-
-
-
-
- Add New Employee - Export Employee Details +
+
+

Employee Details

-
+
+ Add New Employee + Export Employee Details +
+
-
- +
+
+
+ + + + + + + + + +
+ +
+ +
- + @@ -155,18 +150,18 @@ } } ?> +
Created DateEmp IDEmp ID Employee Name Contact Number Designation
- - - -
+
+
+
-
-
- +
+
+ - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - -

-
Employee Monthly Payment Listing
+

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

Employee Monthly Payment Listing

+
+
+
+
+
+
+
+ +
@@ -78,81 +95,72 @@ $('html').bind('keypress', function(e) {
- "Jan", "2" => "Feb","3" => "Mar","4" => "Apr","5" => "May","6" => "June","7"=> "July","8"=> "Aug","9" => "Sep","10"=> "Oct","11" => "Nov","12"=>"Dec"); - - $currentmontharray = array(array($month."-".$year => $monthsoptions[$month]."-".$year)); - // For find out Next and previous month and year from current year - $aftersix = array(); - for ($i = 0; $i <3;$i++){ - - $month++; - if($month > 12) - { - $month = 1; - $year = $year +1; - } - - $aftersix[]=array($month."-".$year => $monthsoptions[$month]."-".$year); - - } - - $year = date("Y"); - $month = date("m"); - - $beforesix = array(); - for ($i = 3; $i >0;$i--){ - - $month--; - if($month < 1 ) - { - $month = 12; - $year = $year - 1; - } - - $beforesix[]=array($month."-".$year => $monthsoptions[$month]."-".$year); - - } - - $beforesix = array_reverse($beforesix); - - - $options = array_merge($options,$beforesix); - //echo count($options); - - $options = array_merge($options,$currentmontharray); - $options = array_merge($options,$aftersix); - - $ot = array(); - foreach($options as $o) - { - - foreach($o as $key => $value) - { - - $ot[$key] = $value; - - } - - } - ?> + //echo $current; + $month = date("m"); + if ($month < 10) { + $month = substr($month, 1); + } + $currentselection = $month . "-" . $year; + $options = array(); + $monthsoptions = array("1" => "Jan", "2" => "Feb", "3" => "Mar", "4" => "Apr", "5" => "May", "6" => "June", "7" => "July", "8" => "Aug", "9" => "Sep", "10" => "Oct", "11" => "Nov", "12" => "Dec"); + + $currentmontharray = array(array($month . "-" . $year => $monthsoptions[$month] . "-" . $year)); + // For find out Next and previous month and year from current year + $aftersix = array(); + for ($i = 0; $i < 3; $i++) { + + $month++; + if ($month > 12) { + $month = 1; + $year = $year + 1; + } + + $aftersix[] = array($month . "-" . $year => $monthsoptions[$month] . "-" . $year); + } + + $year = date("Y"); + $month = date("m"); + + $beforesix = array(); + for ($i = 3; $i > 0; $i--) { + + $month--; + if ($month < 1) { + $month = 12; + $year = $year - 1; + } + + $beforesix[] = array($month . "-" . $year => $monthsoptions[$month] . "-" . $year); + } + + $beforesix = array_reverse($beforesix); + + + $options = array_merge($options, $beforesix); + //echo count($options); + + $options = array_merge($options, $currentmontharray); + $options = array_merge($options, $aftersix); + + $ot = array(); + foreach ($options as $o) { + + foreach ($o as $key => $value) { + + $ot[$key] = $value; + } + } + ?>
-
+
- +
@@ -202,98 +210,135 @@ $('html').bind('keypress', function(e) { $record) - { - $index++; - if(in_array($record->EmpID,$testarray)) { $index--; }else{ array_push($testarray,$record->EmpID); - ?> + if (!empty($sample)) { - - - - EmpID ; ?> - FirstName; ?> - - DateofJoining); - $newDateFormat = $date->format('d-m-Y'); - echo $newDateFormat; - ?> - - Designation; ?> - NoofDays; ?> - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - Days_worked)){echo $record->Days_worked+$record->sunday_count;}else{echo "0.00";}?> - - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - LOP_Days)){echo $record->LOP_Days;}else{echo "0.00";}?> - - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - Paid_leave)){echo number_format($record->Paid_leave,2,'.','');}else { echo number_format(0.00,2,'.','');} ?> - - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - OT_Hrs_Worked)){echo $record->OT_Hrs_Worked;}else { echo number_format(0.00,2,'.','');} ?> - - TotalSalary; ?> - - TotalSalary / $record->NoofDays; echo number_format($perDaySalary, 2); ?> - - - Days_worked+$record->sunday_count); echo number_format($workedSalary, 2); ?> - - - - - - - - - - - - - - - - + $index = 0; + $i = 0; + foreach ($sample as $i => $record) { + $index++; + if (in_array($record->EmpID, $testarray)) { + $index--; + } else { + array_push($testarray, $record->EmpID); + ?> + + + + + EmpID; ?> + FirstName; ?> + + DateofJoining); + $newDateFormat = $date->format('d-m-Y'); + echo $newDateFormat; + ?> + + Designation; ?> + NoofDays; ?> + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + Days_worked)) { + echo $record->Days_worked + $record->sunday_count; + } else { + echo "0.00"; + } ?> + + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + LOP_Days)) { + echo $record->LOP_Days; + } else { + echo "0.00"; + } ?> + + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + Paid_leave)) { + echo number_format($record->Paid_leave, 2, '.', ''); + } else { + echo number_format(0.00, 2, '.', ''); + } ?> + + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + OT_Hrs_Worked)) { + echo $record->OT_Hrs_Worked; + } else { + echo number_format(0.00, 2, '.', ''); + } ?> + + + TotalSalary; ?> + + TotalSalary / $record->NoofDays; + echo number_format($perDaySalary, 2); ?> + + + Days_worked + $record->sunday_count); + echo number_format($workedSalary, 2); ?> + + + + + + + + + + + + + + + + - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - Monthly_Due)){echo $record->Monthly_Due; $totalmonthloan []=$record->Monthly_Due;}else { echo number_format(0.00,2,'.','');} ?> - + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + Monthly_Due)) { + echo $record->Monthly_Due; + $totalmonthloan[] = $record->Monthly_Due; + } else { + echo number_format(0.00, 2, '.', ''); + } ?> + @@ -304,41 +349,59 @@ $('html').bind('keypress', function(e) { - - + + - Key)){echo "contenteditable='true';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - - Other_Deductions)){echo $record->Other_Deductions;$totalotherDet [] = $record->Other_Deductions;}else{ echo number_format(0.00,2,'.','');} ?> - + Key)) { + echo "contenteditable='true';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > - - Key)){echo "contenteditable='true';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" - style="text-align:right;" > - Festival_Bonus)){echo $record->Festival_Bonus;$totalfestival [] = $record->Festival_Bonus;}else{ echo number_format(0.00,2,'.','');;} ?> - + Other_Deductions)) { + echo $record->Other_Deductions; + $totalotherDet[] = $record->Other_Deductions; + } else { + echo number_format(0.00, 2, '.', ''); + } ?> + - + + Key)) { + echo "contenteditable='true';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + Festival_Bonus)) { + echo $record->Festival_Bonus; + $totalfestival[] = $record->Festival_Bonus; + } else { + echo number_format(0.00, 2, '.', '');; + } ?> + - Key)){echo "contenteditable='false';"; } ?> - Key)){?> title="Payslip Calculated" - style="text-align:right;color:blue;" > - Estimate)){ - echo $record->Estimate; $estTotal [] = $record->Estimate; - }else { - echo $empSalary[$i]; $estTotal [] = $empSalary[$i]; - } - ?> - + + + Key)) { + echo "contenteditable='false';"; + } ?> + Key)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" > + Estimate)) { + echo $record->Estimate; + $estTotal[] = $record->Estimate; + } else { + echo $empSalary[$i]; + $estTotal[] = $empSalary[$i]; + } + ?> + @@ -347,52 +410,51 @@ $('html').bind('keypress', function(e) { - - - - - - - - - - - + + + + + + + + + + + - - + + - + - + + + } + } + } + + + ?> @@ -403,14 +465,14 @@ $('html').bind('keypress', function(e) { Total - + - + - - + + @@ -418,7 +480,7 @@ $('html').bind('keypress', function(e) {

 

-
+
@@ -428,479 +490,491 @@ $('html').bind('keypress', function(e) {
-->
-
-
- -
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file From c388287761b1bc889c11d5f91bb124cf5b7ed663 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 30 Aug 2024 03:43:29 +0000 Subject: [PATCH 4/4] po design changes --- app/Views/EditservicePurchaseorder.php | 521 +- app/Views/alterpurchaseorder.php | 3384 ++++++------ app/Views/editCapitalAmendPO.php | 337 +- app/Views/editCapitalPo.php | 6601 ++++++++++++------------ app/Views/editImportAmendPO.php | 316 +- app/Views/editRevenueAmendPO.php | 212 +- app/Views/editRevenuepurchaseorder.php | 3999 +++++++------- app/Views/editServiceAmendPO.php | 1723 +++---- app/Views/editimportpo.php | 637 ++- 9 files changed, 8664 insertions(+), 9066 deletions(-) diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index ad31b7fc..22ff4c48 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -717,8 +717,6 @@ if (!empty($getlogpodtl)) { });
@@ -794,7 +791,7 @@ if (!empty($getlogpodtl)) {
-
+
'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); @@ -814,7 +811,7 @@ if (!empty($getlogpodtl)) { endforeach; } - echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2'); + echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"'); ?> @@ -823,7 +820,7 @@ if (!empty($getlogpodtl)) {
-
+
'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); echo Form_textarea($data); @@ -856,7 +853,7 @@ if (!empty($getlogpodtl)) { endforeach; } - echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2'); + echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2"'); ?>
@@ -870,7 +867,7 @@ if (!empty($getlogpodtl)) {
-
+
'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); @@ -887,7 +884,7 @@ if (!empty($getlogpodtl)) {
-
+
'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); echo Form_textarea($data); @@ -900,7 +897,7 @@ if (!empty($getlogpodtl)) {
-
+
'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); @@ -909,7 +906,7 @@ if (!empty($getlogpodtl)) {
-
+
'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment', 'class' => 'form-control'); @@ -919,7 +916,7 @@ if (!empty($getlogpodtl)) {
-
+
'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference', 'class' => 'form-control', 'maxlength' => '40'); @@ -929,7 +926,7 @@ if (!empty($getlogpodtl)) {
-
+
'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno', 'class' => 'form-control'); @@ -941,10 +938,10 @@ if (!empty($getlogpodtl)) {
-
+
-
+
'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference', 'class' => 'form-control'); @@ -958,7 +955,7 @@ if (!empty($getlogpodtl)) { -
+
@@ -1004,12 +1001,12 @@ if (!empty($getlogpodtl)) { } endforeach; } - echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); + echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2"'); ?>