From 02635dfe1f3f8ec8f737135ba1c906bc7ec24d94 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 13 Mar 2025 07:23:59 +0000 Subject: [PATCH 1/4] tracker fixes : ps --- app/Controllers/Driver.php | 4 +- app/Controllers/Emergencypurchaseorder.php | 6 +- app/Controllers/Purchaseorder.php | 4 +- app/Views/EditservicePurchaseorder.php | 49 +++++---- app/Views/addemppaydate.php | 53 +++++---- app/Views/alterpurchaseorder.php | 118 +++++++++++++++++++++ app/Views/capitalpurchaseorder.php | 3 +- app/Views/driverAttendance.php | 14 ++- app/Views/editCapitalAmendPO.php | 2 +- app/Views/editCapitalPo.php | 4 +- app/Views/editOldemppay.php | 113 +++++++++++++------- app/Views/editRevenuepurchaseorder.php | 5 +- app/Views/editServiceAmendPO.php | 4 +- app/Views/editimportpo.php | 43 +++++--- app/Views/emppayListing.php | 2 +- app/Views/importpo.php | 2 +- app/Views/purchaseorder.php | 2 +- app/Views/rawmaterialListing.php | 6 +- app/Views/requisitionlisting.php | 2 +- app/Views/viewmrirforbilling.php | 2 +- 20 files changed, 320 insertions(+), 118 deletions(-) diff --git a/app/Controllers/Driver.php b/app/Controllers/Driver.php index f77d1622..bdfedb2a 100755 --- a/app/Controllers/Driver.php +++ b/app/Controllers/Driver.php @@ -186,7 +186,9 @@ class Driver extends BaseController $where_arr = ['DATE_FORMAT(t_driver_attendance.date, "%Y-%m")' =>$to_mysql_date,'t_driver_attendance.driver_id' =>$arr['empid']]; $data = $this->driver_model->updateDieselAndShedValuesBasedonEmpID($where_arr,$update_arr); - return $data; + return $this->response->setJSON($data); + + // return $data; // [column] => shed_amount // [value] => 400 // [date] => 21-02-2025 diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 62ba5781..cdf762e2 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -1249,7 +1249,7 @@ class Emergencypurchaseorder extends BaseController } } if ($SkipInsert == "False") { - $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter); + $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); @@ -1419,7 +1419,7 @@ class Emergencypurchaseorder extends BaseController } if ($SkipInsert == "False") { if (strlen((string)$POLineItemNo) == 0) { - $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter); + $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); if (count($POLineItem) > 0) { $LineItemNo = $POLineItem[0]['LineItemNo']; @@ -1427,7 +1427,7 @@ class Emergencypurchaseorder extends BaseController } else { $LineItemNo = $POLineItemNo; - $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CostCenterCode' => $CostCenter); + $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList); } $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 3ef446ad..adbadd41 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -429,7 +429,7 @@ class Purchaseorder extends BaseController // $html = view('pdf_view', $data); // $mpdf->WriteHTML($html); // Use WriteHTML() method to add body content $html = view('po_pdf', $data); - // echo $html;die; + // echo $html;die; $mpdf->WriteHTML($html); // Use WriteHTML() method to add body content // Set HTML footer @@ -3461,7 +3461,7 @@ class Purchaseorder extends BaseController $mpdf->use_kwt = true; $html = view('po_pdf', $data); - // echo $html;die; + // echo $html;die; $mpdf->WriteHTML($html); // Use WriteHTML() method to add body content diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index a7071e59..00cb718f 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1251,8 +1251,8 @@ if (!empty($getlogpodtl)) { Item Code Item Description Line Item Specs - UOM Quantity + UOM Rate Basic Amount Tax Amount @@ -1607,28 +1607,41 @@ if (!empty($getlogpodtl)) { - --> - - -
- - -
- - +
--> +
+
+
+ +
-
- - -      - + + +
+
+
+ + +      + + +
+
+
+ - -
-
+ + + + +
diff --git a/app/Views/addemppaydate.php b/app/Views/addemppaydate.php index 44c06b89..dd826e54 100755 --- a/app/Views/addemppaydate.php +++ b/app/Views/addemppaydate.php @@ -37,7 +37,7 @@
- Employee ID + *
@@ -51,8 +51,7 @@ } } - $js = array('id' => 'emp'); - echo form_dropdown('EmpID', $Employee, set_value('EmpID'), 'class="form-control"', $js); + echo form_dropdown('EmpID', $Employee, set_value('EmpID'), 'class="form-control"', 'id="EmpID"', 'required="true"'); ?>
@@ -62,7 +61,7 @@
- Loan Amount + @@ -73,7 +72,7 @@
- No Of Due(s) + @@ -84,7 +83,7 @@
- Monthly Due + @@ -100,7 +99,7 @@
- Loan Issue(d) Date +
- Due Started + -

Loan Documents

+

Loan Documents

