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

changes in amendment purchase order-1 vadivel J 25-11-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-11-25 18:20:28 +05:30
parent 4a2b74afbf
commit fc82edfcfd
16 changed files with 232 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Config/Routes.php
View File

@ -135,6 +135,7 @@ $routes->post('editdepartment', 'Department::editdepartment');
$routes->get('exportdepartment', 'Department::exportdepartment');
$routes->get('reActivateDepartment', 'Department::reActivateDepartment');
$routes->get('deleteDepartment', 'Department::deleteDepartment');
$routes->post('checkDepartmentName', "Department::checkDepartmentName");
$routes->get('batchcard/getHistListing', 'Batchcard::getHistListing');
@ -416,12 +417,13 @@ $routes->post('checkTransporter', 'Supplier::checkTransporter');
//Factory Machine Master Routes
$routes->post('createFactoryMachineMasterDetails', 'FactoryMachineController::createFactoryMachineMasterDetails');
$routes->get('readFactoryMachineMasterDetails', 'FactoryMachineController::readFactoryMachineMasterDetails');
$routes->get('readFactoryMachineMasterDetailsById', 'FactoryMachineController::readFactoryMachineMasterDetailsById');
$routes->post('updateFactoryMachineMasterDetails', 'FactoryMachineController::updateFactoryMachineMasterDetails');
$routes->get('deleteFactoryMachineMasterDetails', 'FactoryMachineController::deleteFactoryMachineMasterDetails');
$routes->post('createFactoryMachineMasterDetails' , 'FactoryMachineController::createFactoryMachineMasterDetails');
$routes->get('readFactoryMachineMasterDetails' , 'FactoryMachineController::readFactoryMachineMasterDetails');
$routes->get('readFactoryMachineMasterDetailsById ' ,'FactoryMachineController::readFactoryMachineMasterDetailsById');
$routes->post('updateFactoryMachineMasterDetails ','FactoryMachineController::updateFactoryMachineMasterDetails');
$routes->get('deleteFactoryMachineMasterDetails' , 'FactoryMachineController::deleteFactoryMachineMasterDetails');
$routes->get('reActivateFactoryMachineMasterDetails', 'FactoryMachineController::reActivateFactoryMachineMasterDetails');
$routes->post('checkMachineName' ,'FactoryMachineController::checkMachineName');
$routes->get('loadView_createFactoryMachineMasterDetail', 'FactoryMachineController::loadView_createFactoryMachineMasterDetail');
$routes->get('loadView_updateFactoryMachineMasterDetail', 'FactoryMachineController::loadView_updateFactoryMachineMasterDetail');

58
app/Controllers/Amendmentpurchaseorder.php
View File

