FIX_CALCULATE_PREMIUM : RV

app/Config/Routes.php

@@ -502,4 +502,6 @@ $routes->get('enrollOpendAndClose', 'DashboardController::updatePolicyEnrollment
 $routes->get("sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail");
 $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
 $routes->get("getAddOnPolicy", "EmployeeRestController::getAddOnPolicy");
+$routes->post("addEmployeeAndDependence", "EmployeeRestController::addEmployeeAndDependence");
+
 

app/Controllers/EmployeeRestController.php

@@ -268,7 +268,8 @@ class EmployeeRestController extends AdminController
 
                     if(isset($data[0]->id))
                     {
-                        $this->createEmployeePolicyData($data[0]->id , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si);   
+                        $payable_employee = $this->getEmployeePayableValue($data[0]->client_policy_id,$data[0]->relationship);
+                        $this->createEmployeePolicyData($data[0]->id , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si, $payable_employee);   
                     }else
                     {
                         $payable_employee = $this->getEmployeePayableValue($data[0]->client_policy_id,$data[0]->relationship);
@@ -2342,6 +2343,8 @@ class EmployeeRestController extends AdminController
     $employee_data_group_by_family[$emp_id] = $data;
     
     foreach ($data as $value) {
+
+        if(!empty($value)){
             $newData = [];
             $newData['employee_id'] = $value['temp']['emp_id'];
             $newData['client_policy_id'] = $value['policy_details']['client_policy_id'];
@@ -2359,16 +2362,19 @@ class EmployeeRestController extends AdminController
             }else{
                 $this->employeePolicyModel->insert($newData);
             }
+        }
 
     }
 
-    if($this->request){ 
+    if(empty($clientPolicyId)){ 
         if(isset($policy_terms['policy_terms'])){
             $policyTermsJson = json_decode($policy_terms['policy_terms'], true);
             // print_r($employee_data_group_by_family);die();
 
             foreach ($employee_data_group_by_family[$emp_code] as $key => &$value) {
 
+                 if(!empty($value)){
+
                     if(strtolower($value['relationship']) == 'self' && $policyTermsJson['is_payable_employee']['self'] == 0){
                         $value['policy_details']['rata_premimum'] = 0;
                         $value['policy_details']['premium'] = 0;
@@ -2409,8 +2415,13 @@ class EmployeeRestController extends AdminController
                         $value['policy_details']['payable_employee'] = $policyTermsJson['is_payable_employee']['elders'];                    
                     }
 
+                 }else{
+                    unset($employee_data_group_by_family[$emp_code][$key]);
+                 }
             }
             unset($value);
+
+            $employee_data_group_by_family[$emp_code] = array_values($employee_data_group_by_family[$emp_code]);
         }
     }else{
         if(isset($policy_terms['policy_terms'])){
@@ -2418,6 +2429,7 @@ class EmployeeRestController extends AdminController
             $policyTermsJson = json_decode($policy_terms['policy_terms'], true);
 
             foreach ($employee_data_group_by_family[$emp_code] as $key => &$value) {
+                 if(!empty($value)){
 
                     if(strtolower($value['relationship']) == 'self'){
                         $value['policy_details']['payable_employee'] = $policyTermsJson['is_payable_employee']['self'];
@@ -2434,9 +2446,13 @@ class EmployeeRestController extends AdminController
                     if((strtolower($value['relationship']) == 'father in law' || strtolower($value['relationship']) == 'mother in law' || strtolower($value['relationship']) == 'father' || strtolower($value['relationship']) == 'mother' )){
                         $value['policy_details']['payable_employee'] = $policyTermsJson['is_payable_employee']['elders'];
                     }
-
+                 }else{
+                    unset($employee_data_group_by_family[$emp_code][$key]);
+                 }
             }
             unset($value);
+
+            $employee_data_group_by_family[$emp_code] = array_values($employee_data_group_by_family[$emp_code]);
         }
     }