Merge remote-tracking branch 'origin/dev' into dev

app/Helpers/excel_util_helper.php

@@ -979,6 +979,7 @@ if (!function_exists('calculate_premium_new'))
         
         //4. if macthed then the current rack rate is applicable and find common variables link max age,max count,grade, basic pay,SI, self/acting self for current rack rate
 
+        //   log_message('error', 'CALCULATION_MEMBER_PREMIUM_FAMIL_DATA ' . json_encode($family_data));
           foreach($family_data as $fkey => $member)
             {
                 // dd($member);
@@ -992,6 +993,13 @@ if (!function_exists('calculate_premium_new'))
                 $member[6] = $family_data[0][6];
                 $member[10] = $family_data[0][10];
                 $member[18] = $family_data[0][18];
+
+                // If the member's date of coverage is empty, then use the self’s date of coverage
+                if(empty($member[7])){
+                    $member[7] = $family_data[0][7];
+                }
+
+                // log_message('error', 'CALCULATION_MEMBER_PREMIUM ' . json_encode($member));
                 //set default unit if unit is not available in self/members level
                 if(empty($member[18])){ $member[18] = $existing_units[0]; }
                 //transform as db row column

app/Models/EmployeeModel.php

@@ -170,6 +170,7 @@ class EmployeeModel extends Model
                         ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
                         ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
                         ->where('client_policy.policy_status', 1)
+                        ->where('client_policy.enrolment_visibility', 1)
                         ->where('employee_polices.status !=', 'truncated')
                         ->where('employee_polices.is_active', 1)
                         ->where('employee_polices.employee_id', $id)