- Request letter +
@@ -145,7 +144,7 @@
- Payment Receipt +
@@ -159,8 +158,8 @@
- - + +
@@ -212,7 +211,7 @@ - + \ No newline at end of file diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index ae4e2b48..0d9a2972 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -95,6 +95,61 @@ if (!empty($INRSYMBOL)) { width: 100% ! important; } + @@ -150,6 +205,50 @@ if (!empty($INRSYMBOL)) { toolbar: false }); +
@@ -456,9 +451,9 @@ if (!empty($INRSYMBOL)) {

Back -
-
-
+
+
+
@@ -469,9 +464,6 @@ if (!empty($INRSYMBOL)) { $attributes = array('class' => 'form-label-left CapitalPO ', 'name' => 'CapitalPO', 'id' => 'ImportPO', 'enctype' => 'multipart/form-data'); echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> - - -
@@ -488,7 +480,7 @@ if (!empty($INRSYMBOL)) { } echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"'); ?> -
+
@@ -498,7 +490,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
-
+
@@ -522,9 +514,8 @@ if (!empty($INRSYMBOL)) { echo Form_textarea($data); ?>
-
- -
+
+
@@ -544,7 +535,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
Select Delivery By*
@@ -561,7 +552,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -570,7 +561,7 @@ if (!empty($INRSYMBOL)) { echo form_textarea($data); ?> -
+
+
+
@@ -601,13 +592,13 @@ if (!empty($INRSYMBOL)) { echo Form_textarea($data); ?>
-
-
+
+
Check Today's Foreign Exchange value (Click here) -
+
@@ -617,7 +608,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
*
@@ -627,7 +618,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
@@ -638,8 +629,8 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
- + +
@@ -651,7 +642,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
@@ -661,7 +652,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
@@ -671,7 +662,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
@@ -681,8 +672,8 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
- + +
@@ -694,7 +685,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
@@ -713,7 +704,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
-
+ - - + +
-
@@ -761,7 +750,7 @@ if (!empty($INRSYMBOL)) { echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"'); ?>
-
+
@@ -770,7 +759,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
-
- + +
-
Add Line Item -
-
+
+
+
-
- - - - - - - - - - - - - - - - - +
+
SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
+ + + + + + + + + + + + + + + + - + - -
SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
-
-
+ + + +
@@ -829,7 +818,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'CapitalBasicOrder', 'value' => set_value('CapitalBasicOrder'), 'id' => 'CapitalBasicOrder', 'class' => 'form-control num', 'readonly' => 'true',); echo form_input($data); ?> -
+
@@ -839,28 +828,28 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?> -
+
'txtTotCgst', 'value' => set_value('txtTotCgst'), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+
'txtTotSgst', 'value' => set_value('txtTotSgst'), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+
'txtTotIgst', 'value' => set_value('txtTotIgst'), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+
-
+
-
- + +
@@ -888,7 +877,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding'), 'id' => 'txttotallanding', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -897,7 +886,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable'), 'id' => 'txttotalAssessable', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -906,7 +895,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom'), 'id' => 'txttotalcustom', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -915,7 +904,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal'), 'id' => 'txttotalSubtotal', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -924,7 +913,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst'), 'id' => 'txttotalIgst', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -933,7 +922,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED'), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -942,7 +931,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH'), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -951,7 +940,7 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty'), 'id' => 'txttotalgrossduty', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?> -
+
@@ -961,9 +950,9 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?> -
+ - +
@@ -974,7 +963,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?>
-
+
@@ -984,19 +973,19 @@ if (!empty($INRSYMBOL)) { echo form_textarea($data); ?>
-
+
-
-
+
+
-
+
- + @@ -1012,15 +1001,17 @@ if (!empty($INRSYMBOL)) {   Save as Draft   Submit -
+
- + - + + + + + +
-
- -
- + +
+
-
- +
+
'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();'); echo form_input($data); ?> -
+
@@ -1926,9 +1911,9 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+ - + - + +
- - -
+ +
@@ -1957,7 +1941,8 @@ if (!empty($INRSYMBOL)) { ?>
-
+ +
@@ -1967,14 +1952,15 @@ if (!empty($INRSYMBOL)) { ?>
-
+ + + -
- - -
+ + +
@@ -1985,7 +1971,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
@@ -1995,14 +1981,15 @@ if (!empty($INRSYMBOL)) { ?>
-
+ + + -
- - -
+ + +
@@ -2013,7 +2000,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
@@ -2023,9 +2010,10 @@ if (!empty($INRSYMBOL)) { ?>
-
+ + + -
@@ -2049,9 +2037,9 @@ if (!empty($INRSYMBOL)) { ?>
- + - +
@@ -2060,7 +2048,7 @@ if (!empty($INRSYMBOL)) {
- +
-
+
- - + +
@@ -2100,11 +2088,11 @@ if (!empty($INRSYMBOL)) { ?>
-
+
- - + +
-
+
- - + +
@@ -2144,14 +2132,11 @@ if (!empty($INRSYMBOL)) { ?>
-
- - - +
- - + +
@@ -2169,11 +2154,11 @@ if (!empty($INRSYMBOL)) { ?>
-
+
- - + +
@@ -2191,14 +2176,14 @@ if (!empty($INRSYMBOL)) { ?>
-
- + +
- -
+ +
-
+
-
- - - + +
- + + -
@@ -2241,12 +2224,11 @@ if (!empty($INRSYMBOL)) { ?>
-
- -
+
+
- - + +
@@ -2256,12 +2238,11 @@ if (!empty($INRSYMBOL)) { ?>
-
- +
- +
Freight Type
- +
Freight Rate -

Cost Of The Product Per UOM

@@ -2319,78 +2299,63 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); echo form_input($data); ?> -
-
- - - - - - - - -
-
+
+
+ +
+
- 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
- + 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?>
-
+
-
+
+ +
- 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
- -
- - 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
- - + 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?>
+
+ + 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
+ - - -
- -
-
- +
+
+ - 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); - echo form_textarea($data); ?> -
-
-
-
- Cancel -   Update Capital -
+ 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); ?> +
+ + +
+ Cancel +   Update Capital +
- +