From 01b30e4360222d3fae7dba87f1d32eb6c0dba61e Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Fri, 6 Dec 2024 10:44:31 +0530
Subject: [PATCH 1/3] FEAT_MAIL SENT HISTORY ADDED

---
 Job_Queue.txt                        |  1 +
 app/Controllers/MasterController.php | 12 ++--
 app/Helpers/GmailResponseHandler.php | 94 ++++++++++++++++++++++++++++
 app/Helpers/JWTToken.php             |  2 +-
 app/Helpers/MailHelper.php           | 23 ++++---
 app/Models/GmailSentHistoryModel.php | 11 ++++
 job_queue                            |  1 +
 phpqueue.bat                         | 42 +++++++++++++
 phpqueue.pid                         |  1 +
 phpqueue.sh                          | 56 +++++++++++++++++
 phpsetvariable.sh                    | 13 ++++
 11 files changed, 243 insertions(+), 13 deletions(-)
 create mode 100755 Job_Queue.txt
 create mode 100644 app/Helpers/GmailResponseHandler.php
 create mode 100644 app/Models/GmailSentHistoryModel.php
 create mode 100755 job_queue
 create mode 100644 phpqueue.bat
 create mode 100644 phpqueue.pid
 create mode 100755 phpqueue.sh
 create mode 100755 phpsetvariable.sh

diff --git a/Job_Queue.txt b/Job_Queue.txt
new file mode 100755
index 00000000..56a6051c
--- /dev/null
+++ b/Job_Queue.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 1599bac2..a875e437 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -30,6 +30,8 @@ use App\Models\StateModel;
 use App\Models\PolicyTypeModel;
 use App\Models\CDMasterModel;
 use App\Models\ClientDepositModel;
+use App\Models\EmployeePolicyModel;
+use App\Models\FileModel;
 use App\Models\InsurerExcelExportTemplateModel;
 use App\Models\SettingsModel;
 use App\Models\VehicleModel;
@@ -1574,7 +1576,7 @@ class MasterController extends AdminController
            $to = $this->request->getPost('to');
            $subject = $this->request->getPost('subject');
            $mail_content = $this->request->getPost('content');
-           
+           $common = ['mail_type'=>'test_mail_ui'];
            /*****CHOOSE ANY ONE AT A TIME, COMMENT ANOTHER ONE******/
 
            /*****CALLING DIRECLT USING LIB******/
@@ -1591,7 +1593,7 @@ class MasterController extends AdminController
            /*****CALLING DIRECLT USING LIB******/
 
            /*****CALLING VIA MAIL HELPER******/
-           $res = MailHelper::send_email(['mail' => $to, 'subject' => $subject, 'message' => $mail_content]);
+           $res = MailHelper::send_email(['mail' => $to, 'subject' => $subject,'common'=>$common ,'message' => $mail_content]);
            return $this->respond(['status' => 'success','code' => 200,'data' => $res],200);
            /*****CALLING VIA MAIL HELPER******/
 
@@ -1623,10 +1625,10 @@ class MasterController extends AdminController
             ["filePath" => ROOTPATH."public/sample_excel/sample_inception.xls","fileName" => "sample_inception.xls"],
             ["filePath" => ROOTPATH."public/assets/images/login_bg.jpg","fileName" => "login_bg.jpg"]
         ];
-
-
+        $common = ['mail_type'=>'test_mail_cli'];
         $email_id = CLI::getOption('to') ? CLI::getOption('to') : $email_id;
-          $res = MailHelper::send_email(['mail' => $email_id, 'subject' => 'Mail Via CLI', 'message' => $message,'attachments' => $attachments]);
+          $res = MailHelper::send_email(['mail' => $email_id, 'subject' => 'Mail Via CLI', 'message' => $message,'attachments' => $attachments,'common'=>$common]);
+          echo "Inside the master controller";
            print_r($res);
 
     }
