From 14d177c4936c038627836edca46a96d9d8a38309 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 21 Nov 2024 16:37:40 +0530 Subject: [PATCH] changes in master details-2 vadivel J 21-11-2024 --- app/Config/Routes.php | 383 +++++++++++++++--------------- app/Controllers/Assetdetails.php | 8 + app/Models/Assetdetails_model.php | 20 +- app/Views/addasset.php | 39 +++ app/Views/assetListing.php | 22 +- app/Views/costListing.php | 4 +- app/Views/editOldasset.php | 41 ++++ 7 files changed, 311 insertions(+), 206 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7a724f16..f06a823c 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -17,11 +17,11 @@ $routes->get('logout', 'User::logout'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'loadChangePass', 'User::loadChangePass'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'changePassword', 'User::changePassword'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userChangePassword', 'User::userChangePassword'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'pageNotFound', 'User::pageNotFound'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'checkEmailExists', 'User::checkEmailExists'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'forgotPassword', 'Login::forgotPassword'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'resetPasswordUser', 'Login::resetPasswordUser'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'resetPasswordConfirmUser', 'Login::resetPasswordConfirmUser'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'pageNotFound', 'User::pageNotFound'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'checkEmailExists', 'User::checkEmailExists'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'forgotPassword', 'Login::forgotPassword'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'resetPasswordUser', 'Login::resetPasswordUser'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'resetPasswordConfirmUser', 'Login::resetPasswordConfirmUser'); $routes->post('user/Adduserdepartment', 'User::Adduserdepartment'); $routes->post('user/Deleteuserdepartment', 'User::Deleteuserdepartment'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'resetPasswordConfirmUser/(:any)', 'Login::resetPasswordConfirmUser/$1'); @@ -33,45 +33,45 @@ $routes->get('reports', 'Report::index'); // User Routes $routes->get('addNew', 'User::addNew'); $routes->post('fetchEmployeeDetails', 'User::fetchEmployeeDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addNewUser', 'User::addNewUser'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'userListing', 'User::userListing'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'userListing/(:num)', 'User::userListing/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addNewUser', 'User::addNewUser'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userListing', 'User::userListing'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userListing/(:num)', 'User::userListing/$1'); $routes->get('user/editOld', 'User::editOld'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editUser', 'User::editUser'); -$routes->post('user/Deleteuserdepartment','User::Deleteuserdepartment'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editUser', 'User::editUser'); +$routes->post('user/Deleteuserdepartment', 'User::Deleteuserdepartment'); $routes->post('user/deleteUser', 'User::deleteUser'); // Supplier Routes $routes->get('supplierlisting', 'Supplier::index'); // list supplier $routes->add('addsupplier', 'Supplier::addsupplier');//load add supplier page -$routes->get('viewsupplier','Supplier::viewsupplier');// load edit supplier page +$routes->get('viewsupplier', 'Supplier::viewsupplier');// load edit supplier page $routes->post('editsupplier', 'Supplier::updatesupplierdetails'); //save supplier details $routes->post('addNewsupplier', 'Supplier::savesupplierdetails'); // update supplier details -$routes->post('supplierExist','Supplier::checksupplier'); -$routes->get('exportsupplier','Supplier::exportsupplier'); // export supplier details -$routes->post('deletesupplier','Supplier::deletesupplier'); -$routes->post('reActivateSupplier','Supplier::reActivateSupplier'); +$routes->post('supplierExist', 'Supplier::checksupplier'); +$routes->get('exportsupplier', 'Supplier::exportsupplier'); // export supplier details +$routes->post('deletesupplier', 'Supplier::deletesupplier'); +$routes->post('reActivateSupplier', 'Supplier::reActivateSupplier'); // Material Master Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addRawmaterial', 'Rawmaterialdetails::addRawMaterial'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addNewRawmaterial', 'Rawmaterialdetails::addNewRawMaterial'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'rawmaterialListing', 'Rawmaterialdetails::rawmaterialListing'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'rawmaterialListing/(:num)', 'Rawmaterialdetails::rawmaterialListing/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addRawmaterial', 'Rawmaterialdetails::addRawMaterial'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addNewRawmaterial', 'Rawmaterialdetails::addNewRawMaterial'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'rawmaterialListing', 'Rawmaterialdetails::rawmaterialListing'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'rawmaterialListing/(:num)', 'Rawmaterialdetails::rawmaterialListing/$1'); -$routes->post('materialExist','Rawmaterialdetails::checkmaterial'); -$routes->get('viewRawmaterial','Rawmaterialdetails::viewRawmaterial'); +$routes->post('materialExist', 'Rawmaterialdetails::checkmaterial'); +$routes->get('viewRawmaterial', 'Rawmaterialdetails::viewRawmaterial'); $routes->post('rawmaterialdetails/editRawmaterial', 'Rawmaterialdetails::editRawmaterial'); $routes->post('rawmaterialdetails/addMaterialCategories', 'Rawmaterialdetails::addMaterialCategories'); -$routes->get('exportmaterial' , 'Rawmaterialdetails::exportmaterial'); -$routes->get('rawmaterialdetailsautocomplete' , 'Rawmaterialdetails::autocomplete'); +$routes->get('exportmaterial', 'Rawmaterialdetails::exportmaterial'); +$routes->get('rawmaterialdetailsautocomplete', 'Rawmaterialdetails::autocomplete'); $routes->post('deleteMaterial', 'Rawmaterialdetails::deleteMaterial'); $routes->post('reActivateMaterial', 'Rawmaterialdetails::reActivateMaterial'); // Cost Center Routes $routes->get('costListing', 'CostCenter::index'); $routes->post('fetchCostCenterDetails', 'CostCenter::fetchCostCenterDetails');// for Ajax both add and edit.... -$routes->get('reActivateCostCenter','CostCenter::reActivateCostCenter'); +$routes->get('reActivateCostCenter', 'CostCenter::reActivateCostCenter'); $routes->get('deleteCostCenter', 'CostCenter::deleteCostCenter'); $routes->post('checkCostCenter', 'CostCenter::checkCostCenter'); $routes->get('exportcost', 'CostCenter::exportcost'); @@ -79,17 +79,18 @@ $routes->get('exportcost', 'CostCenter::exportcost'); // Asset Detail Routes $routes->get('assetListing', 'Assetdetails::assetListing'); $routes->get('addasset', 'Assetdetails::addasset'); -$routes->post('assetdetails/getpodetails','Assetdetails::getpodetails'); -$routes->post('assetdetails/getline','Assetdetails::getline'); +$routes->post('assetdetails/getpodetails', 'Assetdetails::getpodetails'); +$routes->post('assetdetails/getline', 'Assetdetails::getline'); $routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset'); $routes->get('assetdetails/deleteAsset', 'Assetdetails::deleteAsset'); $routes->get('assetdetails/reActivateAsset', 'Assetdetails::reActivateAsset'); +$routes->post('assetdetails/checkAssetName', 'Assetdetails::checkAssetName'); //uncommenting addNewAsset $routes->post('addNewasset', 'Assetdetails::addNewasset'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset', 'Assetdetails::editasset'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset/(:num)', 'Assetdetails::editasset/$1'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editasset', 'Assetdetails::editasset'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editOldasset', 'Assetdetails::editasset'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editOldasset/(:num)', 'Assetdetails::editasset/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editasset', 'Assetdetails::editasset'); $routes->get('exportasset', 'Assetdetails::exportasset'); // Employee Detail Routes @@ -99,12 +100,12 @@ $routes->post('deleteEmployeeFile', 'Employeedetails::deleteEmployeeFile'); $routes->get('employeeListing', 'Employeedetails::index'); $routes->get('employeedetails/ViewEmployee', 'Employeedetails::ViewEmployee'); $routes->post('employeedetails/UpdateEmployee', 'Employeedetails::UpdateEmployee'); -$routes->get('exportemployee','Employeedetails::exportemployee'); +$routes->get('exportemployee', 'Employeedetails::exportemployee'); -$routes->post('employeeEmailExist','Employeedetails::CheckEmail'); -$routes->post('employeePANExist','Employeedetails::checkPAN'); -$routes->post('employeecheckAadharNoExist','Employeedetails::checkAadharNo'); +$routes->post('employeeEmailExist', 'Employeedetails::CheckEmail'); +$routes->post('employeePANExist', 'Employeedetails::checkPAN'); +$routes->post('employeecheckAadharNoExist', 'Employeedetails::checkAadharNo'); // Company Information Routes @@ -136,26 +137,26 @@ $routes->get('batchcard/getHistListing', 'Batchcard::getHistListing'); //Complaint Routes -$routes->get('purchaseorder/AddComplaint','Purchaseorder::AddComplaint'); -$routes->post('purchaseorder/SaveComplaint','Purchaseorder::SaveComplaint'); +$routes->get('purchaseorder/AddComplaint', 'Purchaseorder::AddComplaint'); +$routes->post('purchaseorder/SaveComplaint', 'Purchaseorder::SaveComplaint'); $routes->get('purchaseorder/EditComplaint', 'Purchaseorder::EditComplaint'); $routes->post('purchaseorder/UpdateComplaint', 'Purchaseorder::UpdateComplaint'); $routes->get('purchaseorder/Savencrlist', 'Purchaseorder::Savencrlist'); -$routes->get('purchaseorder/Nonconfirmativelist','Purchaseorder::Nonconfirmativelist'); -$routes->post('purchaseorder/addloadfile','Purchaseorder::addloadfile'); +$routes->get('purchaseorder/Nonconfirmativelist', 'Purchaseorder::Nonconfirmativelist'); +$routes->post('purchaseorder/addloadfile', 'Purchaseorder::addloadfile'); $routes->post('purchaseorder/uploadfile', 'Purchaseorder::uploadfile'); //Zohobooks sync -$routes->match(['GET', 'POST'],'user/zohobooks_api_fetch_all','User::zohobooks_api_fetch_all'); +$routes->match(['GET', 'POST'], 'user/zohobooks_api_fetch_all', 'User::zohobooks_api_fetch_all'); // Application Payslip Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'monthlyListings', 'Monthlypay::monthlyListing'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'monthlyListings/(:num)', 'Monthlypay::monthlyListing/$1'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'attendance', 'Monthlypay::attendanceLoad'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'publicholidays', 'Monthlypay::loadPublicholidays'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'permission', 'Monthlypay::permissionslip'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'permissionlist', 'Monthlypay::permissionlist'); -$routes->match(['GET', 'POST'],'monthlypay/permissionpdf/(:any)', 'Monthlypay::permissionpdf/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'monthlyListings', 'Monthlypay::monthlyListing'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'monthlyListings/(:num)', 'Monthlypay::monthlyListing/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'attendance', 'Monthlypay::attendanceLoad'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'publicholidays', 'Monthlypay::loadPublicholidays'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'permission', 'Monthlypay::permissionslip'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'permissionlist', 'Monthlypay::permissionlist'); +$routes->match(['GET', 'POST'], 'monthlypay/permissionpdf/(:any)', 'Monthlypay::permissionpdf/$1'); $routes->post('monthlypay/addper', 'Monthlypay::addper'); $routes->post('monthlypay/saveAttendance', 'Monthlypay::saveAttendance'); $routes->post('monthlypay/savePublicHolidays', 'Monthlypay::savePublicHolidays'); @@ -167,38 +168,38 @@ $routes->get('emppaydate/editOldemppay/(:num)', 'Emppaydate::editOldemppay/$1'); $routes->post('emppaydate/editemppay', 'Emppaydate::editemppay'); $routes->post('emppaydate/deleteEmpPay', 'Emppaydate::deleteEmpPay'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'emppayListings', 'Emppaydate::emppayListing'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'emppayListings/(:num)', 'Emppaydate::emppayListing/$1'); -$routes->match(['GET', 'POST'],'loanreports/(:any)/(:any)', 'Payslip::loadLoanReport/$1/$2'); -$routes->match(['GET', 'POST'],'loanreports/(:any)', 'Payslip::loadLoanReport/$1'); -$routes->match(['GET', 'POST'],'loanreports', 'Payslip::loadLoanReport'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'emppayListings', 'Emppaydate::emppayListing'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'emppayListings/(:num)', 'Emppaydate::emppayListing/$1'); +$routes->match(['GET', 'POST'], 'loanreports/(:any)/(:any)', 'Payslip::loadLoanReport/$1/$2'); +$routes->match(['GET', 'POST'], 'loanreports/(:any)', 'Payslip::loadLoanReport/$1'); +$routes->match(['GET', 'POST'], 'loanreports', 'Payslip::loadLoanReport'); $routes->post('payslip/Bonusreport', 'Payslip::Bonusreport'); $routes->get('payslip/MonthwiseBonusreport', 'Payslip::monthwiseBonusReport'); // $routes->get('leavereports/(:any)/(:any)', 'Payslip::leaveReport/$1/$2'); -$routes->match(['GET', 'POST'],'leavereports', 'Payslip::leaveReport'); -$routes->match(['GET', 'POST'],'leavemonthlyreports/(:any)/(:any)', 'Payslip::monthwiseLeaveReport/$1/$2'); +$routes->match(['GET', 'POST'], 'leavereports', 'Payslip::leaveReport'); +$routes->match(['GET', 'POST'], 'leavemonthlyreports/(:any)/(:any)', 'Payslip::monthwiseLeaveReport/$1/$2'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'monthlypay', 'Payslip::monthlyInputs'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ExcelUpload2', 'Payslip::viewUpload2'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'FileUpload', 'Payslip::uploadExcel'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'FileUpload2', 'Payslip::uploadExcel2'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'PrintPdf', 'Payslip::PrintPdf'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewPay', 'Payslip::viewGenerator'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'updatepayroll', 'Payslip::updatepayroll'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'BankReport', 'Payslip::loadBankreportScreen'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'PaysilpListing', 'Payslip::payslipLisiting'); -$routes->post('payslip/reload_paysliplist','Payslip::reload_paysliplist'); -$routes->post('payslip/changeMonth','Payslip::changeMonth'); -$routes->post('payslip/saveMonthlyData','Payslip::saveMonthlyData'); -$routes->post('payslip/getEmployee','Payslip::getEmployee'); -$routes->post('payslip/checkExistPay','Payslip::checkExistPay'); -$routes->post('payslip/callsp','Payslip::callsp'); -$routes->get('payslip/editPayslip/(:any)','Payslip::editPayslip/$1'); -$routes->post('payslip/updatePayslip','Payslip::updatePayslip'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'monthlypay', 'Payslip::monthlyInputs'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ExcelUpload2', 'Payslip::viewUpload2'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'FileUpload', 'Payslip::uploadExcel'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'FileUpload2', 'Payslip::uploadExcel2'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'PrintPdf', 'Payslip::PrintPdf'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ViewPay', 'Payslip::viewGenerator'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'updatepayroll', 'Payslip::updatepayroll'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'BankReport', 'Payslip::loadBankreportScreen'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'PaysilpListing', 'Payslip::payslipLisiting'); +$routes->post('payslip/reload_paysliplist', 'Payslip::reload_paysliplist'); +$routes->post('payslip/changeMonth', 'Payslip::changeMonth'); +$routes->post('payslip/saveMonthlyData', 'Payslip::saveMonthlyData'); +$routes->post('payslip/getEmployee', 'Payslip::getEmployee'); +$routes->post('payslip/checkExistPay', 'Payslip::checkExistPay'); +$routes->post('payslip/callsp', 'Payslip::callsp'); +$routes->get('payslip/editPayslip/(:any)', 'Payslip::editPayslip/$1'); +$routes->post('payslip/updatePayslip', 'Payslip::updatePayslip'); // Application Requisition Flow Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Requisition', 'Requisitionform::requisitionlisting'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'RequisitionForm', 'Requisitionform::requisition'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ApproveRequisition', 'Requisitionform::requisitionlistApproval'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Requisition', 'Requisitionform::requisitionlisting'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'RequisitionForm', 'Requisitionform::requisition'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ApproveRequisition', 'Requisitionform::requisitionlistApproval'); $routes->get('EditRequisitionForm', 'Requisitionform::EditRequisitionForm'); $routes->post('EditRequisition', 'Requisitionform::EditRequisition'); $routes->post('addNewRequisition', 'Requisitionform::addNewRequisition'); @@ -211,33 +212,33 @@ $routes->post('requisitionform/ViewRequest', 'Requisitionform::ViewRequest'); // Application PO Flow Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addPO', 'Purchaseorder::addPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addNewPO', 'Purchaseorder::addNewPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldPO', 'Purchaseorder::editOldPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldPO/(:num)', 'Purchaseorder::editOldPO/$1'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'CreatePO', 'Purchaseorder::requisition'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'purchaseOrder', 'Purchaseorder::CreatePurchaseOrder'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'purchaseorderListing', 'Purchaseorder::PurchaseOrderList'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EmergencyPO', 'Emergencypurchaseorder::CreateEmergencyPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'AdvanceRequest', 'Purchaseorder::advancerequest'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'PORelease', 'Purchaseorder::porelease'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewPO', 'Purchaseorder::viewfullpurchaseorder'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'purchaseorder/EditImportPurchaseOrder', 'Purchaseorder::EditImportPurchaseOrder'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'purchaseorder/EditCapitalPurchaseOrder', 'Purchaseorder::EditCapitalPurchaseOrder'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addPO', 'Purchaseorder::addPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addNewPO', 'Purchaseorder::addNewPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editOldPO', 'Purchaseorder::editOldPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editOldPO/(:num)', 'Purchaseorder::editOldPO/$1'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'CreatePO', 'Purchaseorder::requisition'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'purchaseOrder', 'Purchaseorder::CreatePurchaseOrder'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'purchaseorderListing', 'Purchaseorder::PurchaseOrderList'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EmergencyPO', 'Emergencypurchaseorder::CreateEmergencyPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'AdvanceRequest', 'Purchaseorder::advancerequest'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'PORelease', 'Purchaseorder::porelease'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ViewPO', 'Purchaseorder::viewfullpurchaseorder'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'purchaseorder/EditImportPurchaseOrder', 'Purchaseorder::EditImportPurchaseOrder'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'purchaseorder/EditCapitalPurchaseOrder', 'Purchaseorder::EditCapitalPurchaseOrder'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'POApproval', 'Purchaseorder::poapproval'); -$routes->get('amendmentpurchaseorder','Amendmentpurchaseorder::index'); -$routes->post('amendmentpurchaseorderFilter','Amendmentpurchaseorder::index'); +$routes->get('amendmentpurchaseorder', 'Amendmentpurchaseorder::index'); +$routes->post('amendmentpurchaseorderFilter', 'Amendmentpurchaseorder::index'); $routes->get('EditAmendPO', 'Amendmentpurchaseorder::EditAmendPurchaseOrder'); $routes->post('amendmentpurchaseorder/EditRevenuePurchaseOrder', 'Amendmentpurchaseorder::EditRevenuePurchaseOrder'); $routes->post('amendmentpurchaseorder/UpdateAmendServicePurchaseOrder', 'Amendmentpurchaseorder::UpdateAmendServicePurchaseOrder'); $routes->post('amendmentpurchaseorder/EditAmendCapitalPurchaseOrder', 'Amendmentpurchaseorder::EditAmendCapitalPurchaseOrder'); $routes->post('amendmentpurchaseorder/EditAmendImportPO', 'Amendmentpurchaseorder::EditAmendImportPO'); -$routes->post('emergencypurchaseorder/getMaterialCode','Emergencypurchaseorder::getMaterialCode'); -$routes->post('emergencypurchaseorder/getCostCenterName','Emergencypurchaseorder::getCostCenterName'); -$routes->post('emergencypurchaseorder/addNewServicePurchaseOrder','Emergencypurchaseorder::addNewServicePurchaseOrder'); -$routes->post('emergencypurchaseorder/addNewRevenuePurchaseOrder','Emergencypurchaseorder::addNewRevenuePurchaseOrder'); +$routes->post('emergencypurchaseorder/getMaterialCode', 'Emergencypurchaseorder::getMaterialCode'); +$routes->post('emergencypurchaseorder/getCostCenterName', 'Emergencypurchaseorder::getCostCenterName'); +$routes->post('emergencypurchaseorder/addNewServicePurchaseOrder', 'Emergencypurchaseorder::addNewServicePurchaseOrder'); +$routes->post('emergencypurchaseorder/addNewRevenuePurchaseOrder', 'Emergencypurchaseorder::addNewRevenuePurchaseOrder'); $routes->post('purchaseorder/addNewPurchaseOrder', 'Purchaseorder::addNewPurchaseOrder'); @@ -250,17 +251,17 @@ $routes->get('EditPO', 'Purchaseorder::EditPurchaseOrder'); $routes->get('purchaseorder/CreatePOPrint', 'Purchaseorder::CreatePOPrint'); $routes->post('purchaseorder/ReleasePO', 'Purchaseorder::ReleasePO'); $routes->post('purchaseorder/EditRevenuePurchaseOrder', 'Purchaseorder::EditRevenuePurchaseOrder'); -$routes->post('purchaseorder/deletePurchaseOrderFile' , 'Purchaseorder::deletePurchaseOrderFile'); +$routes->post('purchaseorder/deletePurchaseOrderFile', 'Purchaseorder::deletePurchaseOrderFile'); $routes->post('VerifyWithSupplierForPendingPO', 'Purchaseorder::VerifyWithSupplierForPendingPO'); // Application Store Requisition Flow Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'storerequisition', 'Storerequisitioncontroller::addstore'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'approvalstorerequisitionslip', 'Storerequisitioncontroller::SearchRequistLists'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'storerequisitionlisting', 'Storerequisitioncontroller::addstorerequisitionlist'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditStoreRequisition', 'Storerequisitioncontroller::EditStoreRequistion'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'storerequisition', 'Storerequisitioncontroller::addstore'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'approvalstorerequisitionslip', 'Storerequisitioncontroller::SearchRequistLists'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'storerequisitionlisting', 'Storerequisitioncontroller::addstorerequisitionlist'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditStoreRequisition', 'Storerequisitioncontroller::EditStoreRequistion'); // Application IGR Routes $routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working @@ -283,107 +284,107 @@ $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituplo // Non IGR / Expense -$routes->get('ListIGR', 'Expense::index'); +$routes->get('ListIGR', 'Expense::index'); $routes->post('ListIGR', 'Expense::index'); //for filter usage -$routes->post('addExpense', 'Expense::addExpense'); -$routes->post('editExpense', 'Expense::editExpense'); -$routes->post('getExpenseDetails', 'Expense::getExpenseDetails'); +$routes->post('addExpense', 'Expense::addExpense'); +$routes->post('editExpense', 'Expense::editExpense'); +$routes->post('getExpenseDetails', 'Expense::getExpenseDetails'); $routes->get('uploads/(:any)', 'Expense::downloads/$1'); $routes->post('deleteFile', 'Expense::deleteFile'); $routes->get('downloadFile/(:any)', 'Expense::downloads/$1'); // Application OGR Page -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'AddOgr', 'Inwardgateregister::addoutwardgateregister'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewOgr', 'Inwardgateregister::ViewOgr'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditOGR', 'Inwardgateregister::EditOGR'); -$routes->get('drivernameautocomplete' , 'Inwardgateregister::drivernameautocomplete'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'AddOgr', 'Inwardgateregister::addoutwardgateregister'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ViewOgr', 'Inwardgateregister::ViewOgr'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditOGR', 'Inwardgateregister::EditOGR'); +$routes->get('drivernameautocomplete', 'Inwardgateregister::drivernameautocomplete'); $routes->get('drivermobileautocomplete', 'Inwardgateregister::drivermobileautocomplete'); // Application MRIR Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditMRIR', 'MRIRcontroller::editmaterialinspectionreport'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewMRIR', 'MRIRcontroller::viewmaterialinspectionreport'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Distribution', 'MRIRcontroller::viewmMaterialDistributionList'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditMRIR', 'MRIRcontroller::editmaterialinspectionreport'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ViewMRIR', 'MRIRcontroller::viewmaterialinspectionreport'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Distribution', 'MRIRcontroller::viewmMaterialDistributionList'); // Application Store Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Stock', 'Storestatus::storeavailability'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'UpdatePOStatus', 'Servicepurchaseorder::UpdateServicePOStatus'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ServicePOBilling', 'Servicepurchaseorder::viewServicePOReportForBilling'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Stock', 'Storestatus::storeavailability'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'UpdatePOStatus', 'Servicepurchaseorder::UpdateServicePOStatus'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ServicePOBilling', 'Servicepurchaseorder::viewServicePOReportForBilling'); $routes->post('serviceAvilBudgetAmount', 'Servicepurchaseorder::AvilBudgetAmount'); $routes->post('servicepurchaseorder/UpdateServicePurchaseOrder', 'Servicepurchaseorder::UpdateServicePurchaseOrder'); // Application Cash book Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewIncomeExpense', 'Cashbook::incomeExpenseList'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'ViewIncomeExpense', 'Cashbook::incomeExpenseList'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addNewIncomeExpense', 'Cashbook::addNewIncomeExpenseLoad'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addIncomeExpense', 'Cashbook::addIncomeExpense'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'AdvanceList', 'Cashbook::AdvanceList'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addIncomeExpense', 'Cashbook::addIncomeExpense'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'AdvanceList', 'Cashbook::AdvanceList'); // Application Bank book Routes -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankingview', 'Cashbook::bankfileview'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankfiletostatement', 'Cashbook::bankfileupload'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankingstatement', 'Cashbook::bankdata'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Debitstatement', 'Cashbook::bankdebitdata'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Cashstatement', 'Cashbook::cashreceipt'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'BankingFile', 'Cashbook::bankfileupload'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankingview', 'Cashbook::bankfileview'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankfiletostatement', 'Cashbook::bankfileupload'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankingstatement', 'Cashbook::bankdata'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Debitstatement', 'Cashbook::bankdebitdata'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Cashstatement', 'Cashbook::cashreceipt'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'BankingFile', 'Cashbook::bankfileupload'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Filelist', 'Cashbook::filelist'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankingrecord', 'Cashbook::bankdata');; -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountpaid', 'Cashbook::amountpaid'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountreceived', 'Cashbook::amountreceived'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Receipt', 'Cashbook::cashreceipt'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Payment', 'Cashbook::cashpayment'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Invoice', 'Cashbook::bankinvoice'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankcash', 'Cashbook::cashbanking'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'DeleteInvoice', 'Cashbook::deletemappingiv'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'DeletePo', 'Cashbook::Deletemappingporeport'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'MappingInvoice', 'Cashbook::mappinginvoice'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankamountpaid', 'Cashbook::amountpaid'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankamountreceived', 'Cashbook::amountreceived'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Receipt', 'Cashbook::cashreceipt'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Payment', 'Cashbook::cashpayment'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Invoice', 'Cashbook::bankinvoice'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankcash', 'Cashbook::cashbanking'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'DeleteInvoice', 'Cashbook::deletemappingiv'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'DeletePo', 'Cashbook::Deletemappingporeport'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'MappingInvoice', 'Cashbook::mappinginvoice'); // new added on cashbook controller -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'MappingPo', 'Cashbook::mappingpo'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankledgersupplier', 'Cashbook::supplierledger'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankledgercustomer', 'Cashbook::customerledger'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'MappingPo', 'Cashbook::mappingpo'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankledgersupplier', 'Cashbook::supplierledger'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankledgercustomer', 'Cashbook::customerledger'); // $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountpaidsupplier', 'Cashbook::amountpaidsupplier'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountunpaid', 'Cashbook::amountunpaid'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountreceivedsupp', 'Cashbook::bankreceivedsupp'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Bankamountunreceived', 'Cashbook::bankunreceivedsupp'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Receiptamount', 'Cashbook::receipt'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Amountreceived', 'Cashbook::amountreceived'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankamountunpaid', 'Cashbook::amountunpaid'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankamountreceivedsupp', 'Cashbook::bankreceivedsupp'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Bankamountunreceived', 'Cashbook::bankunreceivedsupp'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Receiptamount', 'Cashbook::receipt'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Amountreceived', 'Cashbook::amountreceived'); // Application Reports Routes -$routes->match(['GET', 'POST'],'reportpending', 'Report::pending_report'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'releasedpo', 'Report::releasedPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'openOrder', 'Report::openorderPO'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'TotalOrder', 'Report::TotalOrd'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_costcenter', 'Report::ccr'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_Material_Supplier', 'Report::MM_Supplier'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_Material_Item', 'Report::MM_Item'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_Material_ReceiptValue', 'Report::MM_ReceiptValue'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_purchase', 'Report::purchase'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_year_wise', 'Report::year_wise'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_supplier', 'Report::purchase_supplier'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_consolidate', 'Report::consolidate'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_cumulative', 'Report::cumulative'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'cashbookreport', 'Report::cashbook'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'cashbookcumulativereport', 'Report::cashbook_cumulative_report'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'cashbookcumulativemonthreport', 'Report::cashbook_month_cumulative_report'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'cashbookmonthlyexpenses', 'Report::monthexpenses'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'cashbookyearlyexpenses', 'Report::yearexpenses'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_purchase_inward', 'Report::ipurchase'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_year_wise_inward', 'Report::iyear_wise'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_supplier_inward', 'Report::ipurchase_supplier'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_supplier_summary', 'Report::suppliersummary'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_consolidate_inward', 'Report::iconsolidate'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_cumulative_inward', 'Report::icumulative'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_cumulative_raw', 'Report::rawi_cumulative'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_consolidate_category', 'Report::rawi_consolidate'); -$routes->match(['GET', 'POST'],'Report_pending_purchase', 'Report::pending_purchase'); -$routes->match(['GET', 'POST'],'/Report_pending_purchase','Report::pending_purchase'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_purchase_attach', 'Report::iattach'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_monthly_gst', 'Report::monthly_gst'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Report_Material_inward_Register', 'User::getMaterialInwardRegister'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'DeliveryPerformance', 'User::deliver_perform'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Empperform', 'Report::per'); +$routes->match(['GET', 'POST'], 'reportpending', 'Report::pending_report'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'releasedpo', 'Report::releasedPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'openOrder', 'Report::openorderPO'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'TotalOrder', 'Report::TotalOrd'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_costcenter', 'Report::ccr'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Supplier', 'Report::MM_Supplier'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Item', 'Report::MM_Item'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_ReceiptValue', 'Report::MM_ReceiptValue'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase', 'Report::purchase'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise', 'Report::year_wise'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier', 'Report::purchase_supplier'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate', 'Report::consolidate'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative', 'Report::cumulative'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookreport', 'Report::cashbook'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookcumulativereport', 'Report::cashbook_cumulative_report'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookcumulativemonthreport', 'Report::cashbook_month_cumulative_report'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookmonthlyexpenses', 'Report::monthexpenses'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookyearlyexpenses', 'Report::yearexpenses'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_inward', 'Report::ipurchase'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise_inward', 'Report::iyear_wise'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_inward', 'Report::ipurchase_supplier'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_summary', 'Report::suppliersummary'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_inward', 'Report::iconsolidate'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_inward', 'Report::icumulative'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_raw', 'Report::rawi_cumulative'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_category', 'Report::rawi_consolidate'); +$routes->match(['GET', 'POST'], 'Report_pending_purchase', 'Report::pending_purchase'); +$routes->match(['GET', 'POST'], '/Report_pending_purchase', 'Report::pending_purchase'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_attach', 'Report::iattach'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_monthly_gst', 'Report::monthly_gst'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_inward_Register', 'User::getMaterialInwardRegister'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'DeliveryPerformance', 'User::deliver_perform'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Empperform', 'Report::per'); $routes->get('quality', 'Quality::index'); $routes->get('qualityreportlist', 'Quality::reportList'); @@ -412,14 +413,14 @@ $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('loadView_createFactoryMachineMasterDetail','FactoryMachineController::loadView_createFactoryMachineMasterDetail'); -$routes->get('loadView_updateFactoryMachineMasterDetail','FactoryMachineController::loadView_updateFactoryMachineMasterDetail'); +$routes->get('loadView_createFactoryMachineMasterDetail', 'FactoryMachineController::loadView_createFactoryMachineMasterDetail'); +$routes->get('loadView_updateFactoryMachineMasterDetail', 'FactoryMachineController::loadView_updateFactoryMachineMasterDetail'); //routes for getSilicaIgr $routes->post('getSilicaIGR', 'Supplier::getSilicaIGR'); @@ -430,40 +431,40 @@ $routes->post('getSilicaIGR', 'Supplier::getSilicaIGR'); //Stock Module //coatingMachineDetails -$routes->match(['GET','POST'],'coatingMachineDetails' , 'StockController::loadView_coatingMachineDetails'); -$routes->post('addNewCoatingMachineDetails' , 'StockController::addNewCoatingMachineDetails'); -$routes->post('updateCoatingMachineDetails','StockController::updateCoatingMachineDetails'); -$routes->get('deleteCoatingMachineDetails' , 'StockController::deleteCoatingMachineDetails'); +$routes->match(['GET', 'POST'], 'coatingMachineDetails', 'StockController::loadView_coatingMachineDetails'); +$routes->post('addNewCoatingMachineDetails', 'StockController::addNewCoatingMachineDetails'); +$routes->post('updateCoatingMachineDetails', 'StockController::updateCoatingMachineDetails'); +$routes->get('deleteCoatingMachineDetails', 'StockController::deleteCoatingMachineDetails'); //drier machine details -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'drierMachineDetails', 'StockController::drierMachineDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'drierMachineDetails', 'StockController::drierMachineDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'powerConsumptionDetails', 'StockController::powerConsumptionDetails'); -$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditPowerConsumptionDetails', 'StockController::addOrEditPowerConsumptionDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'powerConsumptionDetails', 'StockController::powerConsumptionDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditPowerConsumptionDetails', 'StockController::addOrEditPowerConsumptionDetails'); //incoming Silica Sand Detaails -$routes->match(['GET','POST'],'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails'); +$routes->match(['GET', 'POST'], 'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails'); $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomingSilicaSandDetails'); //Bag stock details -$routes->match(['GET','POST'],'bagStockDetails', 'StockController::loadView_bagStockDetails'); +$routes->match(['GET', 'POST'], 'bagStockDetails', 'StockController::loadView_bagStockDetails'); $routes->post('updateBagStockDetails', 'StockController::updateBagStockDetails'); //Dust And Rough Stock Details -$routes->match(['GET','POST'],'dustAndRoughStockDetails', 'StockController::loadView_dustAndRoughStockDetails'); +$routes->match(['GET', 'POST'], 'dustAndRoughStockDetails', 'StockController::loadView_dustAndRoughStockDetails'); $routes->post('updateDustAndRoughStockDetails', 'StockController::updateDustAndRoughStockDetails'); //Resin stock details -$routes->match(['GET','POST'],'resinStockDetails', 'StockController::loadView_resinStockDetails'); +$routes->match(['GET', 'POST'], 'resinStockDetails', 'StockController::loadView_resinStockDetails'); $routes->post('updateResinStockDetails', 'StockController::updateResinStockDetails'); //Gas stock details -$routes->match(['GET','POST'],'gasStockDetails', 'StockController::loadView_gasStockDetails'); +$routes->match(['GET', 'POST'], 'gasStockDetails', 'StockController::loadView_gasStockDetails'); $routes->post('updateGasStockDetails', 'StockController::updateGasStockDetails'); \ No newline at end of file diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index 49b1a850..a837f714 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -343,6 +343,14 @@ class Assetdetails extends BaseController } + function checkAssetName(){ + + $data = $this->request->getPost(); + $result = $this->assetdetails_model->checkAssetName($data['assetName']); + return $this->response->setJSON($result); + + } + /** * This function is used to edit the user information diff --git a/app/Models/Assetdetails_model.php b/app/Models/Assetdetails_model.php index 2ed1c632..ec3b3d0e 100755 --- a/app/Models/Assetdetails_model.php +++ b/app/Models/Assetdetails_model.php @@ -245,7 +245,8 @@ class Assetdetails_model extends Model return $count; } - function deleteAsset ($assetCode , $assetInfo){ + function deleteAsset($assetCode, $assetInfo) + { $this->db->table('t_asset_details') ->where('AssetCode', $assetCode) @@ -254,9 +255,10 @@ class Assetdetails_model extends Model return $count; } - - function reActivateAsset ($assetCode , $assetInfo){ + + function reActivateAsset($assetCode, $assetInfo) + { $this->db->table('t_asset_details') ->where('AssetCode', $assetCode) @@ -267,6 +269,18 @@ class Assetdetails_model extends Model } + function checkAssetName($assetName) + { + $builder = $this->db->table('t_asset_details') + ->select('t_asset_details.*') + ->where('AssetName', $assetName); + $query = $builder->get(); + + return $query->getResultArray(); + + } + + function viewasset($asset, $Asset_Code) { diff --git a/app/Views/addasset.php b/app/Views/addasset.php index d477a31a..02e72ca6 100755 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -430,4 +430,43 @@ return true; } + + $('#AssetName').on('change',function(){ + +let assetName = $(this).val(); + +$('#loader').show(); + +$.ajax({ + type:'POST', + url:'assetdetails/checkAssetName', + data:{assetName}, + success: function(data){ + if(data && data.length>0){ + let IsActive = data[0].IsActive; + if(IsActive == 1){ + alert("Asset Name Exists..!!"); + $('#AssetName').val(''); + $('#AssetName').focus(); + }else{ + alert("Asset Name Existing in deleted section..!!"); + $('#AssetName').val(''); + $('#AssetName').focus(); + } + } + }, + error: function(error){ + //error + console.error('error ocurred' + error); + }, + complete :function (){ + $('#loader').hide(); + console.log('ajax call completed..!!'); + } +}) + +}); + + + \ No newline at end of file diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index 786b0ace..0f215235 100755 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -54,6 +54,8 @@ + Add New + Asset @@ -123,12 +125,7 @@ $cdate = date('d-m-Y', strtotime($record->CreatedDt)); } ?> - - - AssetCode, 5) ?> - - + AssetCode ?> AssetName ?> Description ?> DepartmentName ?> @@ -154,13 +151,14 @@    - @@ -298,12 +296,16 @@ showArchiveList(); }); - function confirmReActivatingAsset(){ + function confirmReActivatingAsset(event){ + let result = confirm("Do You Want to Re-Activate Asset details ?"); + if(result){return;}else{event.preventDefault();} } - + function confirmDeleteAsset(){ + let result = confirm("Do You Want to Delete Asset details ?"); + if(result){return;}else{event.preventDefault();} } \ No newline at end of file diff --git a/app/Views/costListing.php b/app/Views/costListing.php index 84dfff8c..f28a0ad6 100755 --- a/app/Views/costListing.php +++ b/app/Views/costListing.php @@ -54,7 +54,7 @@ Add New - Cost List + Asset @@ -231,7 +231,7 @@ if (data && data.length > 0) { - if(isactive == 1){ + if(isactive == 1){ alert("Cost Center Name Exists..!!"); }else{ alert("Cost Center Name Existing in the deleted section ..!!"); diff --git a/app/Views/editOldasset.php b/app/Views/editOldasset.php index fb45ccf2..ee4f7d1a 100755 --- a/app/Views/editOldasset.php +++ b/app/Views/editOldasset.php @@ -423,4 +423,45 @@ if (!empty($assetList)) { }); + + + + $('#AssetName').on('change',function(){ + + let assetName = $(this).val(); + + $('#loader').show(); + + $.ajax({ + type:'POST', + url:'assetdetails/checkAssetName', + data:{assetName}, + success: function(data){ + if(data && data.length>0){ + let IsActive = data[0].IsActive; + if(IsActive == 1){ + alert("Asset Name Exists..!!"); + $('#AssetName').val(''); + $('#AssetName').focus(); + }else{ + alert("Asset Name Existing in deleted section..!!"); + $('#AssetName').val(''); + $('#AssetName').focus(); + } + } + }, + error: function(error){ + //error + console.error('error ocurred' + error); + }, + complete :function (){ + $('#loader').hide(); + console.log('ajax call completed..!!'); + } + }) + + }); + + + \ No newline at end of file