Nhances/nhance-enrollment
Nhances/nhance-enrollment
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE_TEST_BUG_FIXES

Browse Source
This commit is contained in:
Ubuntu 2026-07-02 14:42:09 +05:30
commit af010ef913
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Controllers/DashboardController.php
View File

@ -369,8 +369,9 @@ class DashboardController extends AdminController
// Fetch all employees related to the client policy
$employees = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->where('employee_polices.client_policy_id', $client_policy['policy_id'])
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)
@ -385,8 +386,9 @@ class DashboardController extends AdminController
} else if (($client_policy['policy_type_id'] == 3 && $client_policy['is_addon'] == 3) || $client_policy['policy_type_id'] == 5) {
$empDependentData = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->where('employee_polices.client_policy_id', $client_policy['policy_id'])
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)
@ -402,8 +404,9 @@ class DashboardController extends AdminController
if (!empty($empCodes)) {
$empSelfData = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->whereIn('employees.emp_code', $empCodes)
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)
@ -461,8 +464,9 @@ class DashboardController extends AdminController
if (in_array($client_policy['policy_type_id'], [2, 4]) || ($client_policy['policy_type_id'] == 3 && $client_policy['is_addon'] == 1)) {
$employees = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->where('employee_polices.client_policy_id', $client_policy['id'])
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)
@ -477,8 +481,9 @@ class DashboardController extends AdminController
} else if (($client_policy['policy_type_id'] == 3 && $client_policy['is_addon'] == 3) || $client_policy['policy_type_id'] == 5) {
$empDependentData = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->where('employee_polices.client_policy_id', $client_policy['id'])
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)
@ -494,8 +499,9 @@ class DashboardController extends AdminController
if (!empty($empCodes)) {
$empSelfData = $this->employeePolicyModel
->select('employees.*, employee_polices.id as emp_policy_id')
->select('employees.*, employee_polices.id as emp_policy_id, employee_polices.enrollment_open_date, employee_polices.enrollment_close_date, client_policy.policy_no')
->join('employees', 'employee_polices.employee_id = employees.id', 'left')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id', 'left')
->whereIn('employees.emp_code', $empCodes)
->where('employees.is_active', 1)
->where('employee_polices.is_active', 1)

15
app/Helpers/sendMailNotification.php
View File

@ -118,17 +118,20 @@ class sendMailNotification
$mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "<img src='$nhance_logo' alt='Nhance Logo' width='20'>", $mail_content);
$mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "<img src='$client_logo' alt='Client Logo' width='20'>", $mail_content);
$mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "<a href='$app_link'>Review Details</a>", $mail_content);
$mail_content = str_replace(["[[policy_no]]", "{{policy_no}}"], $emp_data['policy_no'], $mail_content);
$mail_content = str_replace(["[[enrollment_open_date]]", "{{enrollment_open_date}}"], $emp_data['enrollment_open_date'], $mail_content);
$mail_content = str_replace(["[[enrollment_close_date]]", "{{enrollment_close_date}}"], $emp_data['enrollment_close_date'], $mail_content);
$mail_content = str_replace(["[[policy_no]]", "{{policy_no}}"], $emp_data['policy_no'] ?? '', $mail_content);
$mail_content = str_replace(["[[emp_code]]", "{{emp_code}}"], $emp_data['emp_code'] ?? '', $mail_content);
$mail_content = str_replace(["[[employee_name]]", "{{employee_name}}"], $emp_data['name'] ?? '', $mail_content);
$mail_content = str_replace(["[[employee_mobile]]", "{{employee_mobile}}"], $emp_data['mobile'] ?? '', $mail_content);
$mail_content = str_replace(["[[enrollment_open_date]]", "{{enrollment_open_date}}"], $emp_data['enrollment_open_date'] ?? '', $mail_content);
$mail_content = str_replace(["[[enrollment_close_date]]", "{{enrollment_close_date}}"], $emp_data['enrollment_close_date'] ?? '', $mail_content);
$employee_name = $emp_data['name'];
$employee_mobile_no = $emp_data['mobile'];
$employee_name = $emp_data['name'] ?? '';
$employee_mobile_no = $emp_data['mobile'] ?? '';
$mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $employee_name, $mail_content);
$mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content);
$mail = $emp_data['email_corporate'];
$mail = $emp_data['email_corporate'] ?? '';