@ -58,7 +58,7 @@ class Amendmentpurchaseorder extends BaseController
$data['POData'] = $this->purchaseorder_model->purchaseorderListing($forwhat,$fromDate,$toDate);
$data['fromDate'] = date('d-m-Y', strtotime($fromDate));
$data['toDate'] = date('d-m-Y', strtotime($toDate));
$data['toDate'] = date('d-m-Y', strtotime($toDate));
$this->global['pageTitle'] = 'Amendment Purchase Order';
@ -231,6 +231,7 @@ class Amendmentpurchaseorder extends BaseController
{
$NewPO = '';
$MAD = '';
// $changeStatus ,will havestatus code itself provided from front-end , no need of constants
$changeStatus = $this->request->getPost('changeStatus');
$PONO = $this->request->getPost('txtPONO');
$POdt = $this->request->getPost('PODate');
@ -307,7 +308,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 == 1 ? PO_RELEASED : PO_DRAFT, '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' => $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);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
@ -345,9 +346,9 @@ class Amendmentpurchaseorder extends BaseController
$NewPO = "";
}
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
// $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
$APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
// $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
$LineItemStatus = REQITEM_NEW;
@ -582,7 +583,7 @@ class Amendmentpurchaseorder extends BaseController
echo 'Purchase Order Amended Successfully! PO Number Is: ' . $PONO . '- New PO Number is' . $NewPO;
}
/**
@ -592,6 +593,7 @@ class Amendmentpurchaseorder extends BaseController
{
$PONO = $this->request->getPost('txtPONO');
$changeStatus = $this->request->getPost('changeStatus');
$MAD = '';
$POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt);
@ -670,7 +672,7 @@ class Amendmentpurchaseorder extends BaseController
}
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' =>$changeStatus , 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$PrePOFile = $this->request->getPost('PrePOFile');
$requestfilename = $file ? $file->getName() : null;
@ -701,9 +703,9 @@ class Amendmentpurchaseorder extends BaseController
}
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
// $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
$APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
// $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
$LineItemStatus = REQITEM_NEW;
@ -874,6 +876,7 @@ class Amendmentpurchaseorder extends BaseController
*/
function EditAmendCapitalPurchaseOrder()
{
$changeStatus = $this->request->getPost('changeStatus');
$PONO = $this->request->getPost('txtPONO');
$MAD = '';
$DeliverySchedule = '';
@ -990,7 +993,8 @@ class Amendmentpurchaseorder extends BaseController
}
$updatedBy = $this->session->get('userId');
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' =>$changeStatus , 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file ? $file->getName() : null;
$PrePOFile = $this->request->getPost('PrePOFile');
@ -1020,14 +1024,12 @@ class Amendmentpurchaseorder extends BaseController
$NewPO = $LastPO[0]['PONO'];
}
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
$APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
//$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
// $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
$LineItemStatus = REQITEM_NEW;
$igrvalue = $this->purchaseorder_model->selectigrmaster($PONO);
@ -1299,7 +1301,7 @@ class Amendmentpurchaseorder extends BaseController
$POdt = '';
$createddt = '';
$changeStatus = $this->request->getPost('changeStatus');
$PODate = get_date_time_format($POdt);
$SupplierID = $this->request->getPost('drpSupplier');
$DeliveryAddr = $this->request->getPost('DeliveryAddr');
@ -1384,7 +1386,7 @@ class Amendmentpurchaseorder extends BaseController
$MAD .= $MAD . "Current Place of Origin:&nbsp;&nbsp;" . $beforePalaceoforigin . "<br>";
}
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, '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, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $changeStatus , '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, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
@ -1413,9 +1415,9 @@ class Amendmentpurchaseorder extends BaseController
foreach ($LastPO as $PO) :
$NewPO = $PO['PONO'];
endforeach;
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
// $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
$APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
// $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
$LineItemStatus = REQITEM_NEW;
@ -1537,31 +1539,31 @@ class Amendmentpurchaseorder extends BaseController
}
if (($LandingCharge - $beforeLandingCharge) != 0) {
if (((float)($LandingCharge) - (float)($beforeLandingCharge)) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Landing percentage : " . $beforeLandingCharge . "</td><td>Revised Landing Percentage:" . $LandingCharge . "</td></tr>";
}
if (($CustomDuty - $beforeCustomDuty) != 0) {
if (((float)($CustomDuty) - (float)($beforeCustomDuty)) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current CustomDuty : " . $beforeCustomDuty . "</td><td>Revised CustomDuty:" . $CustomDuty . "</td></tr>";
}
if ($CustomEd - $beforeCustomEd) {
if ( (float)($CustomEd) - (float)($beforeCustomEd)) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current CustomEd : " . $beforeCustomEd . "</td><td>Revised CustomEd:" . $CustomEd . "</td></tr>";
}
if ($CustomSH - $beforeCustomSH) {
if ( (float)($CustomSH) - (float)($beforeCustomSH)) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current CustomSH : " . $beforeCustomSH . "</td><td>Revised CustomSH:" . $CustomSH . "</td></tr>";
}
if ($FreightType != $beforeFreightType) {
if ( (float)($FreightType) != (float)($beforeFreightType)) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Freight Type: " . $beforeFreightType . "</td><td>Revised Freight Type:" . $FreightType . "</td></tr>";
@ -1573,13 +1575,13 @@ class Amendmentpurchaseorder extends BaseController
$CAD = $CAD . "<tr><td>Current No of Trip: " . $beforeNoOfTrip . "</td><td>Revised Additional Excise duty:" . $NoOfTrip . "</td></tr>";
}
if ($Freightrate - $beforeFreightrate) {
if ((float)$Freightrate - (float)$beforeFreightrate) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Freightrate: " . $beforeFreightrate . "</td><td>Revised Freightrate:" . $Freightrate . "</td></tr>";
}
if ($Freightamount - $beforeFreightamount) {
if ((float)$Freightamount - (float)$beforeFreightamount) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Freight Amount: " . $beforeFreightamount . "</td><td>Revised Freight Amount:" . $Freightamount . "</td></tr>";
@ -1591,22 +1593,22 @@ class Amendmentpurchaseorder extends BaseController
$CAD = $CAD . "<tr><td>Current Per Value: " . $beforeper . "</td><td>Revised Per Value:" . $per . "</td></tr>";
}
if (($Assable - $beforeAssable) != 0) {
if (((float)$Assable - (float)$beforeAssable) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Assessable : " . $beforeAssable . "</td><td>Revised CustomDuty:" . $Assable . "</td></tr>";
}
if (($Subtotal - $beforeSubtotal) != 0) {
if (( (float)$Subtotal - (float)$beforeSubtotal) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Subtotal : " . $beforeSubtotal . "</td><td>Revised Subtotal:" . $Subtotal . "</td></tr>";
}
if (($Igst - $beforeIgst) != 0) {
if (( (float)$Igst - (float)$beforeIgst) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current IGST Percentage : " . $beforeIgst . "</td><td>Revised IGST Percentage:" . $Igst . "</td></tr>";
}
if (($Grossdutypayable - $beforeGrossdutypayable) != 0) {
if (((float)$Grossdutypayable - (float)$beforeGrossdutypayable) != 0) {
$rowspanvalue++;
$CAD = $CAD . "<tr><td>Current Gross Duty Payable : " . $beforeGrossdutypayable . "</td><td>Revised Gross Duty Payable:" . $Grossdutypayable . "</td></tr>";
}

10
app/Controllers/Department.php
View File

@ -246,4 +246,14 @@ class Department extends BaseController
$writer->save('php://output');
exit;
}
function checkDepartmentName(){
$data = $this->request->getPost();
$departmentName = $data['departmentName'];
$result = $this->department_model->checkDepartmentName($departmentName);
return $this->response->setJSON($result);
}
}

35
app/Controllers/FactoryMachineController.php
View File

@ -30,28 +30,7 @@ class FactoryMachineController extends BaseController
//
}
public function createFactoryMachineMasterDetails(){
$this->global['pageTitle'] = 'Create Factory Machine ';
$postData=[
'machine_name'=> $this->request->getPost('machineName'),
'machine_type'=> $this->request->getPost('machineType'),
'energy_type' => $this->request->getPost('energyType'),
];
$data = $this->factoryMachineMaster_model->insert($postData);
return redirect()->to('/readFactoryMachineMasterDetails');
}
public function loadView_createFactoryMachineMasterDetail(){
@ -172,4 +151,16 @@ class FactoryMachineController extends BaseController
}
public function checkMachineName(){
$data = $this->request->getPost();
$machineName = $data['machineName'];
$result = $this->factoryMachineMaster_model->where('machine_name',$machineName)->find();
return $this->response->setJSON($result);
}
}

4
app/Controllers/User.php
View File

@ -918,7 +918,7 @@ class User extends BaseController
// }
// else
// {
$data['EmpList'] = $this->user_model->getAllEmployees();
$data['EmpList'] = $this->user_model->rolesNotAllotedEmployees();
$data['roles'] = $this->user_model->getUserRoles();
$data['Department'] = json_decode(json_encode($this->department_model->departmentListing()), true);
@ -1051,7 +1051,7 @@ class User extends BaseController
$access = $this->user_model->addAccess($userdept);
if ($access > 0) {
echo "Successfully Added";
}
};
}