diff --git a/app/Helpers/GmailResponseHandler.php b/app/Helpers/GmailResponseHandler.php
new file mode 100644
index 00000000..27347b94
--- /dev/null
+++ b/app/Helpers/GmailResponseHandler.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\GmailSentHistoryModel;
+use Exception;
+
+class GmailResponseHandler{
+    
+    
+    public function receive_and_distribute_param_to_functions($params)
+    {
+        try{
+
+            $this->store_gmail_response_data($params);
+            $this->gmail_response_logger($params);
+
+        }
+        catch(Exception $e)
+        {
+
+            $error = $e->getMessage();
+            echo "An Error Occured" . $error;
+            log_message('error',$error);
+                
+        }    
+    }
+    
+
+    public function store_gmail_response_data($params){
+        // foreach ($params as $key => $value){
+        //     $prepare_data = [
+        //         $key => $value
+        //     ];
+        // }
+        // $data = [
+        //     'email' => isset($params['params']['mail']) ? $params['params']['mail'] : null,
+        //     'bcc' => isset($params['params']['bcc']) ? json_encode($params['params']['bcc']) : null,
+        //     'cc' => isset($params['params']['cc']) ? json_encode($params['params']['cc']) : null,
+        //     'message' => isset($params['params']['message']) ? $params['params']['message'] : null,
+        //     'attachments' => isset($params['params']['attachments']) ? json_encode($params['params']['attachments']) : null,
+        //     'client_id' => isset($params['params']['common']['client_id']) ? $params['params']['common']['client_id'] : null,
+        //     'client_branch_id' => isset($params['params']['common']['client_branch_id']) ? $params['params']['common']['client_branch_id'] : null,
+        //     'client_policy_id' => isset($params['params']['common']['client_policy_id']) ? $params['params']['common']['client_policy_id'] : null,
+        //     'employee_policy_id' => isset($params['params']['common']['employee_policy_id']) ? $params['params']['common']['employee_policy_id'] : null,
+        //     'employee_id' => isset($params['params']['common']['employee_id']) ? $params['params']['common']['employee_id'] : null,
+        //     'mail_type' => isset($params['params']['common']['mail_type']) ? $params['params']['common']['mail_type'] : null,
+        //     'gmail_api_status' => isset($params['gmail_api']['status']) ? $params['gmail_api']['status'] : null,
+        //     'gmail_api_id' => isset($params['gmail_api']['data']['id']) ? $params['gmail_api']['data']['id'] : null
+        // ];
+       // Initialize data array
+        $data = [];
+        // print_r($params['params']['common']);die();
+        if (isset($params['params']['common'])) {
+            foreach ($params['params']['common'] as $key => $value) {
+                $data[$key] = isset($value) ? $value : null;
+            }
+            unset($params['params']['common']);
+        }
+        if (isset($params['params'])){
+            foreach($params['params'] as $key => $value){
+                $arr = ['bcc','cc','attachments'];
+                if(in_array($key,$arr)){
+                    $data[$key] = isset($value)?json_encode($value):null;
+                }else{
+                    $data[$key] = isset($value)?$value:null;
+                }
+            }
+        }
+        if(isset($params['gmail_api']['status']) && $params['gmail_api']['status'] == 1 ){
+            $data['gmail_api_status'] = isset($params['gmail_api']['status']) ? $params['gmail_api']['status'] : null;
+            $data['gmail_api_id'] = isset($params['gmail_api']['data']['id']) ? $params['gmail_api']['data']['id'] : null;
+            $data['received_message'] = isset($params['gmail_api']['data']['labelIds']) ? json_encode($params['gmail_api']['data']['labelIds']) : null;
+
+        }
+        elseif(isset($params['gmail_api']['status']) && $params['gmail_api']['status'] == false ){
+            $data['gmail_api_status'] = $params['gmail_api']['status'];
+            if(isset($params['gmail_api']['data'])){
+                $data['received_message'] = json_encode($params['gmail_api']['data']);
+            }
+        }
+         
+        $gmailModel = new GmailSentHistoryModel();
+           $save_status = $gmailModel->insert($data); 
+       
+        
+    }
+
+    public function gmail_response_logger($params){
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php
index 196bdaca..41d76b5c 100755
--- a/app/Helpers/JWTToken.php
+++ b/app/Helpers/JWTToken.php
@@ -11,7 +11,7 @@ use Firebase\JWT\SignatureInvalidException;
 // use Psr\Http\Message\RequestInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use ReflectionClass;
-
+use Exception;
 use App\Models\EmployeeModel;
 use App\Models\LevelContactModel;
 
diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php
index 0bc21c46..78f5983b 100755
--- a/app/Helpers/MailHelper.php
+++ b/app/Helpers/MailHelper.php
@@ -11,7 +11,6 @@ use PHPMailer\PHPMailer\Exception;
 
 use App\Models\JobModel;
 
-
 class MailHelper
 {
     public static function send_email_smtp($params) 
@@ -94,7 +93,7 @@ class MailHelper
         $subject = $params['subject'];
         $message = $params['message'];
         $attachments = isset($params['attachments']) && count($params['attachments']) ? $params['attachments'] : [];
-        
+        $common = isset($params['common'])?$params['common']:'';
         //check BCC mail
         if (isset($params['bcc'])) {
             $bcc = $params['bcc'];
@@ -118,26 +117,36 @@ class MailHelper
         if(isset($params['reply_to']) && !empty($params['reply_to'])){
             $reply_to = $params['reply_to'];
         }
+        $MailDataHelper = new GmailResponseHandler();
 
+        $res['params'] = $params;
         try {
           
-              $res = $gmailapi->sendMessage($emaill, $subject, $message, 'no-reply@nhanceindia.in', $reply_to, $cc, $bcc,$attachments);
-
-               if($res['status'])
+              $res['gmail_api'] = $gmailapi->sendMessage($emaill, $subject, $message, 'no-reply@nhanceindia.in', $reply_to, $cc, $bcc,$attachments);
+               if($res['gmail_api']['status'])
                {
+                  $response = $res;
+                //   $MailDataHelper->receive_and_distribute_param_to_functions($response);
                   return json_encode(['status' => 'success','code' => 200, 'message'=>('Email Sent Successfully...'.$emaill),'data' => $res,],200);
                }
                else
                {
                     $myLogger->logme('error', "mail sent failed -  $emaill");
+                    $response = $res;
+                    // $MailDataHelper->receive_and_distribute_param_to_functions($response);
                     return json_encode(['status' => 'failed','code' => 404,'message'=>( 'Email Sent Failed...' . $emaill ),'data' => $res  ],404);
                }
  
         } catch (Exception $e) {
-            $msg = $e->getMessage();
+            $msg['error'] = $e->getMessage();
+            $msg['params'] = $params;
             $myLogger->logme('error', "mail sent failed -  $msg");
+            $response = $msg;
+            // $MailDataHelper->receive_and_distribute_param_to_functions($response);
             return json_encode(['status' => 'failed','code' => 500,'data' => $msg],500);
-        }  
+        }
+        
+
     }
 
 
diff --git a/app/Models/GmailSentHistoryModel.php b/app/Models/GmailSentHistoryModel.php
new file mode 100644
index 00000000..9a0ae8ea
--- /dev/null
+++ b/app/Models/GmailSentHistoryModel.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class GmailSentHistoryModel extends Model{
+    protected $table            = 'gmail_sent_history';
+    protected $primaryKey       = 'id';
+    protected $allowedFields    = ["id", "mail", "bcc", "cc", "message", "attachments", "client_id", "client_branch_id", "client_policy_id", "employee_policy_id", "employee_id", "mail_type", "gmail_api_status", "gmail_api_id", "created_by", "created_at", "updated_by", "updated_at", "isactive","received_message"];
+}
\ No newline at end of file
diff --git a/job_queue b/job_queue
new file mode 100755
index 00000000..c2270834
--- /dev/null
+++ b/job_queue
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/phpqueue.bat b/phpqueue.bat
new file mode 100644
index 00000000..5247ccff
--- /dev/null
+++ b/phpqueue.bat
@@ -0,0 +1,42 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Get the directory of the current script
+set "ROOT_DIR=%~dp0"
+set "JOB_QUEUE_FILE=%ROOT_DIR%job_queue"
+set "PID_FILE=%ROOT_DIR%phpqueue.pid"
+
+REM Check if the script is already running
+if exist "%PID_FILE%" (
+    for /f "tokens=*" %%i in (%PID_FILE%) do set PID=%%i
+    tasklist /fi "PID eq !PID!" | findstr /i "!PID!" >nul
+    if not errorlevel 1 (
+        echo phpqueue.bat is already running. Exiting.
+        exit /b
+    )
+)
+
+REM Write the current process ID (PID) to the PID file
+echo %PROCESS_ID% > "%PID_FILE%"
+
+REM Main loop
+:loop
+REM Check if the Job_Queue file exists
+if not exist "%JOB_QUEUE_FILE%" (   
+    echo Job Queue file not found.
+    exit /b
+)
+
+REM Read the value of Job_Queue from the file
+set /p Job_Queue=<%JOB_QUEUE_FILE%
+
+if "%Job_Queue%"=="1" (
+    REM Run PHP job processing
+    php "%ROOT_DIR%htdocs/nhance/public/index.php" cli/processjob
+) else (
+    echo No job to process.
+)
+
+REM Sleep for 1 second before the next iteration
+timeout /T 1 >nul
+goto loop
diff --git a/phpqueue.pid b/phpqueue.pid
new file mode 100644
index 00000000..db08d2ac
--- /dev/null
+++ b/phpqueue.pid
@@ -0,0 +1 @@
+575
diff --git a/phpqueue.sh b/phpqueue.sh
new file mode 100755
index 00000000..f1e7176b
--- /dev/null
+++ b/phpqueue.sh
@@ -0,0 +1,56 @@
+!/bin/bash
+while true; do
+   echo "Running job at $(date)"
+   /usr/bin/php /opt/lampp/htdocs/nhance/public/index.php cli/processjob
+  !/bin/bash
+!/bin/bash
+
+# Read the Job_Queue variable from the temporary file
+#!/bin/bash
+
+#!/bin/bash
+
+#!/bin/bash
+
+# Define the root directory for the project and PID file path
+#!/bin/bash
+
+# Define paths
+# ROOT_DIR=$(dirname "$(realpath "$0")")
+# JOB_QUEUE_FILE="$ROOT_DIR/job_queue"
+# PID_FILE="$ROOT_DIR/phpqueue.pid"
+
+
+# # Check if the script is already running
+# if [[ -f "$PID_FILE" ]] && kill -0 "$(cat $PID_FILE)" 2>/dev/null; then
+#     echo "phpqueue.sh is already running. Exiting."
+#     exit 1
+# fi
+
+# # Write the current process ID (PID) to the PID file
+# echo $$ > "$PID_FILE"
+
+# # Ensure the PID file is removed on script exit
+# trap "rm -f $PID_FILE" EXIT
+
+# # Main loop
+# while true; do
+#     # Check if the Job_Queue file exists
+#     if [[ ! -f "$JOB_QUEUE_FILE" ]]; then
+#         echo "Job Queue file not found."
+#         exit 1
+#     fi
+
+#     # Read the value of Job_Queue from the file
+#     Job_Queue=$(cat "$JOB_QUEUE_FILE")
+
+#     if [[ "$Job_Queue" -eq 1 ]]; then
+#         /usr/bin/php /opt/lampp/htdocs/nhance/public/index.php cli/processjob
+#     else
+#         echo "No job to process."
+#     fi
+
+#     # Sleep for 1 second before the next iteration
+#     sleep 1
+# done
+
diff --git a/phpsetvariable.sh b/phpsetvariable.sh
new file mode 100755
index 00000000..69c1b0ac
--- /dev/null
+++ b/phpsetvariable.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Validate input argument
+# if [[ "$1" == "1" ]]; then
+#     echo "1" > /opt/lampp/htdocs/nhance/Job_Queue
+#     echo "Job Queue variable has been set to: 1"
+# elif [[ "$1" == "0" ]]; then
+#     echo "0" > /opt/lampp/htdocs/nhance/Job_Queue
+#     echo "Job Queue variable has been set to: 0"
+# else
+#     echo "Invalid argument. Use 1 to enable the queue or 0 to disable it."
+#     exit 1
+# fi

From a552e06adfa71e31ea3ce72b381803a469e9abfb Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Fri, 6 Dec 2024 10:47:20 +0530
Subject: [PATCH 2/3] FEAT_GMAIL RESPONSE HELPER ADDED

---
 Job_Queue.txt     |  1 -
 job_queue         |  1 -
 phpqueue.bat      | 42 ------------------------------------------
 phpqueue.pid      |  1 -
 phpsetvariable.sh | 13 -------------
 5 files changed, 58 deletions(-)
 delete mode 100755 Job_Queue.txt
 delete mode 100755 job_queue
 delete mode 100644 phpqueue.bat
 delete mode 100644 phpqueue.pid
 delete mode 100755 phpsetvariable.sh

diff --git a/Job_Queue.txt b/Job_Queue.txt
deleted file mode 100755
index 56a6051c..00000000
--- a/Job_Queue.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/job_queue b/job_queue
deleted file mode 100755
index c2270834..00000000
--- a/job_queue
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/phpqueue.bat b/phpqueue.bat
deleted file mode 100644
index 5247ccff..00000000
--- a/phpqueue.bat
+++ /dev/null
@@ -1,42 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Get the directory of the current script
-set "ROOT_DIR=%~dp0"
-set "JOB_QUEUE_FILE=%ROOT_DIR%job_queue"
-set "PID_FILE=%ROOT_DIR%phpqueue.pid"
-
-REM Check if the script is already running
-if exist "%PID_FILE%" (
-    for /f "tokens=*" %%i in (%PID_FILE%) do set PID=%%i
-    tasklist /fi "PID eq !PID!" | findstr /i "!PID!" >nul
-    if not errorlevel 1 (
-        echo phpqueue.bat is already running. Exiting.
-        exit /b
-    )
-)
-
-REM Write the current process ID (PID) to the PID file
-echo %PROCESS_ID% > "%PID_FILE%"
-
-REM Main loop
-:loop
-REM Check if the Job_Queue file exists
-if not exist "%JOB_QUEUE_FILE%" (   
-    echo Job Queue file not found.
-    exit /b
-)
-
-REM Read the value of Job_Queue from the file
-set /p Job_Queue=<%JOB_QUEUE_FILE%
-
-if "%Job_Queue%"=="1" (
-    REM Run PHP job processing
-    php "%ROOT_DIR%htdocs/nhance/public/index.php" cli/processjob
-) else (
-    echo No job to process.
-)
-
-REM Sleep for 1 second before the next iteration
-timeout /T 1 >nul
-goto loop
diff --git a/phpqueue.pid b/phpqueue.pid
deleted file mode 100644
index db08d2ac..00000000
--- a/phpqueue.pid
+++ /dev/null
@@ -1 +0,0 @@
-575
diff --git a/phpsetvariable.sh b/phpsetvariable.sh
deleted file mode 100755
index 69c1b0ac..00000000
--- a/phpsetvariable.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Validate input argument
-# if [[ "$1" == "1" ]]; then
-#     echo "1" > /opt/lampp/htdocs/nhance/Job_Queue
-#     echo "Job Queue variable has been set to: 1"
-# elif [[ "$1" == "0" ]]; then
-#     echo "0" > /opt/lampp/htdocs/nhance/Job_Queue
-#     echo "Job Queue variable has been set to: 0"
-# else
-#     echo "Invalid argument. Use 1 to enable the queue or 0 to disable it."
-#     exit 1
-# fi

From c6f06828e01b475227ef4beb77d13db6be92bf7c Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 7 Dec 2024 14:44:44 +0530
Subject: [PATCH 3/3] FEAT_ECARD SENT STATUS FLAG ADDED

---
 app/Controllers/ClientController.php          |  6 +--
 app/Controllers/DashboardController.php       | 14 +++++--
 app/Controllers/EmployeeController.php        |  2 +-
 app/Controllers/EmployeeServiceController.php |  2 +-
 app/Helpers/GmailResponseHandler.php          | 39 +++++++++++++++++--
 app/Helpers/MailHelper.php                    | 12 +++---
 app/Models/EmployeePolicyModel.php            |  3 +-
 7 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index efcd633e..6191c995 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -181,7 +181,7 @@ class ClientController extends AdminController
         print_rr($attachments);
     }
 
-    public function testingForReviewMail($client_id = 77, $emp_code = 'EMP001-K1', $mail_active = 0) //this function for only tsesting some logics not use for business logic
+    public function testingForReviewMail($client_id = 77, $emp_code = 'EMP001-K1', $mail_active = 1) //this function for only tsesting some logics not use for business logic
     {
 
         $client_policy_ids = $this->employeeModel
@@ -3708,8 +3708,8 @@ class ClientController extends AdminController
 
     public function sendextraparam(){
 
-        $employeeRestController = new EmployeeServiceController();
-        $employeeRestController->employeesEnrollmentInsert(['file_id' => 683]);
+        // $employeeRestController = new EmployeeServiceController();
+        // $employeeRestController->employeesEnrollmentInsert(['file_id' => 715]);
 
         // $dashBoardController = new DashboardController();
         // $client_policy_data = $this->clientPolicyModel->getPolicyDetailsForRemainder($client_id=159, $client_branch_id=126);
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 1a8c8382..b4843a59 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -417,8 +417,9 @@ class DashboardController extends AdminController
 
                             // Send the mail notification
                             $mail_result = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
+                            // dd($mail_result);
                             // $this->myLogger->logme('error', 'Mail sent result: ' . json_encode($mail_result));
-                            $reminder_whole_mail[] = $mail_result;
+                            $reminder_whole_mail[] = $mail_result[0];
                         }
                     }
                 } else {
@@ -483,7 +484,7 @@ class DashboardController extends AdminController
                                     // Send the mail notification
                                     $mail_result = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
                                     // $this->myLogger->logme('error', 'Mail sent result: ' . json_encode($mail_result));
-                                    $reminder_whole_mail[] = $mail_result;
+                                    $reminder_whole_mail[] = $mail_result[0];
                                 }
                             }
                         } else {
@@ -496,14 +497,14 @@ class DashboardController extends AdminController
         }
 
         // dd($reminder_whole_mail);
