From 12e1ceaa16f95baae5b6b43ec2d0e0d18fec89b0 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Wed, 20 Nov 2024 14:37:27 +0530
Subject: [PATCH] FIX_REMAINING DAYS SENTENCE IN SUBSCRIPTION RENEWAL

---
 app/Views/subscription_renewal.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Views/subscription_renewal.php b/app/Views/subscription_renewal.php
index 40004479..f38479ff 100644
--- a/app/Views/subscription_renewal.php
+++ b/app/Views/subscription_renewal.php
@@ -131,11 +131,11 @@
                                 var expirationMessage = '';
                                 if (remainingDays == 0){
                                     remainingDays = Math.abs(remainingDays);
-                                    expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '" will expire today '
+                                    expirationMessage = 'Your Subscription plan, "' + response.scheme.short_code + '" expires today, ' + remaining.toLocaleDateString('en-GB') + '.';
                                 }
                                 else if(remainingDays == 1){
                                     remainingDays = Math.abs(remainingDays);
-                                    expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '"will expire tomorrow'
+                                    expirationMessage = 'Your Subscription plan, "' + response.scheme.short_code + '" will expire tomorrow, ' + remaining.toLocaleDateString('en-GB') + '.';
                                 }
                                 else if (remainingDays > 0) {
                                     expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '" is going to expire in ' + remainingDays + 
@@ -196,23 +196,24 @@
                                 var expirationMessage = '';
                                 if (remainingDays == 0){
                                     remainingDays = Math.abs(remainingDays);
-                                    expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '" will expire today '
+                                    expirationMessage = 'Your Subscription plan, "' + response.scheme.short_code + '" expires today, ' + remaining.toLocaleDateString('en-GB') + '.';
                                 }
                                 else if(remainingDays == 1){
                                     remainingDays = Math.abs(remainingDays);
-                                    expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '"will expire tomorrow'
+                                    expirationMessage = 'Your Subscription plan, "' + response.scheme.short_code + '" will expire tomorrow, ' + remaining.toLocaleDateString('en-GB') + '.';
                                 }
                                 else if (remainingDays > 0) {
                                     expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '" is going to expire in ' + remainingDays + 
                                         ' days on ' + remaining.toLocaleDateString('en-GB') + '.';
-                                } else if (remainingDays < 0) {
+                                } else {
                                     remainingDays = Math.abs(remainingDays);
                                     expirationMessage = 'Your Subscription plan "' + response.scheme.short_code + '" has already expired ' + remainingDays + 
                                         ' days ago on ' + remaining.toLocaleDateString('en-GB') + '.';
                                 }
-                                
                                 $('#expirationMessage').text(expirationMessage);
                             }
+                                
+                               
                         }
                     },
                     error: function() {