From cc888d769a2404adcfc024de8dbe546420d9a3ce Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Wed, 4 Dec 2024 15:13:00 +0530
Subject: [PATCH] FIX_DATE ISSUE IN EMAIL NOTIFICATION FILTER

---
 app/Models/NotificationModel.php            |  4 ++--
 app/Views/notify_the_expiry_subscribers.php | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php
index 12fa33bc..f7e1c1e6 100755
--- a/app/Models/NotificationModel.php
+++ b/app/Models/NotificationModel.php
@@ -355,8 +355,8 @@ public function getExpDate2(){
         $builder->join('notification_campaign as nc', 'nc.campaign_id = nhp.campaign_id');
         $builder->join('customers as C', 'C.customer_id = nhc.customer_id');
         $builder->join('subscription as S', 'S.sub_id = nhc.subscription_id');
-        $builder->where('nhp.start_date_time >=', $f_date);
-        $builder->where('nhp.start_date_time <=', $t_date);
+        $builder->where('DATE(nhp.start_date_time) >=', $f_date);
+        $builder->where('DATE(nhp.start_date_time) <=', $t_date);
         $builder->whereIn('nhp.campaign_id', [1, 2]);
         $builder->where('nc.isactive', 1);
 
diff --git a/app/Views/notify_the_expiry_subscribers.php b/app/Views/notify_the_expiry_subscribers.php
index 253f3f81..c1d6dcdc 100755
--- a/app/Views/notify_the_expiry_subscribers.php
+++ b/app/Views/notify_the_expiry_subscribers.php
@@ -137,10 +137,18 @@
             tableBody.empty();
             if (data && data.length > 0) {
                 data.forEach(function(item) {
+                    var sentTime = new Date(item.sent_time);
                     var status = (item.receiving_status == 1) ? 'Success' : 'Fail';
+                    var sentDateFormatted = ('0' + sentTime.getDate()).slice(-2) + '/' + 
+                            ('0' + (sentTime.getMonth() + 1)).slice(-2) + '/' + 
+                            sentTime.getFullYear();
+                    var sentTimeFormatted = ('0' + sentTime.getHours()).slice(-2) + ':' + 
+                                            ('0' + sentTime.getMinutes()).slice(-2) + ':' + 
+                                            ('0' + sentTime.getSeconds()).slice(-2);
+                    var sentDateTimeFormatted = sentDateFormatted + ' ' + sentTimeFormatted; // Combine date and time
                     table.row.add([
                         item.first_name + ' ' + item.last_name,
-                        item.sent_time,
+                        sentDateTimeFormatted,
                         item.membership_id,
                         item.receiving_entity,
                         item.mode,