diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index dadbc267..0c6566f1 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -6033,8 +6033,8 @@ class ClientController extends AdminController ->where('employees.is_active', 1) ->where('employees.relationship', "Self") ->where('employee_polices.is_active', 1) - ->whereIn('employees.emp_status', ['active']) - ->whereIn('employee_polices.status', ['active']) + ->whereIn('employees.emp_status', ['active', 'expired']) + ->whereIn('employee_polices.status', ['active', 'expired']) ->where('employees.is_active', 1) ->where('client_policy.id', $param) ->groupBy('employees.emp_code') @@ -6147,10 +6147,10 @@ class ClientController extends AdminController ->where('insurers.is_active', 1) ->where('tpa.is_active', 1) ->where('employees.is_active', 1) - ->where('employees.emp_status', "active") + ->whereIn('employees.emp_status', ['active', 'expired']) ->where('employees.relationship', "Self") ->where('employee_polices.is_active', 1) - ->where('employee_polices.status', "active") + ->whereIn('employee_polices.status', ['active', 'expired']) ->where($field_name, $param); if (!empty($client_id)) { diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 6219326a..18018d3c 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -2068,7 +2068,7 @@ class TicketController extends BaseController ->join('policy_type', 'policy_type.id = client_policy.policy_type_id AND policy_type.is_active = 1') ->join('insurers', 'insurers.id = client_policy.insurer_id AND insurers.is_active = 1', 'left') ->join('tpa', 'tpa.id = client_policy.tpa_id AND tpa.is_active = 1', 'left') - ->where('client_policy.policy_status', 1) + // ->where('client_policy.policy_status', 1) ->whereIn('client_policy.id', $policy_ids) ->findAll(); diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 7f210ca7..b9adb13f 100755 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -275,8 +275,8 @@ class EmployeeModel extends Model ->join('employee_polices', 'employees.id = employee_polices.employee_id', 'left') ->where('employees.is_active', 1) ->where('employee_polices.is_active', 1) - ->where('employees.emp_status', "active") - ->where('employee_polices.status', "active") + ->whereIn('employees.emp_status', ['active', 'expired']) + ->whereIn('employee_polices.status', ['active', 'expired']) ->where('employees.emp_code', $emp_code); if(!empty($client_id)){