diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b2c0ca7..25dbc8b 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -100,4 +100,8 @@ $routes->get('tk/attsummary', 'TKController::attendanceSummary'); $routes->post('tk/attsumsave/(:any)/(:any)', 'TKController::attendanceSummarySave/$1/$2'); $routes->get('tk/attsumdel/(:any)/(:any)', 'TKController::attendanceSummaryDelete/$1/$2'); + +// Regular Employee Routes +$routes->get('remp', 'RegularEmployeeController::index'); + service('auth')->routes($routes); diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 1ccaf7e..6992739 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -978,6 +978,7 @@ class PayrollController extends BaseController foreach($inDedList as $inDedId) { + // Extract Income Deduction ID from this string example --> [1] Allowance. preg_match_all('/\[(.*?)\]/', $inDedId, $matches); if(isset($empInDedList[$empPayTrans->employee_id.':'.$matches[1][0]])) diff --git a/app/Controllers/RegularEmployeeController.php b/app/Controllers/RegularEmployeeController.php new file mode 100644 index 0000000..f087e57 --- /dev/null +++ b/app/Controllers/RegularEmployeeController.php @@ -0,0 +1,14 @@ +to(base_url('/login')); + } +} diff --git a/app/Views/templates/adminlte/generalcontent.php b/app/Views/templates/adminlte/generalcontent.php index 150dd68..779ef9c 100644 --- a/app/Views/templates/adminlte/generalcontent.php +++ b/app/Views/templates/adminlte/generalcontent.php @@ -154,6 +154,45 @@ + user()->inGroup('admin', 'superadmin', 'user')): ?> +
+ Attendance + +
+ + ++ View Payslip +
+ +