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

CHANGES_in FE notes text : GWM

Browse Source
This commit is contained in:
bitbucket 2024-07-29 11:34:10 +05:30
parent 74fd3f37b3
commit 72fac226f7
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controllers/EmployeeRestController.php
View File

@ -954,7 +954,7 @@ class EmployeeRestController extends AdminController
public function getEmployeePolicy() public function getEmployeePolicy()
{ {
// try { try {
$id = $this->request->getGet('id'); $id = $this->request->getGet('id');
$emp_code = $this->request->getGet('emp_code'); $emp_code = $this->request->getGet('emp_code');
@ -1164,9 +1164,9 @@ class EmployeeRestController extends AdminController
}else{ }else{
return $this->respond(['status' => 'failed','code' => 404,'data' => []], 200); return $this->respond(['status' => 'failed','code' => 404,'data' => []], 200);
} }
// } catch (\Exception $e) { } catch (\Exception $e) {
// return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500); return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500);
// } }
} }
@ -1178,6 +1178,7 @@ class EmployeeRestController extends AdminController
->where('client_branch_id',$client_branch_id) ->where('client_branch_id',$client_branch_id)
->where('is_active', 1 ) ->where('is_active', 1 )
->where('is_addon_value',0)->findAll(); ->where('is_addon_value',0)->findAll();
// return $employeeData;
foreach ($GmcParrentsPolicy as $key => $array) { foreach ($GmcParrentsPolicy as $key => $array) {
@ -1241,6 +1242,7 @@ class EmployeeRestController extends AdminController
// Convert familyFloaters terms data to plain array // Convert familyFloaters terms data to plain array
$floters = $this->FloterConvertion($familyFloates); $floters = $this->FloterConvertion($familyFloates);
$data = []; $data = [];
foreach ($floters as $familyFloatesValue) { foreach ($floters as $familyFloatesValue) {
$dependent = preg_replace('/\d/', '', $familyFloatesValue); $dependent = preg_replace('/\d/', '', $familyFloatesValue);
@ -1387,7 +1389,17 @@ class EmployeeRestController extends AdminController
} }
} }
$first_two_chars = substr($result, 0, 3);
if($first_two_chars == " +"){
$modified_string = substr($result, 3);
return "Can Add ".$modified_string;
}else{
return $result; return $result;
}
return substr($result, 0, 2) !== " +";
} }
public function getClientDetails() public function getClientDetails()