From eeb5e96a8b54d69d99aba43421e49903c005f9fc Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Mon, 27 Oct 2025 16:16:58 +0530
Subject: [PATCH] CHANGE_inception mail notification for mail bug fix - VADIVEL
 J 2025-10-27 16:16

---
 app/Controllers/EmployeeRestController.php |  2 +-
 app/Helpers/sendMailNotification.php       | 76 +++++++++++++++++
 app/Views/mail_template.php                | 98 ++++++++++++++++++++++
 3 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 app/Views/mail_template.php

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 69296a0c..ecbba2f7 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4229,7 +4229,7 @@ class EmployeeRestController extends AdminController
         $from_mail      =  "";
         $to_mail        =  $account_manager_email;
         $subject        =  $mailTemplate['subject'];
-        $message        =  $mailTemplate['content'];
+        $message        =  $mailTemplate['mail_content'];
         $cc_string      =  "";
         $attachments    =  "";
         $reply_to       =  "";
diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php
index f9de6b09..b27a76b1 100755
--- a/app/Helpers/sendMailNotification.php
+++ b/app/Helpers/sendMailNotification.php
@@ -57,6 +57,13 @@ class sendMailNotification
 
             $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "<a href='$app_link'>Review Details</a>", $mail_content);
             if ($dataToInsert['relationship'] == 'Self' && $mail != null || $mail != '') {
+
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
                 $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments, 'common' => $common];
             }
             
@@ -89,6 +96,12 @@ class sendMailNotification
             $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content);
             $mail = $emp_data['email_corporate'];     
 
+                            $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
             $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common];
 
             return $wholeData;
@@ -139,6 +152,13 @@ class sendMailNotification
             $mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "<a href='$link/1'>Download Insurance Card</a>", $mail_content);
             $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
            
+                            $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
+
             $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common];
 
             return $wholeData;
@@ -523,6 +543,13 @@ class sendMailNotification
                 $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);
 
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
+
                 // print_r($mail_content); die;
 
                 // $mail = "aadhavanvalli@gmail.com";
@@ -825,6 +852,13 @@ class sendMailNotification
                         $full_name = $value['first_name'] .' ' .$value['last_name'];
                         $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $full_name , $mail_content); 
 
+                                        $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
+
                         $wholeData[] =  ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to'], 'common' => $common];
                         // $wholeData[] =  ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'}};
                     }
@@ -1118,6 +1152,11 @@ class sendMailNotification
                 
                 $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
 
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
 
                 $hr_mails = $client_data['hr_mails'];
                 $mail_array = explode(',', $hr_mails);
@@ -1183,6 +1222,13 @@ class sendMailNotification
             $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "<a href='$app_link'>Review Details</a>", $mail_content);
             
             if ($mail != null || $mail != '') {
+
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
                 $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments];
             }
             
@@ -1215,6 +1261,13 @@ class sendMailNotification
             if ((isset($notification_data) && $notification_data['enabled'] == 1)) {
 
                 if (isset($mail) && !empty($mail)) {
+
+                                    $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
                     $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']];
                 }
 
@@ -1268,6 +1321,12 @@ class sendMailNotification
             $mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "<a href='$link/1'>Download Insurance Card</a>", $mail_content);
             $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
 
+                            $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
             $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'],'attachments' => $attachments, 'reply_to' => $client_data['reply_to']];
 
             return $wholeData;
@@ -1419,6 +1478,11 @@ class sendMailNotification
                 $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content);
                 $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
 
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
 
                 $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']];
 
@@ -1568,6 +1632,13 @@ class sendMailNotification
                 $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);
 
+
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
+
                 $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']];
                 
                 return  $wholeData;
@@ -1717,6 +1788,11 @@ class sendMailNotification
                 $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);
 
+                                $mail_content = preg_replace('/<p[^>]*>(&nbsp;|\s)*<\/p>/i', '', $mail_content);
+
+                $data['params'] = $params;$data['client_logo'] = $client_logo;
+                $data['mail_content'] = $mail_content;
+                $mail_content = view('mail_template', $data);
                 
                 $wholeData =  ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']];
 
diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
new file mode 100644
index 00000000..22582cf5
--- /dev/null
+++ b/app/Views/mail_template.php
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Email Notification</title>
+</head>
+
+<style>
+
+.mail-template-header {
+  max-width: 500px;
+  background-color: #ffffff !important;
+  border-bottom: 1px solid #00999E;
+  width: 100%;   /* default: allow full width */
+}
+
+/* On screens smaller than 600px → force 100% */
+@media screen and (max-width: 600px) {
+  .mail-template-header {
+    background-color: #ffffff !important;
+    max-width: 100% !important;
+    width: 100% !important;
+  }
+}
+
+.mail-template-footer {
+  max-width: 500px;
+  background-color: #ffffff !important;
+  border-top: 1px solid #00999E;
+  width: 100%;   /* default: allow full width */
+}
+
+/* On screens smaller than 600px → force 100% */
+@media screen and (max-width: 600px) {
+  .mail-template-footer {
+    background-color: #ffffff !important;
+    max-width: 100% !important;
+    width: 100% !important;
+  }
+}
+
+  
+
+</style>
+
+
+
+<body>
+    <!-- header -->
+  <div align="center">
+    <table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-header">
+      <tr style="height:90px; background-color: #ffffff !important;">
+        <td align="left" valign="middle" style="padding:20px;" width="50%">
+          <img src="<?= $client_logo?>"
+            alt="Client Logo"
+            style="max-height:80px; max-width: 160px;">
+        </td>
+        <td align="right" valign="middle" style="padding:20px;" width="50%">
+          <img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>"
+            alt="Default Logo"
+            style="height:auto; max-width: 120px;">
+        </td>
+      </tr>
+    </table>
+  </div>
+
+
+    <!-- mail content -->
+
+    <?php 
+        echo $mail_content;
+    ?>
+
+
+
+  <!-- footer -->
+  <div align="center">
+    <table width="100%"  border="0" cellspacing="0" cellpadding="0" class="mail-template-footer">
+    <tr style="background-color: #ffffff !important;">
+        <td align="center" valign="middle" style="padding-top:5px;">
+        <img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>" 
+            alt="Default Logo" 
+            style="height:auto; max-width: 120px;padding-top:5px;">
+            <p>
+                &copy; <?= date('Y'); ?> Nhance India Insurance Broking Pvt Ltd
+            </p>
+
+        </td>   
+    </tr>
+    </table>
+    </div>
+</body>
+
+</html>
+
+