From ce4312fc8db9959b084fbe327554294b3f6f4760 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Thu, 11 Jul 2024 14:58:30 +0530 Subject: [PATCH 01/10] CHANGE_ mpin status api : GWM --- app/Config/Routes.php | 1 + .../RestAuthenticationController.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index f4df6e62..4778427f 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -272,6 +272,7 @@ $routes->get("processjob", "JobWorker::processJob"); $routes->post("/employeeRest/verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber"); $routes->post("/employeeRest/getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData"); $routes->post("/employeeRest/verifyMpin", "RestAuthenticationController::verifyMpin"); +$routes->post("/employeeRest/checkMpin", "RestAuthenticationController::checkMpin"); //HR login api's $routes->post("/employeeRest/verifyHrWithMobileNumber", "RestAuthenticationController::verifyHrWithMobileNumber"); $routes->post("/employeeRest/getVerifiedHrData", "RestAuthenticationController::getVerifiedHrData"); diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 4e5cf279..7c7358f7 100644 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -310,6 +310,25 @@ class RestAuthenticationController extends AdminController } } + public function checkMpin() + { + try { + $mobile_number = $this->request->getJSON()->mobile_number; + + + $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); + + if ($employeeData && $employeeData["mpin"] != null) { + + return $this->respond(['status' => 'success','code' => 200,'data' => "Mpin - exist"],200); + } else { + return $this->respond(['status' => 'failed','code' => 404,'data' => "Mpin - not found"],200); + } + } catch (\Exception $e) { + return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); + } + } + } \ No newline at end of file From ecfda34fbca9e9dfe827e70a1e23bd470815a05c Mon Sep 17 00:00:00 2001 From: bitbucket Date: Mon, 15 Jul 2024 12:07:55 +0530 Subject: [PATCH 02/10] CHANGE_ mpin check api change : GWM --- app/Controllers/RestAuthenticationController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 7c7358f7..6efaa163 100644 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -320,9 +320,9 @@ class RestAuthenticationController extends AdminController if ($employeeData && $employeeData["mpin"] != null) { - return $this->respond(['status' => 'success','code' => 200,'data' => "Mpin - exist"],200); + return $this->respond(['status' => 'success','code' => 200,'data' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"]],200); } else { - return $this->respond(['status' => 'failed','code' => 404,'data' => "Mpin - not found"],200); + return $this->respond(['status' => 'failed','code' => 404,'data' => "Mpin - not found", 'Mpin' =>null],200); } } catch (\Exception $e) { return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); From f19ccf660167c5fb31ccae49cff044f92762f853 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 16 Jul 2024 15:13:03 +0530 Subject: [PATCH 03/10] CHANGE_ in getEmployeePolicy model function : GWM --- app/Models/EmployeePolicyModel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index a94410f5..3dfe16ec 100644 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -101,6 +101,9 @@ class EmployeePolicyModel extends Model 'emp.emp_status', 'emp.is_active as emp_is_active', 'emp.mobile as mobile', + 'emp.doj', + 'emp.basic_pay', + 'emp.band as grade', 'policy_type.policy_type', 'cp.policy_no', ]) From 59dc24596bf3030261b15b6431bfdca80e1a8ce1 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Tue, 16 Jul 2024 17:48:11 +0530 Subject: [PATCH 04/10] CHANGE_Member_Review_And_Summary_Mail : AADHAVAN --- app/Helpers/sendMailNotification.php | 74 ++++++++++++++++------------ app/Helpers/session_helper.php | 6 +++ app/Helpers/utility_helper.php | 61 +++++++++++++++++++++++ 3 files changed, 110 insertions(+), 31 deletions(-) diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 84c8a13d..d5f6e885 100644 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -165,7 +165,7 @@ class sendMailNotification $is_addon =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.number_format($inner_item['basic_cover_si'], 2, '.', ',').''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; + $temp_data .= '' . $inner_item['name'] . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; if($inner_item['relationship'] == 'Self' || $inner_item['relationship'] == 'self'){ $mail = $inner_item['email_corporate']; $name = $inner_item['name']; @@ -179,10 +179,10 @@ class sendMailNotification } } // echo $policy_name;die; - $table_content .= $policy_name.''; + $table_content .= $policy_name.'
NameMobile NumberSum InsureDate Of Birth
GST'; $table_content .= $temp_data; $table_content .= '
NameRelationDate Of BirthSum InsurePremium
'; - + $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name'=>$policy_name, @@ -200,17 +200,20 @@ class sendMailNotification } } + if(count($Addon_list) != 0 && count($Addon_list) > 0){ + $table_content .='
'; + $sum_tolal = 0; + foreach ($Addon_list as $key => $value) { + $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; + $table_content .= ''; + } + $sum_total_words = numberToWords($sum_tolal); + $table_content .= ''; + $table_content .= '
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'

Total

'.format_indian_number($sum_tolal).'
'; + $table_content .= '
'. $sum_total_words .'
'; - $table_content .='
'; - $sum_tolal = 0; - foreach ($Addon_list as $key => $value) { - $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; - $table_content .= ''; } - $table_content .= ''; - $table_content .= '
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'

Total

'.$sum_tolal.'
'; $mail_content = str_replace("[[member_name]]", $name, $mail_content); - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); // $mail = "aadhavanvalli@gmail.com"; // if (isset($mail) && !empty($mail)) { @@ -276,7 +279,7 @@ class sendMailNotification $is_addon =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.number_format($inner_item['basic_cover_si'], 2, '.', ',').''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; + $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.format_indian_number($inner_item['basic_cover_si']).''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; // print_r($inner_item);die; $is_addon = $inner_item['is_addon']; @@ -288,7 +291,7 @@ class sendMailNotification $table_content .= $policy_name.''; $table_content .= $temp_data; $table_content .= '
NameMobile NumberSum InsureDate Of Birth
'; - + $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name'=>$policy_name, @@ -307,16 +310,20 @@ class sendMailNotification } + if(count($Addon_list) != 0 && count($Addon_list) > 0){ + + $table_content .='
'; + $sum_tolal = 0; + foreach ($Addon_list as $key => $value) { + $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; + $table_content .= ''; + } + $sum_total_words = numberToWords($sum_tolal); + $table_content .= ''; + $table_content .= '
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'

Total

'.format_indian_number($sum_tolal).'
'; + $table_content .= '
'. $sum_total_words .'
'; - $table_content .='
'; - $sum_tolal = 0; - foreach ($Addon_list as $key => $value) { - $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; - $table_content .= ''; } - $table_content .= ''; - $table_content .= '
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'

Total

'.$sum_tolal.'
'; - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); $account_manager_mail_list = []; @@ -383,7 +390,7 @@ class sendMailNotification $temp_data =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.number_format($inner_item['basic_cover_si'], 2, '.', ',').''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; + $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.format_indian_number($inner_item['basic_cover_si']).''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; // print_r($inner_item);die; $is_addon = $inner_item['is_addon']; @@ -395,6 +402,7 @@ class sendMailNotification $table_content .= $policy_name.''; $table_content .= $temp_data; $table_content .= '
NameMobile NumberSum InsureDate Of Birth
'; + $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ @@ -412,16 +420,18 @@ class sendMailNotification $gst = 0; } - - $table_content .='
'; - $sum_tolal = 0; - foreach ($Addon_list as $key => $value) { - $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; - $table_content .= ''; + if(count($Addon_list) != 0 && count($Addon_list) > 0){ + $table_content .='
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'
'; + $sum_tolal = 0; + foreach ($Addon_list as $key => $value) { + $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; + $table_content .= ''; + } + $sum_total_words = numberToWords($sum_tolal); + $table_content .= ''; + $table_content .= '
Policy Name Additional PremiumGSTTotal
'.$value['policy_name'].'₹'.$value['addtional_premium'].''.$value['gst'].''.$value['gst'] + $value['addtional_premium'] .'

Total

'.format_indian_number($sum_tolal).'
'; + $table_content .= '
'. $sum_total_words .'
'; } - $table_content .= '

Total

'.$sum_tolal.''; - $table_content .= ''; - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); @@ -439,4 +449,6 @@ class sendMailNotification } } + + } \ No newline at end of file diff --git a/app/Helpers/session_helper.php b/app/Helpers/session_helper.php index ce6a0f56..92f443d2 100644 --- a/app/Helpers/session_helper.php +++ b/app/Helpers/session_helper.php @@ -139,3 +139,9 @@ if (!function_exists('get_session_context')) { return $session->get('context'); } } + + + + + + diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php index 87945e48..da3f5f4c 100644 --- a/app/Helpers/utility_helper.php +++ b/app/Helpers/utility_helper.php @@ -248,3 +248,64 @@ if (!function_exists('get_role_id')) { } +function numberToWords($number) +{ + $words = array( + '0' => 'Zero', + '1' => 'One', + '2' => 'Two', + '3' => 'Three', + '4' => 'Four', + '5' => 'Five', + '6' => 'Six', + '7' => 'Seven', + '8' => 'Eight', + '9' => 'Nine', + '10' => 'Ten', + '11' => 'Eleven', + '12' => 'Twelve', + '13' => 'Thirteen', + '14' => 'Fourteen', + '15' => 'Fifteen', + '16' => 'Sixteen', + '17' => 'Seventeen', + '18' => 'Eighteen', + '19' => 'Nineteen', + '20' => 'Twenty', + '30' => 'Thirty', + '40' => 'Forty', + '50' => 'Fifty', + '60' => 'Sixty', + '70' => 'Seventy', + '80' => 'Eighty', + '90' => 'Ninety' + ); + + if ($number < 21) { + return $words[$number]; + } + + if ($number < 100) { + $tens = (int)($number / 10) * 10; + $units = $number % 10; + return $words[$tens] . ($units ? ' ' . $words[$units] : ''); + } + + if ($number < 1000) { + $hundreds = (int)($number / 100); + $remainder = $number % 100; + return $words[$hundreds] . ' Hundred' . ($remainder ? ' and ' . numberToWords($remainder) : ''); + } + + $levels = array('', ' Thousand', ' Million', ' Billion', ' Trillion', ' Quadrillion', ' Quintillion'); + + for ($i = 0, $unit = 1; $i < count($levels); $i++, $unit *= 1000) { + if ($number < $unit * 1000) { + $current = (int)($number / $unit); + $remainder = $number % $unit; + return numberToWords($current) . $levels[$i] . ($remainder ? ' ' . numberToWords($remainder) : ''); + } + } + + return $number; // Fallback for numbers beyond the supported range +} From 7e69a77b8afe5a004b3ecbc7ac50d877a84df7d0 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Wed, 17 Jul 2024 17:01:27 +0530 Subject: [PATCH 05/10] CHANGE_ in iAgreeForAddOn API status change : GWM --- app/Controllers/EmployeeRestController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 6dcd79c2..1edfc878 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1765,21 +1765,29 @@ public function iAgreeForAddOn() ->where('is_active', 1 ) ->set(array('emp_status'=>'enrolled')) ->update(); + + $empData = $this->employeeModel->where('emp_code', $emp_code )->where('client_id', $client_id ) ->where('is_active', 1 )->findAll(); if (!is_null($client_policy_id) && is_array($client_policy_id)) { $array_list = []; foreach ($client_policy_id as $key => $value) { - $this->employeePolicyModel->where('client_policy_id', $value ) + foreach ($empData as $empDataKey => $empDataValue) + { + $this->employeePolicyModel->where('client_policy_id', $value ) ->where('is_active', 1 ) + ->where('employee_id', $empDataValue['id'] ) ->set(array('status'=>'enrolled')) ->update(); + } + $find = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: $value,emp_code: $emp_code,client_id: $client_id,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']); if(count($find) > 0){ $array_list[] = $find; } } + $notification = $this->notificationModel->where('client_id' ,$client_id)->where('template_name', 'member_review_and_summary_mail')->first(); From 420a07364f5a8831af223d841095161121b2156f Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 18 Jul 2024 16:53:54 +0530 Subject: [PATCH 06/10] CHANGE_MAIL_CONTENT_ISSUE_FIX : AADHAVAN --- app/Controllers/EmpDataServiceController.php | 6 ++-- app/Controllers/EmployeeRestController.php | 2 -- app/Helpers/sendMailNotification.php | 30 +++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 96537b76..f1d6f143 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -3600,6 +3600,7 @@ class EmpDataServiceController extends BaseController public function sendMailForDownloadingECard(array $ids) { + $this->myLogger->logme('error', 'sendMailForDownloadingECard - function called'); if (count($ids) > 0) { @@ -3655,14 +3656,15 @@ class EmpDataServiceController extends BaseController $params['get_emp_email_and_other_details'] = $get_emp_email_and_other_details; // $this->myLogger->logme('error', 'sendMailForDownloadingECard - Send Bulk Mail function end ',); - if (isset($get_emp_email_and_other_details['email_corporate']) && !empty($get_emp_email_and_other_details['email_corporate']) && $get_emp_email_and_other_details['relationship'] === 'Self') { + if (isset($get_emp_email_and_other_details['email_corporate']) && !empty($get_emp_email_and_other_details['email_corporate']) && $get_emp_email_and_other_details['relationship'] == 'Self') { $wholeData[] = sendMailNotification::sendMailNotification('member_ecard_mail', $params); + // print_r($wholeData);die; $count++; } + $counts++; - if ($count == 20 || $counts == count($ids) - 1) { if(count($wholeData) > 0){ diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 6dcd79c2..eb7067ee 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -661,7 +661,6 @@ class EmployeeRestController extends AdminController $empServiceController = new EmployeeServiceController(); $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]); - if(isset($result['error_summary']) && count($result['error_summary'])) { $result = $empServiceController->getExcelErrorData($file_id); @@ -1789,7 +1788,6 @@ public function iAgreeForAddOn() $params ['emp_code'] = $emp_code; $params ['client_id'] = $client_id; $params ['notification'] = $notification; - $wholeData =sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params); MailHelper::send_email($wholeData[0]); diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index d5f6e885..68c4927b 100644 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -100,11 +100,16 @@ class sendMailNotification $mail_content = $notification['mail_content']; $mail = $get_emp_email_and_other_details['email_corporate']; $subject = $notification['subject']; + $link = generate_download_link($rand_string); + $app_link = $_ENV['App_Url']; $name = $get_emp_email_and_other_details['name']; $mail_content = $notification['mail_content']; + $nhance_logo = $_ENV['NHANCE_LOGO']; + // dd("3333333333333"); + $post_enrollment_app_link = $_ENV['POST_ENROLLMENT_APP_LINK']; $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; @@ -119,7 +124,6 @@ class sendMailNotification // $mail_content = str_replace("[[tpa_id]]", $tpa_id, $mail_content); $mail_content = str_replace("[[ecard_download_link]]", "Download Insurance Card", $mail_content); $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails']]; return $wholeData; @@ -157,6 +161,7 @@ class sendMailNotification $table_content = ''; $addtional_premium = 0; $gst = 0; + $Addon_list = []; foreach ($array_list as $item) { if(count($item) != 0){ $table_content .= '

Policy Name : '; @@ -182,7 +187,6 @@ class sendMailNotification $table_content .= $policy_name.'

GST'; $table_content .= $temp_data; $table_content .= '
NameRelationDate Of BirthSum InsurePremium
'; - $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name'=>$policy_name, @@ -190,7 +194,7 @@ class sendMailNotification 'gst'=>$gst ]; $Addon_list[]= $addon_list_array; - + } @@ -270,7 +274,8 @@ class sendMailNotification $addtional_premium = 0; $gst = 0; $array_list = $params['array_list']; - + $Addon_list = []; + // print_r($array_list);die; foreach ($array_list as $item) { if(count($item) != 0){ $table_content .= '