+        // print_rr($reminder_whole_mail); die;
 
         // Process and queue bulk emails
         if (!empty($reminder_whole_mail) && count($reminder_whole_mail) > 0) {
 
             $reminder_whole_mail = array_chunk($reminder_whole_mail, 20);
-
             foreach ($reminder_whole_mail as $key => $value) {
-                $job_details  = new Jobs();
+                // $job_details  = new Jobs();
                 $r = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $value]);
             }
         }
@@ -517,6 +518,8 @@ class DashboardController extends AdminController
 
     public function sendManualReminder($client_id, $client_branch_id)
     {
+        $this->myLogger->logme('error','Log Works');
+
         $this->myLogger->logme('error', "sendManualRemainder called with client_id: {$client_id}, client_branch_id: {$client_branch_id}");
         
         $client_policy_data = $this->clientPolicyModel->getPolicyDetailsForRemainder($client_id, $client_branch_id);
@@ -526,6 +529,8 @@ class DashboardController extends AdminController
         
         if ($client_policy_data) {
             $result = $this->sendRemainderMail($client_policy_data);
+            log_message('error',json_encode($result));
+            $this->myLogger->logme('error',$result);
             $this->myLogger->logme('error', "Manual Remainder Mail sending result: " . ($result ? 'success' : 'failure'));
             
             if ($result) {
@@ -552,6 +557,7 @@ class DashboardController extends AdminController
          {
             return $this->respond(['status' => false, 'code' => 400, 'message' => 'No template found','message2' => 'Failed' ], 200);
          }
+         
 
         $emp_data = $this->employeePolicyModel->getEmployeePolicyForEcard($policy_id);
         if(count($emp_data) == 0)
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 02c01d34..75893afd 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -108,7 +108,7 @@ class EmployeeController extends AdminController
                 emp_name : $filterData['emp_name'] ?? null,
                 status   : $filterData['status'] ?? [], 
             );
-        
+        log_message('error',json_encode($data['employees']));
             // Set getData in $data array with the processed $filterData
             $data['getData'] = $filterData;
         }
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 7297c26c..953d270b 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -2095,7 +2095,7 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
                                     $params['dataToInsert'] = $value; //holds employee master data
                                     $params['notification'] = $notification;
                                     $params['client_data'] = $client_details;
-                                    
+                                    $params['common'] = [];
                                    //store email and mail content via helper to send notification
                                    $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params);
                                 }
