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

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
VENKATESHWARAN 2024-07-23 11:44:52 +05:30
commit 289de4c96b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -290,6 +290,7 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
$routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
$routes->get("getChatResponse", "ChatBotController::getChatResponse"); $routes->get("getChatResponse", "ChatBotController::getChatResponse");
$routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {

5
app/Controllers/EmployeeRestController.php
View File

@ -792,7 +792,7 @@ class EmployeeRestController extends AdminController
'emp_status'=>'draft', 'emp_status'=>'draft',
'band'=> $extra['10'][$index], 'band'=> $extra['10'][$index],
'basic_pay'=> $extra['11'][$index], 'basic_pay'=> $extra['11'][$index],
'unit'=> $extra['12'][$index], 'unit'=> isset($extra['12'][$index]) ? $extra['12'][$index] : null,
'client_branch_id' => $client_branch_id 'client_branch_id' => $client_branch_id
]; ];
@ -2104,7 +2104,6 @@ class EmployeeRestController extends AdminController
function getEmployeeActiveOrInactivePolicy() function getEmployeeActiveOrInactivePolicy()
{ {
if($this->request->getGet('type') == 'Active'){ $policy_status = 1; }else{ $policy_status = 0; } if($this->request->getGet('type') == 'Active'){ $policy_status = 1; }else{ $policy_status = 0; }
$ClientPolicyData = $this->clientPolicyModel->select('client_policy.* , policies.name as policy_name , policy_type.policy_type as policy_type') $ClientPolicyData = $this->clientPolicyModel->select('client_policy.* , policies.name as policy_name , policy_type.policy_type as policy_type')
->join('policies', 'client_policy.policy_id = policies.id', 'left') ->join('policies', 'client_policy.policy_id = policies.id', 'left')
@ -2368,7 +2367,7 @@ class EmployeeRestController extends AdminController
return $this->respond(['status' => 'failed', 'code' => 500, 'message' => 'Failed to update employee data'], 500); return $this->respond(['status' => 'failed', 'code' => 500, 'message' => 'Failed to update employee data'], 500);
} }
} else { } else {
return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'New Firebase Token is the same as the current one'], 400); return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'New Firebase Token is the same as the current one'], 200);
} }
} else { } else {
return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Firebase Token is required'], 400); return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Firebase Token is required'], 400);