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

CHANGE_EMPLOYEE_UPLOAD : AADHAVAN

Browse Source
This commit is contained in:
aadhavan valli 2024-07-23 11:27:23 +05:30
parent 469d0d92fe
commit 28a57f87de
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/EmployeeRestController.php
View File

@ -787,7 +787,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
]; ];
@ -2099,9 +2099,8 @@ 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')
->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left') ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
->where('client_policy.client_id', $this->request->getGet('client_id') ) ->where('client_policy.client_id', $this->request->getGet('client_id') )
@ -2237,7 +2236,7 @@ class EmployeeRestController extends AdminController
"waiverofpreexistingdiseases" => "Waiver of Pre-existing Diseases", "waiverofpreexistingdiseases" => "Waiver of Pre-existing Diseases",
"maternitycoverage" => "Maternity Coverage", "maternitycoverage" => "Maternity Coverage",
"babyday1cover" => "Baby Day 1 Cover", "babyday1cover" => "Baby Day 1 Cover",
"9monthwaitingperiodwaived" => "9-month waiting Period –waived", "9monthwaitingperiodwaived" => "9-month waiting Period <EFBFBD>waived",
"coverfromthedateofjoining" => "Cover from the date of Joining", "coverfromthedateofjoining" => "Cover from the date of Joining",
"waiverof1,2,3&4thyearexclusions" => "Waiver of 1, 2, 3 & 4th year Exclusions", "waiverof1,2,3&4thyearexclusions" => "Waiver of 1, 2, 3 & 4th year Exclusions",
"waiverof30dayswaitingperiod" => "Waiver of 30 days waiting period", "waiverof30dayswaitingperiod" => "Waiver of 30 days waiting period",
@ -2363,7 +2362,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);