diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0bad4c1..869a6c5 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -43,6 +43,7 @@ $routes->get('payroll/inded', 'PayrollController::incomeDeduction'); $routes->get('payroll/indedtransupdate/(:num)', 'PayrollController::incomeDeductionTransUpdate/$1'); $routes->get('payroll/indedtransapplyupdate/(:num)/(:num)', 'PayrollController::incomeDeductionTransApplyUpdate/$1/$2'); $routes->post('payroll/saveinded', 'PayrollController::saveIncomeDeduction'); +$routes->get('payroll/delinded/(:num)', 'PayrollController::deleteIncomeDeduction/$1'); $routes->get('payroll/paytype', 'PayrollController::payrollType'); $routes->post('payroll/addpaytype', 'PayrollController::addPayrollType'); diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 2eaa25c..7eda1e6 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -154,7 +154,7 @@ class PayrollController extends BaseController $incomeDeductions = (new IncomeDeductionModel())->findAll(); $inDedHTMLTable = new \CodeIgniter\View\Table(); - $inDedHTMLTable->setTemplate(MiscLib::adminLTETableTemplate()); + $inDedHTMLTable->setTemplate(MiscLib::adminLTEDataTable1Template("tblIncomeDeduction")); if ($incomeDeductions == null) $data['tblIncomeDeduction'] = '

No income and deduction found.

'; @@ -173,7 +173,7 @@ class PayrollController extends BaseController $iconView = ''; $iconEdit = ''; - $iconDelete = ''; + $iconDelete = ''; $inDedHTMLTable->addRow($incomeDeduction->inded_id, $incomeDeduction->payslip_display, $incomeDeduction->inded_name, ($incomeDeduction->is_income) ? 'Yes' : 'No', ($incomeDeduction->is_taxable) ? 'Yes' : 'No', ($incomeDeduction->include_in_gross) ? 'Yes' : 'No', $iconView . ' ' . $iconEdit . ' ' . $iconDelete); } @@ -256,6 +256,16 @@ class PayrollController extends BaseController return redirect()->back()->with('message', $updateCount . ' items in Income or Deduction was Successfully Updated'); } + public function deleteIncomeDeduction($indedid) + { + $incomeDeductionModel = new IncomeDeductionModel(); + + if ($incomeDeductionModel->delete($indedid)) + return redirect()->back()->with('message', 'Income or Deduction Successfully Deleted'); + else + return redirect()->back()->with('error', 'Failed to delete income or deduction'); + } + public function payrollType() { $payrollTypes = (new PayrollTypeModel())->findAll(); diff --git a/app/Views/payroll/incomedeductionview.php b/app/Views/payroll/incomedeductionview.php index 36aaba4..4f82993 100644 --- a/app/Views/payroll/incomedeductionview.php +++ b/app/Views/payroll/incomedeductionview.php @@ -8,6 +8,11 @@ section('css') ?> + + + + + endSection() ?> @@ -180,9 +185,24 @@ section('js') ?> + + + + + +