From cce304899a136341d9c142a68b36b87fe67bd239 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Mon, 2 Dec 2024 15:28:13 +0530
Subject: [PATCH] FIXED_REDIRECTION_URL PROBLEM

---
 app/Config/Email.php              | 6 +++---
 app/Controllers/Notifications.php | 1 -
 app/Models/NotificationModel.php  | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Config/Email.php b/app/Config/Email.php
index aff86b0d..8ddd8df1 100755
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -34,15 +34,15 @@ class Email extends BaseConfig
     /**
      * SMTP Username
      */
-     public string $SMTPUser = 'web@vijayabharathambooks.com';
-    //public string $SMTPUser = 'venbalap08@gmail.com';
+    public string $SMTPUser = 'web@vijayabharathambooks.com';
+    // public string $SMTPUser = 'venbalap08@gmail.com';
 
 
     /**
      * SMTP Password
      */
     public string $SMTPPass = 'Sz9VueQ2iLgH'; 
-    //public string $SMTPPass = 'bqhvujeauokgcdxt';
+    // public string $SMTPPass = 'bqhvujeauokgcdxt';
 
     /**
      * SMTP Port
diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php
index dbc5dbe0..94304d06 100755
--- a/app/Controllers/Notifications.php
+++ b/app/Controllers/Notifications.php
@@ -681,7 +681,6 @@ class Notifications extends BaseController
                     $history_child_id = $NotificationModel->save_notification_history_child($history_child_data);
         
                     $emailResult = $notification->sendEmail($emailData);
-        
                     if (isset($emailResult['success']) && !empty($emailResult['success'])) {    
                         $history_msg = 'Email sent successfully';
                         $history_child_updatedata = ['receiving_status'=>1,'result'=>$history_msg];
diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php
index bbddc83d..c52edd78 100755
--- a/app/Models/NotificationModel.php
+++ b/app/Models/NotificationModel.php
@@ -326,6 +326,7 @@ public function customerGroupQueryExecution($queries){
         ->where('C.customer_id =',$customerId)
         ->where('S.sub_id =',$subscriptionId)
         ->where('nhc.sent_time >=', date('Y-m-d', strtotime('-30 days')))
+        ->where('nhc.receiving_status = ',1)
         ->get()->getResultArray();
     }