RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_Live bug

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-07-22 02:56:19 +00:00
parent 5743bd33c1
commit 49255ef79e
3 changed files with 312 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
app/Controllers/Purchaseorder.php
View File

@ -1056,11 +1056,10 @@ $mpdf->use_kwt = true;
} }
//This used to Create Revenue Purchase Order //This used to Create Revenue Purchase Order
function addNewPurchaseOrder() function addNewPurchaseOrder()
{ {
// print_r($this->request->getPost()); try {
// echo "@1100 i have pomaster = ".'<pre>'.print_r($this->request->getPost(),true).'</pre>'."<br>"; // Extract POST data
$POdt = $this->request->getPost('PODate'); $POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt); $PODate = get_date_time_format($POdt);
$SupplierID = $this->request->getPost('drpSupplier'); $SupplierID = $this->request->getPost('drpSupplier');
@ -1075,9 +1074,7 @@ $mpdf->use_kwt = true;
$Deliverydt = get_date_time_format($dt); $Deliverydt = get_date_time_format($dt);
$DeliverySchedule = ''; $DeliverySchedule = '';
} }
$POType = $this->request->getPost('POType');
$BudgetType = $this->request->getPost('Budget'); $BudgetType = $this->request->getPost('Budget');
//$PoRange = $this->request->getPost('txtPoRange');
$Modeofshipment = $this->request->getPost('addmodeofshipment'); $Modeofshipment = $this->request->getPost('addmodeofshipment');
$supplierreference = $this->request->getPost('addsupplierreference'); $supplierreference = $this->request->getPost('addsupplierreference');
$supplieroffno = $this->request->getPost('addsupplierofferno'); $supplieroffno = $this->request->getPost('addsupplierofferno');
@ -1085,52 +1082,40 @@ $mpdf->use_kwt = true;
$fincap = $this->request->getPost('addfincap'); $fincap = $this->request->getPost('addfincap');
$revenuetype = $this->request->getPost('PoTypeOptions'); $revenuetype = $this->request->getPost('PoTypeOptions');
$insurancestatus = $this->request->getPost('insurance'); $insurancestatus = $this->request->getPost('insurance');
if ($insurancestatus == 1) { $InsuranceNumber = ($insurancestatus == 1) ? $this->request->getPost('InsuranceNumber') : '';
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
} else {
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
}
$SpcialInstruction = $this->request->getPost('SpcialInstruction'); $SpcialInstruction = $this->request->getPost('SpcialInstruction');
$TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary'); $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary');
$POStatus = $this->request->getPost('txtStatus'); $POStatus = $this->request->getPost('txtStatus');
$CreateBy = $this->session->get('userId'); $CreateBy = $this->session->get('userId');
$RowCount = $this->request->getPost('txtRowCount'); $RowCount = $this->request->getPost('txtRowCount');
$DeletedRow = $this->request->getPost('txtDeletedRow'); $DeletedRow = $this->request->getPost('txtDeletedRow');
$comma_separated = ($DeletedRow !== null && is_string($DeletedRow)) $comma_separated = ($DeletedRow !== null && is_string($DeletedRow)) ? explode(':', $DeletedRow) : [];
? explode(':', $DeletedRow)
: [];
// echo "DeletedRow = ".$DeletedRow;
$createddt = get_current_date_time(); $createddt = get_current_date_time();
$PaymentTerms = $this->request->getPost('PaymentTerms'); $PaymentTerms = $this->request->getPost('PaymentTerms');
$OtherPayment = $this->request->getPost('Otherpayment'); $OtherPayment = $this->request->getPost('Otherpayment');
$Local_Interstate = $this->request->getPost('Range'); $Local_Interstate = $this->request->getPost('Range');
$Qualitycheck = 1; $Qualitycheck = 1;
$IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null; $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
// Generate PO Number
$lastPONO = $this->purchaseorder_model->lastPONO(); $lastPONO = $this->purchaseorder_model->lastPONO();
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
log_message('debug', 'newPONO returned: ' . $newPONO);
// PO Master // PO Master
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype); $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
// echo "@1100 i have pomaster = ".'<pre>'.print_r($POMaster,true).'</pre>'."<br>";die(); $PONO = '';
$PONO = $POMaster ? $newPONO : ""; if (count($POMaster) > 0) {
// $PONO = ''; $PONO = $POMaster[0]['PONO'];
// if (count($POMaster) > 0) { } else {
// $PONO = $POMaster[0]['PONO']; throw new \Exception('Error occurred while creating PO Master');
// } }
// $PONO = "SIA/2021-2022/10044";
// PO Line Items // PO Line Items
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
for ($i = 1; $i <= $RowCount; $i++) { for ($i = 1; $i <= $RowCount; $i++) {
$MaterialCode = $this->request->getPost('materialCode' . $i); $MaterialCode = $this->request->getPost('materialCode' . $i);
$Quantity = $this->request->getPost('quantity' . $i); $Quantity = $this->request->getPost('quantity' . $i);
$Reqnumber = $this->request->getPost('Reqnumber' . $i); $Reqnumber = $this->request->getPost('Reqnumber' . $i);
@ -1164,7 +1149,6 @@ $mpdf->use_kwt = true;
if (count($comma_separated) > 0) { if (count($comma_separated) > 0) {
for ($j = 1; $j < count($comma_separated); $j++) { for ($j = 1; $j < count($comma_separated); $j++) {
$deletedRow = $comma_separated[$j]; $deletedRow = $comma_separated[$j];
if ($deletedRow == $i) { if ($deletedRow == $i) {
$SkipInsert = "True"; $SkipInsert = "True";
break; break;
@ -1172,36 +1156,32 @@ $mpdf->use_kwt = true;
} }
} }
if ($SkipInsert == "False") { if ($SkipInsert == "False") {
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Per' => $per, 'ServiceMaterialDescription' => $revenuedescription, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter); $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Per' => $per, 'ServiceMaterialDescription' => $revenuedescription, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
// echo "@1162 i have polineitem arr ".'<pre>'.print_r($POLineItem,true).'</pre>'."<br>";
// [PONO] => SIA/2021-2022/10044
// [ReqNo] => REQ7704
// [LineItemNo] => POItem9999
// $LineItemNo = "POItem10360";
$LineItemNo = ''; $LineItemNo = '';
if (count($POLineItem) > 0) { if (count($POLineItem) > 0) {
$LineItemNo = $POLineItem[0]['LineItemNo']; $LineItemNo = $POLineItem[0]['LineItemNo'];
} else {
throw new \Exception('Error occurred while creating PO Line Item');
} }
// echo $LineItemNo; die;
// echo "POType ".$POType."<br>";
/*---------*/
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $addlog= $this->purchaseorder_model->newlogpo($logpo);
/*---------*/
if (trim((string)$POType) == REVENUE) { if (trim((string)$POType) == REVENUE) {
// echo 'Success';
$RevenueTaxList = array('LineItemNo' => $LineItemNo, 'DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'NoOfTrip' => $NOOfTrip); $RevenueTaxList = array('LineItemNo' => $LineItemNo, 'DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'NoOfTrip' => $NOOfTrip);
// echo "@1176 i have arr for tax ".'<pre>'.print_r($RevenueTaxList,true).'</pre>'."<br>";
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
// echo "@1183 i have after insertion ".'<pre>'.print_r($RevenueList,true).'</pre>'."<br>"; if (!$RevenueList) {
//echo 'Revenue tax Success'; throw new \Exception('Error occurred while creating Revenue Tax');
}
} }
} }
} }
echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
} catch (\Exception $e) {
log_message('error', 'Exception occurred: ' . $e->getMessage());
echo 'An error occurred while creating the purchase order. Please try again.';
} }
}
//This used to Edit the Revenue Purchase Order //This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder() function EditRevenuePurchaseOrder()
{ {
@ -1427,7 +1407,7 @@ $mpdf->use_kwt = true;
//echo $current_qty; //echo $current_qty;
$this->inwardgateregister_model->addmaterialmaster($current_qty, $rawmaterial); $this->inwardgateregister_model->addmaterialmaster($current_qty, $MaterialCode);
} }
if ($SkipInsert == "False") { if ($SkipInsert == "False") {
@ -1848,10 +1828,8 @@ $mpdf->use_kwt = true;
function addNewImportPurchaseOrder() function addNewImportPurchaseOrder()
{ //echo ("ggh"); {
try {
$POdt = $this->request->getPost('PODate'); $POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt); $PODate = get_date_time_format($POdt);
$SupplierID = $this->request->getPost('drpSupplier'); $SupplierID = $this->request->getPost('drpSupplier');
@ -1862,8 +1840,6 @@ $mpdf->use_kwt = true;
$DeliveryOption = $this->request->getPost('DateRange'); $DeliveryOption = $this->request->getPost('DateRange');
//echo $DeliveryOption;
//die();
$DeliverySchedule = ''; $DeliverySchedule = '';
$Dispatch = ''; $Dispatch = '';
if ($DeliveryOption == 1) { if ($DeliveryOption == 1) {
@ -1898,7 +1874,6 @@ $mpdf->use_kwt = true;
$PaymentTerms = $this->request->getPost('PaymentTerms'); $PaymentTerms = $this->request->getPost('PaymentTerms');
$OtherPayment = $this->request->getPost('Otherpayment'); $OtherPayment = $this->request->getPost('Otherpayment');
$Palaceoforigin = $this->request->getPost('PlaceOforigin'); $Palaceoforigin = $this->request->getPost('PlaceOforigin');
// $Payableat=$this->request->getPost('PayableAT');
$Shipmentmode = $this->request->getPost('addmodeofshipment'); $Shipmentmode = $this->request->getPost('addmodeofshipment');
$SupplierRef = $this->request->getPost('addsupplierreference'); $SupplierRef = $this->request->getPost('addsupplierreference');
@ -1907,50 +1882,37 @@ $mpdf->use_kwt = true;
$finCap = $this->request->getPost('addfincap'); $finCap = $this->request->getPost('addfincap');
$importoption = $this->request->getPost('Importoption'); $importoption = $this->request->getPost('Importoption');
// echo $importoption;
// die();
$Insurance = $this->request->getPost('Insurance'); $Insurance = $this->request->getPost('Insurance');
if ($Insurance == 1) { if ($Insurance == 1) {
$InsuranceNumber = $this->request->getPost('InsuranceNumber'); $InsuranceNumber = $this->request->getPost('InsuranceNumber');
} else { } else {
$InsuranceNumber = ''; $InsuranceNumber = '';
} }
// $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType);
$Qualitycheck = 1; $Qualitycheck = 1;
$IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null; $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(); $lastPONO = $this->purchaseorder_model->lastPONO();
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'Import_PlaceofOrgin' => $Palaceoforigin, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'InsuranceStatus' => $Insurance, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $POList = array('PONO' => $newPONO,'SupplierID' => $SupplierID,'TotalOrderValue' => $TotalOrder,'PODate' => $PODate,'Status' => $POStatus,'PORange' => $PoRange,'ServiceDescription' => $SpcialInstruction,'CreatedBy' => $CreateBy,'DeliveryAddress' => $DeliveryAddr,'Import_DispatchDetails' => $Dispatch,'CreatedDate' => $createddt,'DeliverySchedule' => $DeliverySchedule,'DeliveryOption' => $DeliveryOption,'ExchangeRate' => $Exchangerate,'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon,'CurrencyType' => $CurrencyType,'PaymentTerms' => $PaymentTerms,'POType' => $POType,'Import_PlaceofOrgin' => $Palaceoforigin,'PaymentOtherDescription' => $OtherPayment,'Mode_Of_Shipment' => $Shipmentmode,'Supplier_Reference' => $SupplierRef,'Supplier_Offer_No' => $SupplierOffer,'Other_Reference' => $otherRef,'Fincap' => $finCap,'InsuranceStatus' => $Insurance,'InsuranceNumber' => $InsuranceNumber,'POSubType' => $importoption,'IsQualityChkReqired' => $Qualitycheck,'BudgetType' => $BudgetType,'IsOpenOrder' => $IsOpenOrder);
//print_r($POList);
//die();
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $importoption); $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $importoption);
$PONO = $POMaster ? $newPONO : ""; $PONO = '';
// $PONO = ''; if (count($POMaster) > 0) {
// if (count($POMaster) > 0) { $PONO = $POMaster[0]['PONO'];
// $PONO = $POMaster[0]['PONO']; } else {
// } throw new \Exception('Error occurred while creating PO Master');
//echo $PONO; }
//echo $POType;
// PO Line Items
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
//echo ' test:'.REVENUE;
//echo $RowCount;
for ($i = 1; $i <= $RowCount; $i++) { for ($i = 1; $i <= $RowCount; $i++) {
//echo "AS";
$MaterialCode = $this->request->getPost('materialCode' . $i); $MaterialCode = $this->request->getPost('materialCode' . $i);
$Quantity = $this->request->getPost('quantity' . $i); $Quantity = $this->request->getPost('quantity' . $i);
//echo $Quantity;
$Reqnumber = $this->request->getPost('Reqnumber' . $i); $Reqnumber = $this->request->getPost('Reqnumber' . $i);
$itemRate = $this->request->getPost('itemRate' . $i); $itemRate = $this->request->getPost('itemRate' . $i);
//$Exchangerate = $this->request->getPost('Exchangerate'.$i);
$BasicPriceinmton = $this->request->getPost('BasicPriceinUS' . $i); $BasicPriceinmton = $this->request->getPost('BasicPriceinUS' . $i);
$Productprice = $this->request->getPost('BasicAmt' . $i); $Productprice = $this->request->getPost('BasicAmt' . $i);
$LandingCharge = $this->request->getPost('LandingChargee' . $i); $LandingCharge = $this->request->getPost('LandingChargee' . $i);
@ -1965,13 +1927,8 @@ $mpdf->use_kwt = true;
$CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i); $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i);
$QuantityKG = $this->request->getPost('PurQuantity' . $i); $QuantityKG = $this->request->getPost('PurQuantity' . $i);
//$currencytypeID = $this->request->getPost('currencytype');
$Totalvalueitem = $this->request->getPost('TotalExp' . $i); $Totalvalueitem = $this->request->getPost('TotalExp' . $i);
//echo $BasicPriceinmton;
$CostCenter = $this->request->getPost('costCode' . $i); $CostCenter = $this->request->getPost('costCode' . $i);
$AssessableValue = $this->request->getPost('AfterAssessable' . $i); $AssessableValue = $this->request->getPost('AfterAssessable' . $i);
$Subtotal = $this->request->getPost('Subtotal' . $i); $Subtotal = $this->request->getPost('Subtotal' . $i);
$Igst = $this->request->getPost('Igst' . $i); $Igst = $this->request->getPost('Igst' . $i);
@ -1980,24 +1937,14 @@ $mpdf->use_kwt = true;
$Clearingcharge = $this->request->getPost('ClearingCharges' . $i); $Clearingcharge = $this->request->getPost('ClearingCharges' . $i);
$Nettvalue = $this->request->getPost('Nett' . $i); $Nettvalue = $this->request->getPost('Nett' . $i);
$FreightType = $this->request->getPost('FreightType' . $i); $FreightType = $this->request->getPost('FreightType' . $i);
$nooftrip = $this->request->getPost('NoofTrip' . $i); $nooftrip = $this->request->getPost('NoofTrip' . $i);
$Freightrate = $this->request->getPost('FreightRate' . $i); $Freightrate = $this->request->getPost('FreightRate' . $i);
$Freightamount = $this->request->getPost('AfterFreightRate' . $i); $Freightamount = $this->request->getPost('AfterFreightRate' . $i);
//echo $Freightamount;
$specialinstruction = $this->request->getPost('Addinstruction' . $i); $specialinstruction = $this->request->getPost('Addinstruction' . $i);
//echo $specialinstruction;
$per = $this->request->getPost('Per' . $i); $per = $this->request->getPost('Per' . $i);
$SkipInsert = "False"; $SkipInsert = "False";
if (count($comma_separated) > 0) { if (count($comma_separated) > 0) {
for ($j = 1; $j < count($comma_separated); $j++) { for ($j = 1; $j < count($comma_separated); $j++) {
@ -2009,12 +1956,9 @@ $mpdf->use_kwt = true;
} }
} }
} }
if ($SkipInsert == "False") { if ($SkipInsert == "False") {
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'Per' => $per, 'ServiceMaterialDescription' => $specialinstruction); $POLineItemList = array('PONO' => $PONO,'ReqNo' => $Reqnumber,'MaterialCode' => $MaterialCode,'Quantity' => $Quantity,'Rate' => $itemRate,'Status' => $LineItemStatus,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'CostCenterCode' => $CostCenter,'Per' => $per,'ServiceMaterialDescription' => $specialinstruction);
//print_r($POLineItemList);
//die();
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -2022,30 +1966,22 @@ $mpdf->use_kwt = true;
if (count($POLineItem) > 0) { if (count($POLineItem) > 0) {
$LineItemNo = $POLineItem[0]['LineItemNo']; $LineItemNo = $POLineItem[0]['LineItemNo'];
} }
//echo $LineItemNo;
/* --------------------------------------------*/
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $this->purchaseorder_model->newlogpo($logpo);
/* --------------------------------------------*/
if (trim((string)$POType) == IMPORT) { if (trim((string)$POType) == IMPORT) {
// echo 'Success'; $ImportTaxList = array('LineItemNo' => $LineItemNo,'BasicPriceInMTon' => $BasicPriceinmton,'ProductPrice' => $Productprice,'LandingCharge' => $LandingCharge,'AfterLandingCharge' => $AfterLandingCharge,'CustomDuty' => $CustomDuty,'AfterCustomDuty' => $AfterCustomDuty,'CustomEdCess' => $CustomEd,'CustomSHCess' => $CustomSH,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'Grossdutypayable' => $Grossdutypayable,'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,'QuantityKG' => $QuantityKG,'AfterCustomSHCess' => $AfterCustomSH,'AfterCustomEdCess' => $AfterCustomEd,'TotalValue' => $Totalvalueitem,'FreightType' => $FreightType,'NoOfTrip' => $nooftrip,'FreightValue' => $Freightrate,'AfterFreightValue' => $Freightamount,'AssessableValue' => $AssessableValue,'SubTotal' => $Subtotal,'IGST' => $Igst,'AfterIGST' => $AfterIgst,'DutyImpact' => $Dutyimpact,'ClearingCharge' => $Clearingcharge,'NetValue' => $Nettvalue);
$ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $nooftrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $AssessableValue, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $Dutyimpact, 'ClearingCharge' => $Clearingcharge, 'NetValue' => $Nettvalue);
//print_r($ImportTaxList);
//die();$Nettvalue
$ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
} }
} }
} }
echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
} catch (\Exception $e) {
log_message('error', 'Exception occurred: ' . $e->getMessage());
echo 'An error occurred while creating the purchase order. Please try again.';
} }
}
function EditImportPurchaseOrder() function EditImportPurchaseOrder()
@ -2483,7 +2419,7 @@ $mpdf->use_kwt = true;
function addNewCapitalPurchaseOrder() function addNewCapitalPurchaseOrder()
{ {
try{
$POdt = $this->request->getPost('PODate'); $POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt); $PODate = get_date_time_format($POdt);
$SupplierID = $this->request->getPost('drpSupplier'); $SupplierID = $this->request->getPost('drpSupplier');
@ -2581,11 +2517,12 @@ $mpdf->use_kwt = true;
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions); $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
$PONO = $POMaster ? $newPONO : ""; $PONO = '';
// $PONO = ''; if (count($POMaster) > 0) {
// if (count($POMaster) > 0) { $PONO = $POMaster[0]['PONO'];
// $PONO = $POMaster[0]['PONO']; } else {
// } throw new \Exception('Error occurred while creating PO Master');
}
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
@ -2711,11 +2648,13 @@ $mpdf->use_kwt = true;
} }
} }
echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
} catch (\Exception $e) {
log_message('error', 'Exception occurred: ' . $e->getMessage());
echo 'An error occurred while creating the purchase order. Please try again.';
} }
}
/*Edit Capital po*/ /*Edit Capital po*/
function EditCapitalPurchaseOrder() function EditCapitalPurchaseOrder()

