From 18854c7427ce808f77b623622d8dacc8d20cfd4a Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Mon, 2 Dec 2024 13:51:53 +0530 Subject: [PATCH] FIX_LOGO ISSUE IN THE SUBSCRIPTION_RENEWAL PAGE --- app/Config/Email.php | 12 ++++++------ app/Controllers/Invoice.php | 2 +- app/Models/HomeModel.php | 2 +- app/Views/invoice_form.php | 9 +++++---- app/Views/itemwise_report_with_payment_method.php | 2 +- app/Views/payment_success.php | 10 ++++++---- app/Views/report_expired_customers.php | 4 ++-- app/Views/report_itemwise.php | 2 +- app/Views/subscription_renewal.php | 2 +- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/app/Config/Email.php b/app/Config/Email.php index 21911614..aff86b0d 100755 --- a/app/Config/Email.php +++ b/app/Config/Email.php @@ -28,21 +28,21 @@ class Email extends BaseConfig /** * SMTP Server Address */ - // public string $SMTPHost = 'smtp.zoho.in'; - public string $SMTPHost = 'smtp.gmail.com'; + public string $SMTPHost = 'smtp.zoho.in'; + // public string $SMTPHost = 'smtp.gmail.com'; /** * 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 = 'Sz9VueQ2iLgH'; + //public string $SMTPPass = 'bqhvujeauokgcdxt'; /** * SMTP Port diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index 812de49a..f4cf3126 100755 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -1220,7 +1220,7 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_ } else { $value = $this->request->getPost('value'); - if (!isset($value)){ + if (isset($value)){ // Handle CSV export $this->exportCsv(); $this->logger->info("Itemwise Report CSV "); diff --git a/app/Models/HomeModel.php b/app/Models/HomeModel.php index 515d6215..8954c7ca 100755 --- a/app/Models/HomeModel.php +++ b/app/Models/HomeModel.php @@ -104,7 +104,7 @@ class HomeModel extends Model $query = $this->db->table('subscription AS S') ->select('S.business_id, BK.title as name, BK.short_code, BK.book_id as id, S.scheme_id, LEFT(BK.title, 1) AS first_letter, COUNT(S.customer_id) AS count, BI.wp_img_url') ->select('COUNT(S.customer_id) AS overall, COUNT(IF(S.isactive = 1, S.customer_id, NULL)) AS activeoverall, COUNT(IF(S.is_renew = 0 AND S.isactive = 1, S.customer_id, NULL)) AS nonrenewal, COUNT(IF(S.is_renew = 1 AND S.isactive = 1, S.customer_id, NULL)) AS renewal, SUM(CASE WHEN S.created_on >= NOW() - INTERVAL 30 DAY THEN 1 ELSE 0 END) AS new_subscribers') - ->select('COUNT(IF(S.status = 1, S.customer_id, NULL)) AS active,COUNT(IF(S.is_renew = 0 AND S.status = 0, S.customer_id, NULL)) AS expired,COUNT(IF(S.is_renew > 0 AND S.status = 1, S.customer_id, NULL)) AS renew') + ->select('COUNT(IF(S.status = 1 and S.is_renew =0 ,S.customer_id, NULL)) AS active,COUNT(IF(S.status = 0, S.customer_id, NULL)) AS expired,COUNT(IF(S.is_renew > 0 AND S.status = 1, S.customer_id, NULL)) AS renew') ->join('customers AS C', 'C.customer_id = S.customer_id AND C.isactive = 1', 'left') ->join('books AS BK', 'BK.book_id = S.scheme_id', 'left') ->join('book_categories AS BC', 'BC.book_id = S.scheme_id AND BC.isactive = 1', 'left') diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index 3d5a55b1..168a8fd1 100755 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -947,6 +947,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d diff --git a/app/Views/report_expired_customers.php b/app/Views/report_expired_customers.php index 141071e3..f0ba5604 100755 --- a/app/Views/report_expired_customers.php +++ b/app/Views/report_expired_customers.php @@ -34,10 +34,10 @@ id + Member Name Membership ID From Subscription To Subscription - Member Name Mobile Number Email Scheme Code @@ -46,11 +46,11 @@ + - diff --git a/app/Views/report_itemwise.php b/app/Views/report_itemwise.php index 1066c98b..9e6907d5 100755 --- a/app/Views/report_itemwise.php +++ b/app/Views/report_itemwise.php @@ -34,7 +34,7 @@
-
+
diff --git a/app/Views/subscription_renewal.php b/app/Views/subscription_renewal.php index 41c2a19a..1058b3c0 100644 --- a/app/Views/subscription_renewal.php +++ b/app/Views/subscription_renewal.php @@ -59,7 +59,7 @@

Renew Your Subscription