diff --git a/app/Helpers/GmailResponseHandler.php b/app/Helpers/GmailResponseHandler.php
index 27347b94..f2cb07f7 100644
--- a/app/Helpers/GmailResponseHandler.php
+++ b/app/Helpers/GmailResponseHandler.php
@@ -2,10 +2,19 @@
 
 namespace App\Helpers;
 
+use App\Models\EmployeePolicyModel;
 use App\Models\GmailSentHistoryModel;
 use Exception;
 
+
 class GmailResponseHandler{
+    private $myLogger;
+
+    public function __construct()
+    {   
+        $this->myLogger = \Config\Services::mylogger();
+
+    }
     
     
     public function receive_and_distribute_param_to_functions($params)
@@ -14,6 +23,7 @@ class GmailResponseHandler{
 
             $this->store_gmail_response_data($params);
             $this->gmail_response_logger($params);
+            $this->client_id_flag_setter($params);
 
         }
         catch(Exception $e)
@@ -81,13 +91,34 @@ class GmailResponseHandler{
         }
          
         $gmailModel = new GmailSentHistoryModel();
-           $save_status = $gmailModel->insert($data); 
-       
-        
+        $save_status = $gmailModel->insert($data); 
     }
 
-    public function gmail_response_logger($params){
+    public function gmail_response_logger($params)
+    {
+        $this->myLogger->logme('error',json_encode($params));
+    }
 
+    public function client_id_flag_setter($params)
+    {
+        try{
+            if (isset($params['params']['common']['mail_type'])){
+                if($params['params']['common']['mail_type'] == 'member_ecard_mail'){
+                    $employeePolicyModel = new EmployeePolicyModel();
+                    $update_status = $employeePolicyModel->where('id',$params['params']['common']['employee_policy_id'])->set('ecard_sent_status',1)->update();
+                    if($update_status){
+                        $this->myLogger->logme('error',"ecard_sent_status updated for ".$params['params']['common']['employee_policy_id']);
+                    }else{
+                        $this->myLogger->logme('error','ecard_sent_status failed to update');
+                    }
+                }
+                
+            }
+        }
+    catch(Exception $e){
+        $error = $e->getMessage();
+        $this->myLogger->logme('error','An Error Occured - '.$error);
+    }
     }
 
 
diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php
index 78f5983b..6116bc0c 100755
--- a/app/Helpers/MailHelper.php
+++ b/app/Helpers/MailHelper.php
@@ -126,14 +126,14 @@ class MailHelper
                if($res['gmail_api']['status'])
                {
                   $response = $res;
-                //   $MailDataHelper->receive_and_distribute_param_to_functions($response);
+                  $MailDataHelper->receive_and_distribute_param_to_functions($response);
                   return json_encode(['status' => 'success','code' => 200, 'message'=>('Email Sent Successfully...'.$emaill),'data' => $res,],200);
                }
                else
                {
                     $myLogger->logme('error', "mail sent failed -  $emaill");
                     $response = $res;
-                    // $MailDataHelper->receive_and_distribute_param_to_functions($response);
+                    $MailDataHelper->receive_and_distribute_param_to_functions($response);
                     return json_encode(['status' => 'failed','code' => 404,'message'=>( 'Email Sent Failed...' . $emaill ),'data' => $res  ],404);
                }
  
@@ -142,7 +142,7 @@ class MailHelper
             $msg['params'] = $params;
             $myLogger->logme('error', "mail sent failed -  $msg");
             $response = $msg;
-            // $MailDataHelper->receive_and_distribute_param_to_functions($response);
+            $MailDataHelper->receive_and_distribute_param_to_functions($response);
             return json_encode(['status' => 'failed','code' => 500,'data' => $msg],500);
         }
         
