diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 73940906..a1ad29d4 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -17,6 +17,8 @@ $routes->get('/logout', 'LoginController::logout'); $routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse'); $routes->get('/auth/google', 'LoginController::initiateGoogleOAuth'); $routes->get('/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus'); +$routes->get('download-e-card/(:segment)/(:segment)', 'EmployeeController::generateIDCardForEmployee/$1/$2'); + $routes->group("/user", ["filter" => "authMVC"], function($routes){ @@ -220,9 +222,6 @@ $routes->group("/util", ["filter" => "authMVC"], function($routes){ $routes->get("init-Emp-onboard/(:any)", "EmployeeController::initiateManualEmployeesOnboardProcess/$1"); $routes->get("full-excel-error-file/(:any)", "EmployeeController::downloadFullExcelErrorFile/$1"); $routes->get("id-card", "EmployeeController::viewECard/$1"); - $routes->get('digital-id-card/(:segment)/(:segment)', 'EmployeeController::generateIDCardForEmployee/$1/$2'); - - }); $routes->cli('cli/processjob', 'JobWorker::processJob'); diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 96815f94..6c76b45b 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -1109,7 +1109,7 @@ class ClientController extends AdminController $resultss[$index] = $record; } } else { - if ($index == '0' || $index == '1' || $index == '2' || $index == '3' || $index == '4' || $index == '5' || $index == '6' || $index == '8' || $index == '7' || $index == '9' || $index == '10') { + if ($index == '3' || $index == '4' || $index == '5' || $index == '6' || $index == '8' || $index == '7' || $index == '9' || $index == '10') { $resultss[$index] = $record; } }