diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 41afa3d2..1c832e4b 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -208,7 +208,7 @@ $routes->group("/api", ["filter" => "authJWT"], function($routes){ $routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1"); $routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile"); -$routes->get("/getEmployeePolicy", "EmployeeRestController::getEmployeePolicy"); + $routes->post("/employeeUpload", "EmployeeRestController::employeeUpload"); $routes->get("getEmployeeAndDependence", "EmployeeRestController::getEmployeeAndDependence"); @@ -218,6 +218,8 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function($routes){ $routes->get("getEmployeeAndDependence", "EmployeeRestController::getEmployeeAndDependence"); $routes->post("editEmployeeAndDependence", "EmployeeRestController::editEmployeeAndDependence"); $routes->post("addEmployeeAndDependence", "EmployeeRestController::addEmployeeAndDependence"); + + $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy"); }); diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 9f2d3574..48db23f7 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -198,6 +198,7 @@ class EmployeeRestController extends AdminController $result = []; foreach ($empPolicy as $array) { + $decodedArray = json_decode($array->Policy_Terms); $refusingData = (object) array_diff_key((array) $decodedArray, array_flip($keysToRemove)); @@ -208,7 +209,10 @@ class EmployeeRestController extends AdminController // $array->Policy_Terms = json_encode($refusingData); $array->Policy_Terms = $refusingData; - + $getSlabAndGridData = $this->policesModel->getPolicySlabRatesForEmpOnboard($array->ClientPolicyId,$array->ClientId); + $array->SlabRates = $getSlabAndGridData['slab_rates']; + $array->GridMaster = $getSlabAndGridData['grid_master']; + $result[] = $array; } return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200); diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 4e880bd2..52382dc1 100644 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -37,7 +37,7 @@ class EmployeeModel extends Model { return $this->db->table('employee_polices') - ->select(' policies.name as Policy_Name , client_policy.policy_terms as Policy_Terms, client_policy.client_id as ClientId, client_policy.policy_id as PolicyId, client_policy.open_for_enrollment as OpenForEnrollment') // Select all columns from both tables + ->select(' policies.name as Policy_Name , client_policy.policy_terms as Policy_Terms, client_policy.client_id as ClientId, client_policy.policy_id as PolicyId,client_policy.id as ClientPolicyId, client_policy.open_for_enrollment as OpenForEnrollment') // Select all columns from both tables ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id') ->join('policies', 'policies.id = client_policy.policy_id') ->where('employee_polices.employee_id', $id) diff --git a/app/Models/PolicesModel.php b/app/Models/PolicesModel.php index 074575f3..96e5e8f1 100644 --- a/app/Models/PolicesModel.php +++ b/app/Models/PolicesModel.php @@ -36,12 +36,13 @@ class PolicesModel extends Model $premium_slab_data = null; $policyPremium1Model = new policyPremium1Model(); - $premium_slab_data = $policyPremium1Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->findAll(); - if((isset($premium_slab_data))) + + if((!count($premium_slab_data))) { $policyPremium2Model = new policyPremium2Model(); $premium_slab_data = $policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->findAll(); + } $grid_id = $premium_slab_data[0]['policy_grid_id']; $policyGridModel = new policyGridModel();