From a76585137c98f47308a53f4302a2f1eaf9417999 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 4 Nov 2025 17:35:16 +0530 Subject: [PATCH] FIX_PR_POLICY_COUNT_API_EMAIL_ISSUE --- app/Controllers/EmployeeRestController.php | 36 +++++++++++++++++----- app/Helpers/sendMailNotification.php | 20 +++++++----- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 904f54a..069fc22 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3426,6 +3426,7 @@ class EmployeeRestController extends AdminController $request = $this->request->getJSON(true); $mobile_no = $request['mobile_number'] ?? null; + $email_id = $request['email_id'] ?? null; $client_short_name = $request['client_short_name'] ?? null; log_message('error', 'STEP 2: Received input - ' . json_encode($request)); @@ -3434,12 +3435,22 @@ class EmployeeRestController extends AdminController $clientId = null; if (!empty($client_short_name)) { log_message('error', 'STEP 3: Looking up client with short_name: ' . $client_short_name); - $client_data = $this->clientModel - ->where('is_active', 1) - ->where('short_name', $client_short_name) - ->first(); - if ($client_data) { + // $client_data = $this->clientModel + // ->where('is_active', 1) + // ->where('short_name', $client_short_name) + // ->first(); + + $sql = "SELECT * FROM clients WHERE is_active = 1 AND short_name = ? LIMIT 1"; + $client_data = db_connect()->query($sql, [$client_short_name])->getRowArray(); + + + log_message('error', 'STEP 3: Looking up client with short_name: ' . db_connect()->getLastQuery()); + log_message('error', 'STEP 3: Looking up client with short_name: ' . var_dump($client_data) ); + log_message('error', 'STEP 3: Looking up client with short_name: ' . is_array($client_data) && count($client_data)); + log_message('error', 'STEP 3: Looking up client with short_name: ' . json_encode($client_data)); + + if (is_array($client_data) && count($client_data)) { $clientId = $client_data['id']; log_message('error', 'STEP 4: Found client ID: ' . $clientId); } else { @@ -3450,8 +3461,8 @@ class EmployeeRestController extends AdminController } // Step 5: Validate mobile number - if (empty($mobile_no)) { - log_message('error', 'STEP 5: Mobile number is empty or null. Returning 0.'); + if (empty($mobile_no) && empty($email_id)) { + log_message('error', 'STEP 5: Mobile number and Email is empty or null. Returning 0.'); return $this->respond(['data' => 0]); } @@ -3469,7 +3480,6 @@ class EmployeeRestController extends AdminController ->where('cp.open_for_enrollment', 1) ->where('cp.policy_status', 1) ->whereIn('cp.policy_type_id', [1, 2, 6, 7]) - ->where('employees.mobile', $mobile_no) ->orderBy('employees.created_at', 'desc') ->groupBy('employee_polices.client_policy_id'); @@ -3480,6 +3490,16 @@ class EmployeeRestController extends AdminController log_message('error', 'STEP 7: No client ID filter applied.'); } + if (!empty($mobile_no)) { + $builder->where('employees.mobile', $mobile_no); + log_message('error', 'STEP 7: Applied mobile_no filter: ' . $mobile_no); + } + + if (!empty($email_id)) { + $builder->where('employees.email_corporate', $email_id); + log_message('error', 'STEP 7: Applied email_id filter: ' . $email_id); + } + $count = $builder->get()->getNumRows(); log_message('error', 'STEP 8: Final policy count = ' . $count); diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 67aa5a2..358b362 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -256,7 +256,8 @@ class sendMailNotification $policy_name = $inner_item['policy_name']; if ($inner_item['relationship'] == 'Self') { - $emp_code = '(' . $inner_item['emp_code'] . ')'; + // $emp_code = '(' . $inner_item['emp_code'] . ')'; + $emp_code = ' ( Employee Code : ' . $inner_item['emp_code'] . ')'; $mail = $inner_item['email_corporate']; $name = $inner_item['name']; $employee_mobile_no = $inner_item['mobile']; @@ -549,7 +550,7 @@ class sendMailNotification // dd($payable_employee_array, $Addon_list); // print_r($table_content); die; - $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')', $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . $emp_code, $mail_content); $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content); $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content, $mail_content); @@ -647,7 +648,8 @@ class sendMailNotification $policy_name = $inner_item['policy_name']; if ($inner_item['relationship'] == 'Self') { - $emp_code = ' (' . $inner_item['emp_code'] . ')'; + // $emp_code = ' (' . $inner_item['emp_code'] . ')'; + $emp_code = ' ( Employee Code : ' . $inner_item['emp_code'] . ')'; } else { $emp_code = ''; } @@ -1406,7 +1408,8 @@ class sendMailNotification $policy_name = $array_list['policy_name']; if ($array_list['relationship'] == 'Self') { - $emp_code = ' (' . $array_list['emp_code'] . ')'; + // $emp_code = ' (' . $array_list['emp_code'] . ')'; + $emp_code = ' ( Employee Code : ' . $array_list['emp_code'] . ')'; } else { $emp_code = ''; } @@ -1496,7 +1499,7 @@ class sendMailNotification } } - $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')', $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . $emp_code, $mail_content); $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content); $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content, $mail_content); @@ -1562,7 +1565,8 @@ class sendMailNotification $policy_name = $array_list['policy_name']; if ($array_list['relationship'] == 'Self') { - $emp_code = ' (' . $array_list['emp_code'] . ')'; + // $emp_code = ' (' . $array_list['emp_code'] . ')'; + $emp_code = ' ( Employee Code : ' . $array_list['emp_code'] . ')'; } else { $emp_code = ''; } @@ -1652,7 +1656,7 @@ class sendMailNotification } } - $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')', $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . $emp_code, $mail_content); $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content, $mail_content); @@ -1809,7 +1813,7 @@ class sendMailNotification } } - $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')', $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . $emp_code, $mail_content); $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content, $mail_content);