CHANGES_in FE notes text : GWM
This commit is contained in:
parent
74fd3f37b3
commit
72fac226f7
@ -954,7 +954,7 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
public function getEmployeePolicy()
|
||||
{
|
||||
// try {
|
||||
try {
|
||||
|
||||
$id = $this->request->getGet('id');
|
||||
$emp_code = $this->request->getGet('emp_code');
|
||||
@ -1164,9 +1164,9 @@ class EmployeeRestController extends AdminController
|
||||
}else{
|
||||
return $this->respond(['status' => 'failed','code' => 404,'data' => []], 200);
|
||||
}
|
||||
// } catch (\Exception $e) {
|
||||
// return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500);
|
||||
// }
|
||||
} catch (\Exception $e) {
|
||||
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('is_active', 1 )
|
||||
->where('is_addon_value',0)->findAll();
|
||||
// return $employeeData;
|
||||
foreach ($GmcParrentsPolicy as $key => $array) {
|
||||
|
||||
|
||||
@ -1241,6 +1242,7 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
// Convert familyFloaters terms data to plain array
|
||||
$floters = $this->FloterConvertion($familyFloates);
|
||||
|
||||
$data = [];
|
||||
foreach ($floters as $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 substr($result, 0, 2) !== " +";
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function getClientDetails()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user