14
app/Models/Department_model.php
View File

@ -148,10 +148,16 @@ function getdepcode()
$res = $this->db->affectedRows();
return $res;
}
function checkDepartmentName($departmentName){
$builder = $this->db->table('t_departmentdetails')
->where('DepartmentName', $departmentName);
$query = $builder->get();
$result =$query->getResultArray();
return $result;
}
}
?>

2
app/Models/Purchaseorder_model.php
View File

@ -849,7 +849,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
return $query->getResultArray();
} else {
return false;
return [];
}
}

16
app/Models/User_model.php
View File

@ -225,6 +225,22 @@ class User_model extends Model
return $query->getResult();
}
function rolesNotAllotedEmployees(){
{
$builder = $this->db->table('t_employee_details EMP')
->select('EMP.EmpID, EMP.FirstName, EMP.LastName, EMP.Designation, EMP.EmailId, EMP.ContactNumber, DEPT.DEPCode, DEPT.DepartmentName')
->join('t_departmentdetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->join('tbl_users U', 'EMP.EmpID = U.EmpID', 'left')
->where('EMP.IsActive', 1)
->where('U.EmpID IS NULL');
$query = $builder->get();
return $query->getResult();
}
}
function addAccess($userdept)
{

4
app/Views/EditservicePurchaseorder.php
View File

@ -1482,9 +1482,9 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>

50
app/Views/adddepartment.php
View File

@ -55,12 +55,13 @@
</select>
</div>
<div class="col-md-4 d-flex align-items-center">
<input type="checkbox" id="IsActive" name="IsActive" style="margin-top: 16px;">
<span for="Active" style="margin-top: 16px;">&nbsp;&nbsp;&nbsp;Is Active</span>
</div>
</div>
</div>
<div class="col-md-4 d-flex align-items-center">
<input type="hidden"
value="1"
id="IsActive" name="IsActive" style="margin-top: 16px;">
</div>
</div>
</div>
<div class="col-md-12 text-right">
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
@ -149,4 +150,41 @@
// return false;
// return true;
// }
</script>
<script>
$("#DepartmentName").on('change',function(){
let departmentName = $("#DepartmentName").val();
$('#loader').show();
$.ajax({
type:"POST",
data:{departmentName},
url:"<?php echo base_url();?>checkDepartmentName",
success:function(data){
if(data && data.length >0){
let isActive = data[0].IsActive;
if(isActive == 1){
alert("Department name already Exists ..!! ");
}else{
alert("Department Name already Existing in the deleted section.!!");
}
window.location.reload();
}
},
error:function(error){
console.log("error occured..!!")
console.error(error);
},
complete:function(){
$('#loader').hide();
console.log("ajax call is completed..!!")
}
})
})
</script>

23
app/Views/editCapitalAmendPO.php
View File

@ -1623,10 +1623,12 @@ if (!empty($POItem) && $CapitalRange == '1') {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="button" class="btn btn-success" value="Cancel"
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';"
style="margin-right:10px">
<a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span
<a class="btn btn-primary Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
@ -3409,7 +3411,7 @@ Calculate Landing charge
}
function Save() {
function Save(status) {
//alert('save function');
// stat = '<?php echo PO_CREATED; ?>';
@ -3475,6 +3477,18 @@ Calculate Landing charge
formData.append('PaymentMethod', PaymentMethod);
formData.append('PayableAT', PayableAT);
formData.append('PaymentDate', PaymentDate);
if (status == 0) { // for draft
formData.append('changeStatus','ST014');
console.log("status",status);
};
if (status == 1) { // for approve
formData.append('changeStatus','ST026');
console.log("status",status);
};
$('#loader').show();
$.ajax({
@ -3494,8 +3508,7 @@ Calculate Landing charge
$('#txtDeletedRow').val('');
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('');
window.location = "amendmentpurchaseorder";
window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
} else {
$('#loader').hide();
alert("Error");

22
app/Views/editImportAmendPO.php
View File

@ -157,7 +157,7 @@ if (!empty($POMaster)) {
}
//$AvilableBudget=0;
//echo $InsuranceStatus;
$SavedSum = $Orderedsum * $ExchangeRate;
$SavedSum = (int)$Orderedsum * (int)$ExchangeRate;
//echo $SavedSum;
$AvilableBudget = $SavedSum + $AvlAmount;
//echo $AvilableBudget;
@ -1529,7 +1529,8 @@ if (!empty($RequistionDetails)) {
<?php //if($PONOStatus == PO_DRAFT) {
?>
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-primary" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<!-- <input type="reset" class="btn btn-success" value="Reset"> -->
<?php //}else {
@ -2927,6 +2928,13 @@ if (!empty($RequistionDetails)) {
$('#loader').show();
var formData = new FormData($('.ImportPO')[0]);
if (status == 0) { // for draft
formData.append('changeStatus','STO14');
};
if (status == 1) { // for approve
formData.append('changeStatus','STO26');
};
$.ajax({
// data:$('.ImportPO').serialize(),
data: formData,
@ -2941,16 +2949,24 @@ if (!empty($RequistionDetails)) {
if (data) {
// $('#content').loader('hide');
alert(data);
console.log(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
//$('#SpcialInstruction').val('');
//$('#txtDeliveryAddress').val('');
window.location = "amendmentpurchaseorder";
// window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
} else {
alert("Error");
}
},
error : function (){
console.error(error);
},
complete : function (){
console.log("ajax call is completed ");
}
});

3
app/Views/editRevenueAmendPO.php
View File

@ -2572,6 +2572,7 @@ if (!empty($INRSYMBOL)) {
if (status == 1) { // for approve
formData.append('changeStatus','STO26');
};
$('#loader').show();
$.ajax({
// data:$('.CreatePO').serialize(),
@ -2590,7 +2591,7 @@ if (!empty($INRSYMBOL)) {
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('')
window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
window.location = (status == 1) ? "amendmentpurchaseorder" : "purchaseorderListing";
} else {
$('#loader').hide();

29
app/Views/editServiceAmendPO.php
View File

@ -1269,10 +1269,11 @@ foreach ($PaymentTerms as $TER) {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-success Save " ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-primary Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Draft</span></a>
<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
@ -2180,7 +2181,7 @@ foreach ($PaymentTerms as $TER) {
//
</script>
<script>
function Save() {
function Save(status) {
stat = '<?php echo PO_CREATED; ?>';
// stat = '<?php echo PO_RELEASED; ?>';
tinyMCE.triggerSave();
@ -2214,6 +2215,12 @@ foreach ($PaymentTerms as $TER) {
} else {
// $('#content').loader('show');
var formData = new FormData($('.ServicePO')[0]);
if (status == 0) { // for draft
formData.append('changeStatus','STO14');
};
if (status == 1) { // for approve
formData.append('changeStatus','STO26');
};
$('#loader').show();
$.ajax({
// data: $('.ServicePO').serialize(),
@ -2231,11 +2238,18 @@ foreach ($PaymentTerms as $TER) {
$('#txtStatus').val('');
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('')
window.location = "amendmentpurchaseorder";
window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
} else {
$('#loader').hide();
alert("Error");
console.error("Error");
}
},
error : function (error){
console.log("error occurred" , error);
},
complete : function (){
console.log("Ajax call is completed ..!!");
}
});
}
@ -2243,6 +2257,9 @@ foreach ($PaymentTerms as $TER) {
// }
}
// this function is used to clear data changing schedule option
$('#Scheduleby').change(function() {

2
app/Views/editimportpo.php
View File

@ -130,7 +130,7 @@ if (!empty($POMaster)) {
$PONOStatus = $Req->StatusCode;
$PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription;
$ExchangeRate = number_format(($Req->ExchangeRate), 2);
$ExchangeRate = number_format(((int)$Req->ExchangeRate), 2);
//echo "$ExchangeRate";
$EDt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateCalculatedon = $EDt->format('d-m-Y');

34
app/Views/factoryMachineMasterDetailsForm.php
View File

@ -109,3 +109,37 @@ $energyType=$masterData['energy_type']??'';
</div> <!-- content -->
</div>
<script>
$('#machineName').on('change',function(){
let machineName = $(this).val();
$('#loader').show();
$.ajax({
type:"POST",
url:"<?php echo base_url();?>/checkMachineName",
data:{machineName},
success : function(data){
if(data && data.length > 0 ){
let isActive = data[0].is_active;
if(isActive == 1){
alert("Machine Name already existing ..!!");
$('#machineName').val('');
}else{
alert("Machine Name already existing in the deleted section ..!!");
$('#machineName').val('');
}
}
},
error : function (error){
console.log("error ocurred..!!");
console.error(error);
},
complete : function (){
$('#loader').hide();
console.log("ajax call is finished..!!");
}
})
})
</script>