Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE_CONFLICT_OF_MANUAL_INCEPTION

Browse Source
This commit is contained in:
velz 2024-04-16 09:59:50 +05:30
commit 791ae4f1d9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -237,10 +237,13 @@ $routes->group("/api", ["filter" => "authJWT"], function($routes){
$routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1"); $routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1");
$routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile"); $routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile");
$routes->post("/calculatePremium", "EmployeeRestController::calculatePremium"); $routes->post("/calculatePremium", "EmployeeRestController::calculatePremium");
$routes->group("employeeRest", ["filter" => "authJWT"], function($routes){ $routes->group("employeeRest", ["filter" => "authJWT"], function($routes){
$routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile"); $routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile");

2
app/Controllers/EmployeeController.php
View File

@ -560,6 +560,7 @@ class EmployeeController extends AdminController
// @param int $client_policy_id // @param int $client_policy_id
// this funciton initiate Inception/adition/DA of employees data only form enrollment app when passing // this funciton initiate Inception/adition/DA of employees data only form enrollment app when passing
// client_policy_id pull draft and enrolled status employees and proceed to calculatin and make entry in DB // client_policy_id pull draft and enrolled status employees and proceed to calculatin and make entry in DB
@ -570,6 +571,7 @@ class EmployeeController extends AdminController
dd($res); dd($res);
} }
public function downloadFileList($fileName = null) public function downloadFileList($fileName = null)
{ {
// $actionType = $this->request->getGet(); // $actionType = $this->request->getGet();