diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 485a36a5..84d92a66 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -14,28 +14,28 @@ $routes->get('/', 'Login::index'); $routes->get('login', 'Login::index'); $routes->add('loginMe', 'Login::loginMe'); $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'],'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'], 'loadChangePass', 'User::loadChangePass'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'changePassword', 'User::changePassword'); +$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'); -// $routes->match(['get', 'post', 'put', 'delete'],'resetPasswordConfirmUser/(:any)/(:any)', 'Login::resetPasswordConfirmUser/$1/$2'); -// $routes->match(['get', 'post', 'put', 'delete'],'createPasswordUser', 'Login::createPasswordUser'); +// $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'resetPasswordConfirmUser/(:any)', 'Login::resetPasswordConfirmUser/$1'); +// $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'resetPasswordConfirmUser/(:any)/(:any)', 'Login::resetPasswordConfirmUser/$1/$2'); +// $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'createPasswordUser', 'Login::createPasswordUser'); $routes->get('dashboard', 'User::index'); $routes->get('reports', 'Report::index'); // User Routes $routes->get('addNew', 'User::addNew'); -$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->match(['GET', 'POST', 'PUT', 'DELETE'],'editUser', 'User::editUser'); $routes->post('user/Deleteuserdepartment','User::Deleteuserdepartment'); $routes->post('user/deleteUser', 'User::deleteUser'); @@ -53,10 +53,10 @@ $routes->get('exportsupplier','Supplier::exportsupplier'); // export supplier de // 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'); @@ -73,16 +73,16 @@ $routes->post('updateCostCenter', 'CostCenter::updateCostCenter'); $routes->post('CostCenter/AddCostDepartment','CostCenter::AddCostDepartment'); $routes->post('CostCenter/DeleteCostDepartment','CostCenter::DeleteCostDepartment'); -$routes->match(['get', 'post', 'put', 'delete'],'CostCenter/GetBudgetForYear','CostCenter::GetBudgetForYear'); -$routes->match(['get', 'post', 'put', 'delete'],'deletecost', 'CostCenter::deletecost'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'CostCenter/GetBudgetForYear','CostCenter::GetBudgetForYear'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'deletecost', 'CostCenter::deletecost'); $routes->get('exportcost', 'CostCenter::exportcost'); // Asset Detail Routes $routes->get('assetListing', 'Assetdetails::assetListing'); $routes->get('addasset', 'Assetdetails::addasset'); -$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 @@ -135,16 +135,16 @@ $routes->get('purchaseorder/Savencrlist', 'Purchaseorder::Savencrlist'); $routes->get('purchaseorder/Nonconfirmativelist','Purchaseorder::Nonconfirmativelist'); //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'); @@ -156,26 +156,26 @@ $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->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'); @@ -185,9 +185,9 @@ $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'); @@ -200,21 +200,21 @@ $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->match(['GET', 'POST', 'PUT', 'DELETE'],'POApproval', 'Purchaseorder::poapproval'); $routes->get('amendmentpurchaseorder','Amendmentpurchaseorder::index'); $routes->get('EditAmendPO', 'Amendmentpurchaseorder::EditAmendPurchaseOrder'); $routes->post('amendmentpurchaseorder/EditRevenuePurchaseOrder', 'Amendmentpurchaseorder::EditRevenuePurchaseOrder'); @@ -243,18 +243,21 @@ $routes->post('VerifyWithSupplierForPendingPO', 'Purchaseorder::VerifyWithSuppli // 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::addinwardgateregister'); // ADD IGR page - working -$routes->post('inwardgateregister/IGRITEM', 'Inwardgateregister::IGRITEM'); // ADD IGR page - Working -$routes->post('inwardgateregister/ViewIGR', 'Inwardgateregister::ViewIGR'); +$routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working +$routes->post('ViewIGR', 'Inwardgateregister::viewIGR'); +$routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); +$routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); // ADD IGR page - Working +$routes->post('deleteBillFile', 'Inwardgateregister::deleteBillFile'); + + + $routes->post('inwardgateregister/addNewigr', 'Inwardgateregister::addNewigr'); -$routes->get('inwardgateregister/viewIGRDetails','Inwardgateregister::viewIGRDetails'); -$routes->match(['get', 'post', 'put', 'delete'],'ViewigrDetails', 'Inwardgateregister::viewIGRDetails'); //ADD IGR - Working when Save $routes->post('inwardgateregister/ViewIGRfile', 'Inwardgateregister::ViewIGRfile'); $routes->post('inwardgateregister/addloadfile', 'Inwardgateregister::addloadfile'); $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituploadfile'); @@ -266,92 +269,92 @@ $routes->post('inwardgateregister/UpdateIGR', 'Inwardgateregister::UpdateIGR'); $routes->post('inwardgateregister/updateIGRLineItem', 'Inwardgateregister::updateIGRLineItem'); // 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->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'); // 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'],'Viewigr', 'MRIRcontroller::viewinwardgateregister'); -$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'],'Viewigr', 'MRIRcontroller::viewinwardgateregister'); +$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'],'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'],'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'); // 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'],'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'],'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'); // 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'],'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'],'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'); // 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'); diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 75e3c856..be3dd064 100644 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1111,7 +1111,8 @@ $mpdf->use_kwt = true; } else { throw new \Exception('Error occurred while creating PO Master'); } - + log_message('error', 'CTRL PONO : ' . $PONO); + // PO Line Items $LineItemStatus = REQITEM_NEW; @@ -1332,8 +1333,6 @@ $mpdf->use_kwt = true; $this->purchaseorder_model->insertlogpo($logpo); } - - $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -1346,8 +1345,6 @@ $mpdf->use_kwt = true; } } - - $ReqDetails = array('Quantity' => $Quantity, 'UpdatedBy' => $updatedBy, 'UpdatedOn' => $updateddt); @@ -1362,7 +1359,6 @@ $mpdf->use_kwt = true; $j = $i - 1; - // print_r($IGRD); die; $IGRDs = array('QuantityAsPerInvoice' => $Quantity, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt); @@ -1380,10 +1376,6 @@ $mpdf->use_kwt = true; $MaterialstockHistoryupdate ); - - - - $rawget_pre_qty = $this->inwardgateregister_model->get_CurrentQty($MaterialCode); $av_qty = 0; if (!empty($rawget_pre_qty)) { @@ -1392,55 +1384,33 @@ $mpdf->use_kwt = true; } } - // echo $av_qty; - // die(); $qty_dif = $Quantity - $b4qty; $currentav_qty = $av_qty - $qty_dif; - - //echo $currentav_qty; - //die(); - $current_qty = array('Current_stock' => $currentav_qty); - - //echo $current_qty; - $this->inwardgateregister_model->addmaterialmaster($current_qty, $MaterialCode); } if ($SkipInsert == "False") { if (strlen((string)$POLineItemNo) == 0) { - // $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Per'=>$per,'ServiceMaterialDescription'=>$revenuedescription,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter); - // //print_r($POLineItemList); - // $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); - // if(count($POLineItem)>0) - // { - // $LineItemNo = $POLineItem[0]['LineItemNo']; - // } - + } else { $LineItemNo = $POLineItemNo; $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'ReceivedQuantity' => $recqty, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CostCenterCode' => $CostCenter); - - //print_r($POLineItemList); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList); } $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); if (count($isExists) == 0) { - // $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip); - // //print_r($RevenueTaxList); - // $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); - + } else { $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip); - //print_r($RevenueTaxList); $this->purchaseorder_model->updateRevenueTax($LineItemNo, $RevenueTaxList); } } @@ -1964,12 +1934,17 @@ $mpdf->use_kwt = true; $LineItemNo = ''; if (count($POLineItem) > 0) { - $LineItemNo = $POLineItem[0]['LineItemNo']; + $LineItemNo = $POLineItem[0]['LineItemNo']; + } else { + throw new \Exception('Error occurred while creating PO Line Item'); } if (trim((string)$POType) == IMPORT) { $ImportTaxList = array('LineItemNo' => $LineItemNo,'BasicPriceInMTon' => $BasicPriceinmton,'ProductPrice' => $Productprice,'LandingCharge' => $LandingCharge,'AfterLandingCharge' => $AfterLandingCharge,'CustomDuty' => $CustomDuty,'AfterCustomDuty' => $AfterCustomDuty,'CustomEdCess' => $CustomEd,'CustomSHCess' => $CustomSH,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'Grossdutypayable' => $Grossdutypayable,'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,'QuantityKG' => $QuantityKG,'AfterCustomSHCess' => $AfterCustomSH,'AfterCustomEdCess' => $AfterCustomEd,'TotalValue' => $Totalvalueitem,'FreightType' => $FreightType,'NoOfTrip' => $nooftrip,'FreightValue' => $Freightrate,'AfterFreightValue' => $Freightamount,'AssessableValue' => $AssessableValue,'SubTotal' => $Subtotal,'IGST' => $Igst,'AfterIGST' => $AfterIgst,'DutyImpact' => $Dutyimpact,'ClearingCharge' => $Clearingcharge,'NetValue' => $Nettvalue); $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); + if (!$ImportList) { + throw new \Exception('Error occurred while creating Import Tax'); + } } } } @@ -2614,9 +2589,11 @@ try{ $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $LineItemNo = ''; - if (count($POLineItem) > 0) { - $LineItemNo = $POLineItem[0]['LineItemNo']; - } + if (count($POLineItem) > 0) { + $LineItemNo = $POLineItem[0]['LineItemNo']; + } else { + throw new \Exception('Error occurred while creating PO Line Item'); + } /* --------------------------------------------*/ @@ -2632,6 +2609,9 @@ try{ $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList); + if (!$ServiceTax) { + throw new \Exception('Error occurred while creating Capital national Tax'); + } } if ($CapitalRange == '0') { @@ -2643,6 +2623,9 @@ try{ $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); + if (!$ImportList) { + throw new \Exception('Error occurred while creating Capital international Tax'); + } } } } diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index 2137d38e..8c7f2c30 100644 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -780,29 +780,34 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, /** * This function is used to add New Purchase order to the system */ - function addPOMaster($POMaster,$POType, $revenuetype) + function addPOMaster($POMaster, $POType, $revenuetype) { - // print_r($POMaster);die; try { $this->db->transStart(); - $builder = $this->db->table('T_PurchaseOrder_Master'); + $builder = $this->db->table('t_purchaseorder_master'); $builder->insert($POMaster); $aff_row = $this->db->affectedRows(); + $insertId = $this->db->insertId(); + log_message('error', 'addPOMaster POID : ' . $insertId); $this->db->transComplete(); if ($aff_row > 0) { - $insertId = $aff_row > 0 ? $this->db->insertId() : 0; - $subQuery = 'SELECT PONO FROM T_PurchaseOrder_Master + // log_message('error', 'Error inside if now insertId: ' . $this->db->insertId()); + + $subQuery = 'SELECT PONO FROM t_purchaseorder_master WHERE POID = ? AND ParentPO IS NULL ORDER BY CreatedDate DESC LIMIT 1'; $query = $this->db->query($subQuery, [$insertId]); - return $query->getResultArray(); + $result = $query->getResultArray(); + log_message('error', 'addPOMaster subQuery: ' . $this->db->getLastQuery()->getQuery()); + log_message('error', 'addPOMaster subQuery result : ' . json_encode($result)); + return $result; } return []; } catch (\Exception $e) { $this->db->transRollback(); - log_message('error', 'Error in addPOMaster: ' . $e->getMessage()); + log_message('error', 'not inserted in addPOMaster due to : ' . $e->getMessage()); throw $e; return false; } @@ -832,21 +837,25 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, */ function addPOLineItem($POLineItem) { + log_message('error', 'addPOLineItem Requested : ' . json_encode($POLineItem)); $this->db->transStart(); $builder = $this->db->table('T_PurchaseOrder_LineItem'); $builder->insert($POLineItem); - - - $insert_id = $this->db->affectedRows(); + $insertId = $this->db->affectedRows(); $this->db->transComplete(); - if ($insert_id > 0) { + if ($insertId > 0) { // $subQuery = 'select max(LineItemNo) as LineItemNo from T_PurchaseOrder_LineItem'; $subQuery = 'SELECT * FROM T_PurchaseOrder_LineItem where PONO = "' . $POLineItem['PONO'] . '" ORDER BY LineItemNo DESC'; $query = $this->db->query($subQuery); - + $result = $query->getResultArray(); + log_message('error', 'addPOLineItem subQuery: ' . $this->db->getLastQuery()->getQuery()); + log_message('error', 'addPOLineItem subQuery result : ' . json_encode($result)); + return $query->getResultArray(); + }else{ + return []; } } @@ -855,26 +864,39 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, */ function addRevenueTax($RevenueTaxList) { + log_message('error', 'addRevenueTax Requested : ' . json_encode($RevenueTaxList)); + $this->db->transStart(); $builder = $this->db->table('T_Revenue_Tax'); $builder->insert($RevenueTaxList); - $this->db->transComplete(); - $insert_id = $this->db->insertId(); + $insertId = $this->db->insertId(); $aff_row = $this->db->affectedRows(); - // echo "aff_row".$aff_row." $insert_id".$insert_id; - return $aff_row > 0 ? $this->db->insertId() : 0; + $this->db->transComplete(); + + log_message('error', 'addRevenueTax query: ' . $this->db->getLastQuery()->getQuery()); + log_message('error', 'addRevenueTax affrow : ' . $aff_row); + log_message('error', 'addRevenueTax insertId : ' . $insertId); + return $insertId ; } /** * This function is used to add Service Tax to the system */ function addServiceTax($ServiceTaxList) { + + log_message('error', 'addServiceTax Requested : ' . json_encode($ServiceTaxList)); + $this->db->transStart(); $builder = $this->db->table('T_Service_Tax'); $builder->insert($ServiceTaxList); + $insertId = $this->db->insertId(); + $aff_row = $this->db->affectedRows(); $this->db->transComplete(); - $insert_id = $this->db->affectedRows(); - return $insert_id > 0 ? $this->db->insertId() : 0; + + log_message('error', 'addServiceTax query: ' . $this->db->getLastQuery()->getQuery()); + log_message('error', 'addServiceTax affrow : ' . $aff_row); + log_message('error', 'addServiceTax insertId : ' . $insertId); + return $insertId ; } @@ -882,13 +904,20 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, * This function is used to add Service Tax to the system */ function addImportTax($ImportTaxList) - { + { + log_message('error', 'addImportTax Requested : ' . json_encode($ImportTaxList)); + $this->db->transStart(); $builder = $this->db->table('T_Import_Tax'); $builder->insert($ImportTaxList); + $insertId = $this->db->insertId(); + $aff_row = $this->db->affectedRows(); $this->db->transComplete(); - $insert_id = $this->db->affectedRows(); - return $insert_id > 0 ? $this->db->insertId() : 0; + + log_message('error', 'addImportTax query: ' . $this->db->getLastQuery()->getQuery()); + log_message('error', 'addImportTax affrow : ' . $aff_row); + log_message('error', 'addImportTax insertId : ' . $insertId); + return $insertId ; }