Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
e0051da55e
@ -1563,13 +1563,13 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
$array->mapped_family_floaters = $data;
|
||||
$array->type = "GMC";
|
||||
$array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
|
||||
$array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0.0;
|
||||
if($array->is_premium_summery == 1){
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0.0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0.0;
|
||||
}else{
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = 0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = 0;
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = 0.0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = 0.0;
|
||||
}
|
||||
|
||||
$checkGmcParentsPolicyExist = $this->clientPolicyModel->select("
|
||||
@ -1631,7 +1631,8 @@ class EmployeeRestController extends AdminController
|
||||
}
|
||||
|
||||
if(!empty($result) && $this->request->getGet('policy') == 'GMC'){
|
||||
return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200);
|
||||
// return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200);
|
||||
echo json_encode(['status' => 'success','code' => 200,'data' => $result], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION);
|
||||
}else{
|
||||
return $this->respond(['status' => 'success','code' => 200,'data' => []], 200);
|
||||
}
|
||||
@ -1875,13 +1876,13 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
$array->mapped_family_floaters = $data;
|
||||
$array->type = "GMC - Parents";
|
||||
$array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
|
||||
$array->family_floaters_of_dependent_and_si_value = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0.0;
|
||||
if($array->is_premium_summery == 1){
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0.0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0.0;
|
||||
}else{
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = 0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = 0;
|
||||
$array->family_floaters_of_dependent_and_si_premium_value = 0.0;
|
||||
$array->family_floaters_of_dependent_and_gst_value = 0.0;
|
||||
}
|
||||
|
||||
return $array;
|
||||
@ -2524,13 +2525,13 @@ class EmployeeRestController extends AdminController
|
||||
}
|
||||
|
||||
$responce['family_floaters_of_dependent_and_si_array'] = $data;
|
||||
$responce['family_floaters_of_dependent_and_si_value'] = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0;
|
||||
$responce['family_floaters_of_dependent_and_si_value'] = $dependent_and_si_value > 0 ? $dependent_and_si_value : 0.0;
|
||||
if($array['is_premium_summery']){
|
||||
$responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0;
|
||||
$responce['family_floaters_of_dependent_and_gst_value'] = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0;
|
||||
$responce['family_floaters_of_dependent_and_si_premium_value'] = $dependent_and_si_premium_value > 0 ? round($dependent_and_si_premium_value) : 0.0;
|
||||
$responce['family_floaters_of_dependent_and_gst_value'] = $dependent_and_si_gst_value > 0 ? round($dependent_and_si_gst_value) : 0.0;
|
||||
}else{
|
||||
$responce['family_floaters_of_dependent_and_si_premium_value'] = 0;
|
||||
$responce['family_floaters_of_dependent_and_gst_value'] = 0;
|
||||
$responce['family_floaters_of_dependent_and_si_premium_value'] = 0.0;
|
||||
$responce['family_floaters_of_dependent_and_gst_value'] = 0.0;
|
||||
}
|
||||
|
||||
|
||||
@ -2539,7 +2540,8 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
|
||||
if($this->request->getGet('policy') == 'GMC-DEPENDENT-ADDON'){
|
||||
return $this->respond(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], 200);
|
||||
// return $this->respond(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], 200);
|
||||
echo json_encode(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION);
|
||||
}
|
||||
|
||||
//array_push($PolicyData, $responce);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user