@@ -152,7 +152,7 @@ class MailHelper
 
     public static function bulk_mail(array $mails = [])
     {
-        // print_r();die;
+        // print_r($mails);die;
         $model = new JobModel();
         $start = microtime(true);
         $runtime= 0;
@@ -165,7 +165,9 @@ class MailHelper
         return json_encode(['status' => 'success','code' => 200, 'message'=>'Email Sent Successfully...'],200);
 
        } catch (\Throwable $th) {
-        return json_encode(['status' => 'failed','code' => 500],500);
+        $error = $th->getMessage();
+        log_message('error',$error);
+        return json_encode(['status' => 'failed','code' => 500,'error'=>$error],500);
        }
     }
 
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 2d285bb6..6708da05 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -33,6 +33,7 @@ class EmployeePolicyModel extends Model
         "rand_string",
         "is_active",
         "claim_status",
+        'ecard_sent_status'
     ];
 
     // Callbacks
@@ -125,7 +126,6 @@ class EmployeePolicyModel extends Model
             ->join('client_branch', 'emp.client_branch_id = client_branch.id') //cm - client master
             ->orderBy('emp.emp_code', 'ASC')
             ->orderBy('employee_polices.employee_id', 'ASC');
-
         // Conditionally add where clauses
         if ($client_id != 0 && !empty($client_id)) {
             $result->where('emp.client_id', $client_id);
@@ -194,6 +194,7 @@ class EmployeePolicyModel extends Model
         $result->where('employee_polices.is_active', 1)
                ->where('employee_polices.status', 'active')
                ->where('employee_polices.tpa_id is not null')
+               ->where('employee_polices.ecard_sent_status',0)
                ->where('emp.relationship','Self');
         
          return $result->findAll();