Policy Name : '; @@ -279,19 +284,20 @@ class sendMailNotification $is_addon =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.format_indian_number($inner_item['basic_cover_si']).''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; + $temp_data .= '' . $inner_item['name'] . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; // print_r($inner_item);die; $is_addon = $inner_item['is_addon']; if($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3){ + + $addtional_premium = $inner_item['rata_premimum'] + $addtional_premium; $gst = $inner_item['gst'] + $gst; } } - $table_content .= $policy_name.'

'; + $table_content .= $policy_name.'
NameMobile NumberSum InsureDate Of Birth
GST'; $table_content .= $temp_data; $table_content .= '
NameRelationDate Of BirthSum InsurePremium
'; - $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name'=>$policy_name, @@ -384,13 +390,14 @@ class sendMailNotification $addtional_premium = 0; $gst = 0; $array_list = $params['array_list']; + $Addon_list = []; foreach ($array_list as $item) { $table_content .= '

Policy Name : '; $temp_data =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['mobile'].'₹'.format_indian_number($inner_item['basic_cover_si']).''.\DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y').''; + $temp_data .= '' . $inner_item['name'] . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; // print_r($inner_item);die; $is_addon = $inner_item['is_addon']; @@ -399,10 +406,9 @@ class sendMailNotification $gst = $inner_item['gst'] + $gst; } } - $table_content .= $policy_name.'

