From 02635dfe1f3f8ec8f737135ba1c906bc7ec24d94 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 13 Mar 2025 07:23:59 +0000 Subject: [PATCH] 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 }); +