From e6eb446a81e8f5da86c2f1096fe9f7fd34efc66a Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 7 Mar 2025 08:30:31 +0000 Subject: [PATCH 1/8] Purchase order submit button : ps --- app/Controllers/Amendmentpurchaseorder.php | 5 +- app/Controllers/Assetdetails.php | 1 + app/Views/EditservicePurchaseorder.php | 137 +++++++++++---------- app/Views/alterpurchaseorder.php | 25 ++-- app/Views/editCapitalPo.php | 15 +-- app/Views/editImportAmendPO.php | 11 +- app/Views/editRevenueAmendPO.php | 4 +- app/Views/editServiceAmendPO.php | 10 +- app/Views/editimportpo.php | 2 +- app/Views/inwardgateregister.php | 12 +- app/Views/servicePurchaseorder.php | 6 +- public/assets/js/CreatePOValidation.js | 53 ++++---- 12 files changed, 148 insertions(+), 133 deletions(-) diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index df3325dc..ea0fc03c 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -266,7 +266,8 @@ class Amendmentpurchaseorder extends BaseController } $POType = $this->request->getPost('POType'); - $PoRange = $this->request->getPost('Range'); + $Local_Interstate = $this->request->getPost('Range'); + $PaymentTermsText = $this->request->getPost('beforePaymentTermsText'); $PaymentTerms = $this->request->getPost('PaymentTerms'); $Otherpayment = $this->request->getPost('Otherpayment'); @@ -308,7 +309,7 @@ class Amendmentpurchaseorder extends BaseController } $AmendmentNewPoNo = generate_amendment_po_number($PONO); - $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult); + $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult); $file = $this->request->getFile('POFile'); $requestfilename = $file->getName(); $PrePOFile = $this->request->getPost('PrePOFile'); diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index ec4fe370..24396451 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -435,6 +435,7 @@ class Assetdetails extends BaseController $User = $this->request->getPost('User'); $SupplierName = $this->request->getPost('SupplierName'); $DateOfPurchase = $this->request->getPost('DateOfPurchase'); + $DOpurchase = ""; if ($DateOfPurchase != '') { $DOpurchase = get_date_time_format($DateOfPurchase); } diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index ae89c7d9..ba342ca7 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 - Quantity UOM + Quantity Rate Basic Amount Tax Amount @@ -1285,7 +1285,8 @@ if (!empty($getlogpodtl)) { MaterialCode ?> MaterialName, 0, 13, "..."); echo $shortName; ?> - + + @@ -1296,9 +1297,7 @@ if (!empty($getlogpodtl)) { - LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; - } ?> + LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?> UOM ?> @@ -1309,9 +1308,9 @@ if (!empty($getlogpodtl)) { Taxamount ?> TotalValue ?> - + + + @@ -1660,7 +1659,7 @@ if (!empty($getlogpodtl)) {   Submit   OK -   Submit + @@ -2622,7 +2621,7 @@ if (!empty($getlogpodtl)) { // Taxvalue: TotalTaxValue, // TotalValue: TotalOrderValue // })); - PONOStatus = + var PONOStatus = ""; var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` @@ -2917,8 +2916,6 @@ if (!empty($getlogpodtl)) { $('#OtheritemDescription').val(''); } - var DeletedMaterialCode = ''; - var DeletedMaterialName = ''; function DeleteRow(rowid) { @@ -3152,6 +3149,7 @@ if (!empty($getlogpodtl)) { + + // Hide the edit container and show the tag + $editContainer.hide(); + $link.show(); + }); + }); + ; var DelDt = ''; - $(document).ready(function () { + $(document).ready(function() { $("#PaymentTerms").select2(); if (insuranceOpt == "1") { @@ -399,7 +402,7 @@ if (!empty($getlogpodtl)) { var capitalType = ''; - window.onload = function () { + window.onload = function() { $('#PoTypeOptions').attr("style", "pointer-events: none;"); var CapRan = ''; if (CapRan == '1') { @@ -445,7 +448,7 @@ if (!empty($getlogpodtl)) { --> + + \ No newline at end of file diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 1da2a491..9ff9c976 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2036,11 +2036,14 @@ if (!empty($getlogpodtl)) {
- -

- -

- + +

Back
@@ -4381,6 +4384,18 @@ if (!empty($getlogpodtl)) {
+ - + +