diff --git a/app/Config/Routes.php b/app/Config/Routes.php index ac5b0e9b..da61975b 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -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'); diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index 70787293..ed56d7c3 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -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:  " . $beforePalaceoforigin . "
"; } $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 . "Current Landing percentage : " . $beforeLandingCharge . "Revised Landing Percentage:" . $LandingCharge . ""; } - if (($CustomDuty - $beforeCustomDuty) != 0) { + if (((float)($CustomDuty) - (float)($beforeCustomDuty)) != 0) { $rowspanvalue++; $CAD = $CAD . "Current CustomDuty : " . $beforeCustomDuty . "Revised CustomDuty:" . $CustomDuty . ""; } - if ($CustomEd - $beforeCustomEd) { + if ( (float)($CustomEd) - (float)($beforeCustomEd)) { $rowspanvalue++; $CAD = $CAD . "Current CustomEd : " . $beforeCustomEd . "Revised CustomEd:" . $CustomEd . ""; } - if ($CustomSH - $beforeCustomSH) { + if ( (float)($CustomSH) - (float)($beforeCustomSH)) { $rowspanvalue++; $CAD = $CAD . "Current CustomSH : " . $beforeCustomSH . "Revised CustomSH:" . $CustomSH . ""; } - if ($FreightType != $beforeFreightType) { + if ( (float)($FreightType) != (float)($beforeFreightType)) { $rowspanvalue++; $CAD = $CAD . "Current Freight Type: " . $beforeFreightType . "Revised Freight Type:" . $FreightType . ""; @@ -1573,13 +1575,13 @@ class Amendmentpurchaseorder extends BaseController $CAD = $CAD . "Current No of Trip: " . $beforeNoOfTrip . "Revised Additional Excise duty:" . $NoOfTrip . ""; } - if ($Freightrate - $beforeFreightrate) { + if ((float)$Freightrate - (float)$beforeFreightrate) { $rowspanvalue++; $CAD = $CAD . "Current Freightrate: " . $beforeFreightrate . "Revised Freightrate:" . $Freightrate . ""; } - if ($Freightamount - $beforeFreightamount) { + if ((float)$Freightamount - (float)$beforeFreightamount) { $rowspanvalue++; $CAD = $CAD . "Current Freight Amount: " . $beforeFreightamount . "Revised Freight Amount:" . $Freightamount . ""; @@ -1591,22 +1593,22 @@ class Amendmentpurchaseorder extends BaseController $CAD = $CAD . "Current Per Value: " . $beforeper . "Revised Per Value:" . $per . ""; } - if (($Assable - $beforeAssable) != 0) { + if (((float)$Assable - (float)$beforeAssable) != 0) { $rowspanvalue++; $CAD = $CAD . "Current Assessable : " . $beforeAssable . "Revised CustomDuty:" . $Assable . ""; } - if (($Subtotal - $beforeSubtotal) != 0) { + if (( (float)$Subtotal - (float)$beforeSubtotal) != 0) { $rowspanvalue++; $CAD = $CAD . "Current Subtotal : " . $beforeSubtotal . "Revised Subtotal:" . $Subtotal . ""; } - if (($Igst - $beforeIgst) != 0) { + if (( (float)$Igst - (float)$beforeIgst) != 0) { $rowspanvalue++; $CAD = $CAD . "Current IGST Percentage : " . $beforeIgst . "Revised IGST Percentage:" . $Igst . ""; } - if (($Grossdutypayable - $beforeGrossdutypayable) != 0) { + if (((float)$Grossdutypayable - (float)$beforeGrossdutypayable) != 0) { $rowspanvalue++; $CAD = $CAD . "Current Gross Duty Payable : " . $beforeGrossdutypayable . "Revised Gross Duty Payable:" . $Grossdutypayable . ""; } diff --git a/app/Controllers/Department.php b/app/Controllers/Department.php index b731caeb..79866a19 100755 --- a/app/Controllers/Department.php +++ b/app/Controllers/Department.php @@ -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); + + } + } diff --git a/app/Controllers/FactoryMachineController.php b/app/Controllers/FactoryMachineController.php index 886423d6..1f2eb513 100644 --- a/app/Controllers/FactoryMachineController.php +++ b/app/Controllers/FactoryMachineController.php @@ -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); + + + } } diff --git a/app/Controllers/User.php b/app/Controllers/User.php index 5bad7be3..11b76339 100755 --- a/app/Controllers/User.php +++ b/app/Controllers/User.php @@ -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"; - } + }; } diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php index d5428328..97309b19 100755 --- a/app/Models/Department_model.php +++ b/app/Models/Department_model.php @@ -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; + } + + } ?> \ No newline at end of file diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index 754984cc..8f4f7f18 100755 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -849,7 +849,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, return $query->getResultArray(); } else { - return false; + return []; } } diff --git a/app/Models/User_model.php b/app/Models/User_model.php index 1d29f2be..46865ad9 100755 --- a/app/Models/User_model.php +++ b/app/Models/User_model.php @@ -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) { diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 95154ec3..658a806a 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1482,9 +1482,9 @@ if (!empty($getlogpodtl)) { -   Cancel +   Cancel -   Save +   Save As Draft   Submit   Approve diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php index 3d5cab9f..db26a475 100755 --- a/app/Views/adddepartment.php +++ b/app/Views/adddepartment.php @@ -55,12 +55,13 @@ -
- -    Is Active -
- - +
+ +
+ +
@@ -149,4 +150,41 @@ // return false; // return true; // } + + + \ No newline at end of file diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 15ac367d..ebcaaeb8 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -1623,10 +1623,12 @@ if (!empty($POItem) && $CapitalRange == '1') { - -     Draft +   Submit @@ -3409,7 +3411,7 @@ Calculate Landing charge } - function Save() { + function Save(status) { //alert('save function'); // stat = ''; @@ -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"); diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index 79b55514..dcc10abe 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -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)) { -   Cancel +   Cancel +   Draft   Submit " /> - - -   Submit + + +   Draft +   Submit
@@ -2180,7 +2181,7 @@ foreach ($PaymentTerms as $TER) { // \ No newline at end of file