From 14a34002bd20fa9fadd02d0f7186fad02b81060b Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 10 Mar 2025 03:20:47 +0000 Subject: [PATCH] PO module : ps --- app/Controllers/Purchaseorder.php | 9 +- app/Controllers/Servicepurchaseorder.php | 58 +- app/Views/EditservicePurchaseorder.php | 32 +- app/Views/capitalpurchaseorder.php | 172 +++--- app/Views/editCapitalAmendPO.php | 15 +- app/Views/editCapitalPo.php | 656 ++++++++++++++++++++++- app/Views/editImportAmendPO.php | 26 +- app/Views/editRevenueAmendPO.php | 2 - app/Views/editRevenuepurchaseorder.php | 20 +- app/Views/editimportpo.php | 49 +- app/Views/importpo.php | 2 +- public/assets/js/CreatePOValidation.js | 8 +- 12 files changed, 803 insertions(+), 246 deletions(-) diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index dc0be372..3ef446ad 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1226,6 +1226,7 @@ class Purchaseorder extends BaseController $AfterSgst = $this->request->getPost('RevenueAfterSgst' . $i); $AfterIgst = $this->request->getPost('RevenueAfterIgst' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; if($itemRate != 0){ $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; @@ -1421,6 +1422,7 @@ class Purchaseorder extends BaseController $POLineItemNo = $this->request->getPost('LineItemNo' . $i); $CostCenter = $this->request->getPost('costCode' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; $LineItemNo = ''; /*---------start---------------------*/ @@ -2112,7 +2114,7 @@ class Purchaseorder extends BaseController $specialinstruction = $this->request->getPost('Addinstruction' . $i); $per = $this->request->getPost('Per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); - + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; if($itemRate != 0){ $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; @@ -2419,6 +2421,8 @@ class Purchaseorder extends BaseController $per = $this->request->getPost('Per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; + // echo $per; //die(); $LineItemNo = ''; @@ -2845,6 +2849,8 @@ class Purchaseorder extends BaseController $CapitalItemDescription = $this->request->getPost('CapitalItemDescrition' . $i); $Per = $this->request->getPost('per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; + if($itemRate != 0){ $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; @@ -3153,6 +3159,7 @@ class Purchaseorder extends BaseController $Freightrateloc = $this->request->getPost('Fvalue' . $i); $FreightAmountloc = $this->request->getPost('Afvalue' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; // echo $FreightTypeloc; // echo 'n'; // echo $FreightNoofTriploc; diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 9207e172..9b08f986 100755 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -290,6 +290,7 @@ class Servicepurchaseorder extends BaseController $OtherAmt = $this->request->getPost('OtherAmt' . $i); $TotalOrderValue = $this->request->getPost('TotalOrderValue' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; $SkipInsert = "False"; if (count($comma_separated) > 0) { @@ -316,6 +317,7 @@ class Servicepurchaseorder extends BaseController $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'ServiceMaterialDescription' => $ItemDescription, 'Per' => $Per, 'ItemNo' => $ItemNo,'LineitemAuditorNotes' => $LineitemAuditorNotes); + print_r($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); @@ -341,12 +343,13 @@ class Servicepurchaseorder extends BaseController } } } + die; echo 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; } //update service po function UpdateServicePurchaseOrder() { - // print_r($this->request->getPost());die; + // echo "
"; print_r($this->request->getPost()); echo "
"; die; $PONO = $this->request->getPost('txtPONO'); $newsup = $this->request->getPost('newsup'); // $newSupId = split("[ - ]+", $newsup); @@ -381,40 +384,34 @@ class Servicepurchaseorder extends BaseController $InsuranceNumber = $this->request->getPost('InsuranceNumber'); $ServiceTypeOptions = $this->request->getPost('PoTypeOptions'); $DescriptionOfPo = $this->request->getPost('editdescofpo'); - - $PaymentTerms = $this->request->getPost('PaymentTerms'); $OtherPayment = $this->request->getPost('Otherpayment'); - $POType = $this->request->getPost('POType'); - $BudgetType = $this->request->getPost('Budget'); - $SpcialInstruction = $this->request->getPost('ScopeofWork'); $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary'); $POStatus = $this->request->getPost('txtStatus'); - $updatedBy = $this->session->get('userId'); $RowCount = $this->request->getPost('txtRowCount'); $DeletedRow = $this->request->getPost('txtDeletedRow'); $comma_separated = explode(':', (string)$DeletedRow); - $updateddt = get_current_date_time(); $WorkStatus = $this->request->getPost('workstatus'); - $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null; // $lastPONO = $this->purchaseorder_model->lastPONO(); // $newPONO = generate_po_number($lastPONO); + // PO Master $POList = array('SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'UpdateBY' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $WorkStatus, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder); + if ($POStatus == 'ST026') { $POList['ApprovedOn'] = get_current_date_time(); $POList['ApprovedBy'] = $this->session->get('userId'); $POList['ReleasedOn'] = get_current_date_time(); $POList['ReleasedBy'] = $this->session->get('userId'); } - + // echo "
"; print_r($POList); echo "
"; die; $file = $this->request->getFile('POFile'); if ($file !== null) { @@ -441,15 +438,13 @@ class Servicepurchaseorder extends BaseController $POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList); - + // echo "pomaster".$POMaster;die; $LineItemStatus = REQITEM_NEW; if ($PODate != $b4podate) { $logpo = array('PONO' => $PONO, 'LineItemNos' => '-', 'UpdateBy' => $updatedBy, 'UpdatedOn' => $updateddt, 'oldValue' => $b4podate, 'newValue' => $PODate, 'entity' => 'PO DateChanged'); - - $this->purchaseorder_model->insertlogpo($logpo); } @@ -458,12 +453,10 @@ class Servicepurchaseorder extends BaseController //$newsupname = $newSupId[0].'-'.$newSupId[1]; //echo $newsup;die; $logpo = array('PONO' => $PONO, 'LineItemNos' => '-', 'UpdateBy' => $updatedBy, 'UpdatedOn' => $updateddt, 'oldValue' => $b4supplier, 'newValue' => $newsup, 'entity' => 'Supplier Changed'); - - $this->purchaseorder_model->insertlogpo($logpo); } } - + // echo "
"; echo($RowCount); echo "
"; die; for ($i = 1; $i <= $RowCount; $i++) { $MaterialCode = $this->request->getPost('materialCode' . $i); $Quantity = $this->request->getPost('quantity' . $i); @@ -487,23 +480,16 @@ class Servicepurchaseorder extends BaseController $OtherAmt = $this->request->getPost('OtherAmt' . $i); $Per = $this->request->getPost('per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + $LineitemAuditorNotes = ($LineitemAuditorNotes === null || $LineitemAuditorNotes === '') ? '-' : $LineitemAuditorNotes; - - - /*------------------------------*/ + /*------------------------------ Quantity update the req details --*/ //if($MaterialCode!= ''){ $ReqDetails = array('Quantity' => $Quantity, 'UpdatedBy' => $updatedBy, 'UpdatedOn' => $updateddt); - //print_r($ReqDetails); - $this->purchaseorder_model->updateReqDetails($Reqnumber, $MaterialCode, $ReqDetails); // } + /*------------------------------------------------------------------*/ - /*------------------------------*/ - - - - /*---------start---------------------*/ // if(($PODate != $b4podate )||($SupplierID != $b4supplier) || ($itemRate!=$b4rate) || // ($Quantity != $b4qty )) @@ -515,24 +501,24 @@ class Servicepurchaseorder extends BaseController // } + /*--------- Quantity log start ---------------------*/ if ($Quantity != $b4qty) { $logpo = array('PONO' => $PONO, 'LineItemNos' => $POLineItemNo, 'UpdateBy' => $updatedBy, 'UpdatedOn' => $updateddt, 'oldValue' => $b4qty, 'newValue' => $Quantity, 'entity' => 'Quantity Changed'); - - $this->purchaseorder_model->insertlogpo($logpo); } + /*--------- Quantity log ends ---------------------*/ + /*--------- Rate log start ---------------------*/ if ($itemRate != $b4rate) { $logpo = array('PONO' => $PONO, 'LineItemNos' => $POLineItemNo, 'UpdateBy' => $updatedBy, 'UpdatedOn' => $updateddt, 'oldValue' => $b4rate, 'newValue' => $itemRate, 'entity' => 'Rate Changed'); $this->purchaseorder_model->insertlogpo($logpo); } + /*--------- Rate log ends ---------------------*/ - - /*----------end--------------------*/ - + /*--------- Lineitem Section starts ---------------------*/ $POLineItem = array(); $LineItemNo = ''; @@ -552,7 +538,6 @@ class Servicepurchaseorder extends BaseController if ($SkipInsert == "False") { if (strlen((string)$POLineItemNo) == 0) { $this->requistion_model = new requistion_model(); - $RetItemNo = $this->requistion_model->getItemNumber($Reqnumber, $MaterialCode); $ItemNo = ''; @@ -560,8 +545,10 @@ class Servicepurchaseorder extends BaseController $ItemNo = $RetItemNo[0]['ItemNo']; } $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'ServiceMaterialDescription' => $ItemDescription, 'Per' => $Per, 'ItemNo' => $ItemNo,'LineitemAuditorNotes' => $LineitemAuditorNotes); + // print_r($POLineItemList);die; $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); + // print_r($POLineItem);die; if (count($POLineItem) > 0) { $LineItemNo = $POLineItem[0]['LineItemNo']; } @@ -619,18 +606,13 @@ class Servicepurchaseorder extends BaseController } } } + /*--------- Lineitem Section starts ---------------------*/ } echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; } - - - - - - /*-----------------------------------*/ function uploadfile() { diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index ba342ca7..3f054702 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -346,16 +346,13 @@ if (!empty($getlogpodtl)) { /*****************************/ - var update = ''; - - - if (update != 'null') - - { - $('#editpodiv').show(); - } else { - $('#editpodiv').hide(); - } + // var update = ''; + // if (update != 'null') + // { + // $('#editpodiv').show(); + // } else { + // $('#editpodiv').hide(); + // } /*****************************/ @@ -1536,7 +1533,7 @@ if (!empty($getlogpodtl)) { -
+ - + Material - -> + Date - -> LineItemNo Entity OldValue @@ -1570,14 +1567,14 @@ if (!empty($getlogpodtl)) { PONO ?> - + - -> LineItemNos; ?> entity ?> entity == 'PO DateChanged') { @@ -1605,10 +1602,9 @@ if (!empty($getlogpodtl)) { } ?> -
- + -->
@@ -2626,7 +2622,7 @@ if (!empty($getlogpodtl)) { var rowHtml = ` ${temp} - ${Reqnumber} + ${Reqnumber} ${materialCode} ${shorten}`; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index a9d1dedf..3d5c8b2f 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -370,13 +370,13 @@ if (!empty($INRSYMBOL)) { alert('Please Enter the Dispatch Instruction'); $('#Deliverydate').focus(); return false; - } else if ($('#ExchangeRate').val() == '') { + } else if ($('#ExchangeRt').val() == '') { alert('Please Enter the Exchange Rate'); - $('#ExchangeRate').focus(); + $('#ExchangeRt').focus(); return false; - } else if ($('#ExchangeRate').val() == 0) { + } else if ($('#ExchangeRt').val() == 0) { alert('Please Enter the Exchange Rate'); - $('#ExchangeRate').focus(); + $('#ExchangeRt').focus(); return false; } else if ($('#PlaceOforigin').val() == '') { alert('Please Enter Place Of Origin'); @@ -1293,9 +1293,9 @@ if (!empty($INRSYMBOL)) {
-
+