'; + $table_content .= $policy_name.'
NameMobile NumberSum InsureDate Of Birth
GST'; $table_content .= $temp_data; $table_content .= '
NameRelationDate Of BirthSum InsurePremium
'; - $Addon_list = []; if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ @@ -448,7 +454,5 @@ class sendMailNotification } } - } - - + } } \ No newline at end of file From 3ef0a7aff3010a875ccc41814075f34a28f293f1 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 18 Jul 2024 16:58:43 +0530 Subject: [PATCH 07/10] CHANGE_MAIL_CONTENT_ISSUE_FIX_IN_NAME_ADD : AADHAVAN --- app/Helpers/sendMailNotification.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 68c4927b..57cb5051 100644 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -162,6 +162,7 @@ class sendMailNotification $addtional_premium = 0; $gst = 0; $Addon_list = []; + $name = ''; foreach ($array_list as $item) { if(count($item) != 0){ $table_content .= '

Policy Name : '; From e24992023b1f6d0b10f059e556f9a327baf8192c Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 18 Jul 2024 17:34:57 +0530 Subject: [PATCH 08/10] CHANGE_MAIL_NOT_RECIVE_IN_DEV_ADD_LOG : AADHAVAN --- app/Controllers/EmployeeRestController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index dfdfd3d5..d7379215 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1797,20 +1797,23 @@ public function iAgreeForAddOn() $params ['client_id'] = $client_id; $params ['notification'] = $notification; $wholeData =sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params); - MailHelper::send_email($wholeData[0]); + $mail_send_return = MailHelper::send_email($wholeData[0]); + $this->myLogger->logme("info", $mail_send_return); if (isset($wholeData[0])) { $account_manager_wholeData =sendMailNotification::sendMailNotification('account_maneger_summary_mail', $params); foreach ($account_manager_wholeData as $key => $value) { - MailHelper::send_email($value); + $mail_send_return1 = MailHelper::send_email($value); + $this->myLogger->logme("info", $mail_send_return1); } $client_hr_wholeData =sendMailNotification::sendMailNotification('client_hr_summary_mail', $params); foreach ($client_hr_wholeData as $key => $value) { - MailHelper::send_email($value); + $mail_send_return2 = MailHelper::send_email($value); + $this->myLogger->logme("info", $mail_send_return2); } } } From fd30391caca75ac1cc422b47bcc2c878570b95d0 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 18 Jul 2024 17:42:24 +0530 Subject: [PATCH 09/10] CHANGE_MAIL_CONFIG_CHANGE : AADHAVAN --- app/Config/Email.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Config/Email.php b/app/Config/Email.php index f7e3ae01..0876c49e 100644 --- a/app/Config/Email.php +++ b/app/Config/Email.php @@ -28,17 +28,17 @@ class Email extends BaseConfig /** * SMTP Server Hostname */ - public string $SMTPHost = 'mail.venbait.in'; + public string $SMTPHost = 'smtp.gmail.com'; /** * SMTP Username */ - public string $SMTPUser = 'bbone@venbait.in'; + public string $SMTPUser = 'venbatechnologies@gmail.com'; /** * SMTP Password */ - public string $SMTPPass = 'xk!L(N_-R#};'; + public string $SMTPPass = 'dsfllmxdzxxkcxgz'; /** * SMTP Port From ba4ad6bb62605d0f3d1fb51c3efc23894e02bbda Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 19 Jul 2024 09:57:30 +0530 Subject: [PATCH 10/10] CHANGE_MAIL_NOTIFICATION_CHECK : AADHAVAN --- app/Controllers/EmployeeRestController.php | 3 ++- app/Helpers/sendMailNotification.php | 30 ++++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index d7379215..d7ba79f2 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1754,7 +1754,7 @@ public function iAgreeForAddOn() { $postData = json_decode($this->request->getBody(), true); $client_policy_id = $postData['client_policy_id']; - + sort($client_policy_id); // Alternatively, you can use echo to see the type $emp_code = $postData['emp_code']; $client_id = $postData['client_id']; @@ -1796,6 +1796,7 @@ public function iAgreeForAddOn() $params ['emp_code'] = $emp_code; $params ['client_id'] = $client_id; $params ['notification'] = $notification; + // print_r($params);die; $wholeData =sendMailNotification::sendMailNotification('member_review_and_summary_mail', $params); $mail_send_return = MailHelper::send_email($wholeData[0]); $this->myLogger->logme("info", $mail_send_return); diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 57cb5051..5a35ccd2 100644 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -12,6 +12,7 @@ class sendMailNotification { public static function sendMailNotification($action, $params) { + print_r($params);die; if ($action == 'member_welcome_mail') { $dataToInsert = $params['dataToInsert']; $notification = $params['notification']; @@ -37,7 +38,6 @@ class sendMailNotification return $wholeData; } else if($action == 'member_reminder_mail'){ - // print_r($params);die; $EmployeeModel = new EmployeeModel(); $emp_data = $params['emp_data']; $notification_data = $params['notification_data']; @@ -157,12 +157,12 @@ class sendMailNotification // Step 1: Replace the placeholder with an HTML table structure $mail = ''; - // print_r($array_list);die; $table_content = ''; $addtional_premium = 0; $gst = 0; $Addon_list = []; $name = ''; + $emp_code = ''; foreach ($array_list as $item) { if(count($item) != 0){ $table_content .= '

Policy Name : '; @@ -175,8 +175,8 @@ class sendMailNotification if($inner_item['relationship'] == 'Self' || $inner_item['relationship'] == 'self'){ $mail = $inner_item['email_corporate']; $name = $inner_item['name']; + $emp_code = $inner_item['emp_code']; } - // print_r($inner_item);die; $is_addon = $inner_item['is_addon']; if($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3){ @@ -218,7 +218,7 @@ class sendMailNotification $table_content .= '
'. $sum_total_words .'
'; } - $mail_content = str_replace("[[member_name]]", $name, $mail_content); + $mail_content = str_replace("[[member_name]]", $name . ' (' . $emp_code . ')' , $mail_content); $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); // $mail = "aadhavanvalli@gmail.com"; // if (isset($mail) && !empty($mail)) { @@ -228,7 +228,6 @@ class sendMailNotification return $wholeData; } - // print_r($wholeData);die; } else if($action == 'account_maneger_summary_mail'){ $client_id = $params['client_id']; @@ -250,7 +249,6 @@ class sendMailNotification $user_list[]=$user_data; } } - // print_r($client_rm_data);die; @@ -270,13 +268,11 @@ class sendMailNotification // Step 1: Replace the placeholder with an HTML table structure $mail = ''; - // print_r($array_list);die; $table_content = ''; $addtional_premium = 0; $gst = 0; $array_list = $params['array_list']; $Addon_list = []; - // print_r($array_list);die; foreach ($array_list as $item) { if(count($item) != 0){ $table_content .= '

Policy Name : '; @@ -285,8 +281,12 @@ class sendMailNotification $is_addon =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; - // print_r($inner_item);die; + if($inner_item['relationship'] == 'Self'){ + $emp_code = ' ('. $inner_item['emp_code'] . ')'; + }else{ + $emp_code =''; + } + $temp_data .= '' . $inner_item['name'] . $emp_code . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; $is_addon = $inner_item['is_addon']; if($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3){ @@ -334,7 +334,6 @@ class sendMailNotification $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); $account_manager_mail_list = []; - // print_r($user_list);die; if(isset($user_list)){ foreach ($user_list as $key => $value) { $full_name = $value['first_name'] .' ' .$value['last_name']; @@ -386,7 +385,6 @@ class sendMailNotification // Step 1: Replace the placeholder with an HTML table structure $mail = ''; - // print_r($array_list);die; $table_content = ''; $addtional_premium = 0; $gst = 0; @@ -398,8 +396,12 @@ class sendMailNotification $temp_data =''; foreach ($item as $inner_item) { $policy_name = $inner_item['policy_name']; - $temp_data .= '' . $inner_item['name'] . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; - // print_r($inner_item);die; + if($inner_item['relationship'] == 'Self'){ + $emp_code = ' ('. $inner_item['emp_code'] . ')'; + }else{ + $emp_code =''; + } + $temp_data .= '' . $inner_item['name'] . $emp_code . ''.$inner_item['relationship'].''. \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') .'₹'.format_indian_number($inner_item['basic_cover_si']).'₹'.format_indian_number($inner_item['premium']).'₹'. format_indian_number($inner_item['gst']) .''; $is_addon = $inner_item['is_addon']; if($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3){