diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index ec1f48a3..eb25bf6a 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -115,6 +115,7 @@ class EmployeePolicyModel extends Model 'client_branch.branch_name as client_branch_name', 'client_branch.branch_code as client_branch_code', 'cp.policy_no', + 'cp.policy_type_id', ]) ->join('employees emp', 'employee_polices.employee_id = emp.id') ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy @@ -192,7 +193,7 @@ class EmployeePolicyModel extends Model $result = $this->select([ 'employee_polices.id' ]) - ->join('employees emp', 'employee_polices.employee_id = emp.id AND emp.relationship = "Self" '); + ->join('employees emp', 'employee_polices.employee_id = emp.id'); if ($policy_id !=0 && !empty($policy_id)) { $result->where('employee_polices.client_policy_id', $policy_id); } @@ -201,7 +202,9 @@ class EmployeePolicyModel extends Model ->where('employee_polices.status', 'active') ->where('employee_polices.tpa_id is not null') ->where('employee_polices.ecard_sent_status',0) - ->where('emp.relationship','Self'); + // ->where('emp.relationship','Self'); + ->where('emp.email_corporate !=','') + ->where('emp.email_corporate is not null'); return $result->findAll(); // $result->findAll(); diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php index 97943e91..5c0d2779 100755 --- a/app/Views/employee_data_list.php +++ b/app/Views/employee_data_list.php @@ -145,11 +145,11 @@ Edit - + View E-Card - + Send E-Card Mail