48
app/Models/Purchaseorder_model.php
View File

@ -400,7 +400,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$builder->where('POMast.Status !=', PO_AMENDED); $builder->where('POMast.Status !=', PO_AMENDED);
// $builder->orderBy('POMast.Status !=',PO_AMENDED); // $builder->orderBy('POMast.Status !=',PO_AMENDED);
} }
$builder->orderBy('POMast.UpdatedOn', 'desc'); $builder->orderBy('POMast.POID', 'desc');
$query = $builder->get(); $query = $builder->get();
$result = $query->getResult(); $result = $query->getResult();
@ -779,49 +779,35 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
} }
/** /**
* This function is used to add New Purchase order to the system * This function is used to add New Purchase order to the system
*/ */
// function addPOMaster($POMaster, $POType, $POSubtype) function addPOMaster($POMaster,$POType, $revenuetype)
// {
// $this->db->transStart();
// $builder = $this->db->table('T_PurchaseOrder_Master');
// $builder->insert($POMaster);
// //->update('T_PONO_Reset_Table')
// $insert_id = $this->db->affectedRows();
// $this->db->transComplete();
// if ($insert_id > 0) {
// $subQuery = 'select PONO from T_PurchaseOrder_Master where POType=? and POSubType=? and isnull(ParentPO) order by CreatedDate desc limit 1 ';
// $query = $this->db->query($subQuery, array($POType, $POSubtype));
// //print_r($query->getResult());die();
// return $query->getResultArray();
// }
// }
public function addPOMaster($POMaster)
{ {
print_r($POMaster);die;
try { try {
$this->db->transStart(); $this->db->transStart();
$builder = $this->db->table('T_PurchaseOrder_Master'); $builder = $this->db->table('T_PurchaseOrder_Master');
$builder->insert($POMaster); $builder->insert($POMaster);
$aff = $this->db->affectedRows(); $aff_row = $this->db->affectedRows();
$this->db->transComplete(); $this->db->transComplete();
return $aff; if ($aff_row > 0) {
$insertId = $aff_row > 0 ? $this->db->insertId() : 0;
$subQuery = 'SELECT PONO FROM T_PurchaseOrder_Master
WHERE POID = ? AND ParentPO IS NULL
ORDER BY CreatedDate DESC LIMIT 1';
$query = $this->db->query($subQuery, [$insertId]);
return $query->getResultArray();
}
return [];
} catch (\Exception $e) { } catch (\Exception $e) {
$this->db->transRollback(); $this->db->transRollback();
log_message('error', 'Error occurred in addPOMaster function: ' . $e->getMessage()); log_message('error', 'Error in addPOMaster: ' . $e->getMessage());
throw $e;
return false; return false;
} }
} }
function addAmendPOMaster($POMaster, $CreatedBy, $ParentPO) function addAmendPOMaster($POMaster, $CreatedBy, $ParentPO)
{ {
// print_r($POMaster); // print_r($POMaster);

3
app/Views/POlist.php
View File

@ -151,9 +151,6 @@
"paging": true, "paging": true,
"ordering": true, "ordering": true,
"scrollCollapse": true, "scrollCollapse": true,
"aaSorting": [
[3, "desc"]
],
"searching": true, "searching": true,
//"columnDefs" : [{"targets":3, "type":"date"}], //"columnDefs" : [{"targets":3, "type":"date"}],