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
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script>
     $(document).ready(function() {
+        document.getElementById('fromsubcription').value = new Date().toLocaleDateString('en-GB');
         var status = "<?php echo isset($invoice_details['status']) ? $invoice_details['status'] : ''; ?>";
         var invoice_type = "<?php echo isset($invoice_type) ? $invoice_type : ''; ?>";        
         console.log('Invoice Type:', invoice_type);
@@ -1511,7 +1512,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                         console.log("cFAFAFAbbb",cb);
                         $.each(cb, function(k, v) {
                             var state = v.state_name ? v.state_name : v.state;
-                            state = v.postal_code ? state + "-" + v.postal_code : state;
+                            state = v.postal_code ? state  + v.postal_code : state;
                             v.address_1 ? customer_billing_addressDetails.push(v.address_1 + " " + v.address_2) : "";
                             v.city ? customer_billing_addressDetails.push(v.city) : "";
                             state ? customer_billing_addressDetails.push(state) : "";
@@ -1581,7 +1582,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                 if (cs.length > 0) {
                     $.each(cs, function(k, v) {
                         var state = v.state_name ? v.state_name : v.state;
-                        state = v.postal_code ? state + "-" + v.postal_code : state;
+                        state = v.postal_code ? state + v.postal_code : state;
                         v.address_1 ? customer_shipping_addressDetails.push(v.address_1 + " " + v.address_2) : "";
                         v.city ? customer_shipping_addressDetails.push(v.city) : "";
                         state ? customer_shipping_addressDetails.push(state) : "";
@@ -2017,7 +2018,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                             const formattedBillingAddress = [
                                 baddress1 + " " + (baddress2 || ""),
                                 bcity,
-                                (bstate ? bstate + "-" + bzip : ""),
+                                (bstate ? bstate + bzip : ""),
                                 bcountry
                             ]
                                 .filter(Boolean) // Remove empty values
@@ -2033,7 +2034,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                             const formattedShippingAddress = [
                                 saddress1 + " " + (saddress2 || ""),
                                 scity,
-                                (sstate ? sstate + "-" + szip : ""),
+                                (sstate ? sstate  + szip : ""),
                                 scountry
                             ]
                                 .filter(Boolean)
diff --git a/app/Views/itemwise_report_with_payment_method.php b/app/Views/itemwise_report_with_payment_method.php
index 2a5d0544..d5f214f5 100644
--- a/app/Views/itemwise_report_with_payment_method.php
+++ b/app/Views/itemwise_report_with_payment_method.php
@@ -9,7 +9,7 @@
 
     <!-- Form Section -->
     <div class="col-md-5 offset-md-3">
-        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
+        <form action="<?php echo base_url('itemwise_report_with_payment_method'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
diff --git a/app/Views/payment_success.php b/app/Views/payment_success.php
index 6d184b31..1ce49bfe 100644
--- a/app/Views/payment_success.php
+++ b/app/Views/payment_success.php
@@ -34,13 +34,13 @@
                                     <div class="auth-logo">
                                         <a href="javascript:void(0);" class="logo logo-dark text-center">
                                             <span class="logo-lg">
-                                                <img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55">
+                                                <img src="<?= base_url() . 'public/uploads/Vijayabharatham_logo_1.png' ?>" alt="" height="55">
                                             </span><br/>
                                         </a>
                     
                                         <a href="javascript:void(0);" class="logo logo-light text-center">
                                             <span class="logo-lg">
-                                                <img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55">
+                                                <img src="<?= base_url() . 'public/uploads/Vijayabharatham_logo_1.png' ?>" alt="" height="55">
                                             </span><br/>
                                         </a>
                                     </div>
@@ -65,7 +65,7 @@
                                     </div>
 
                                     <h4>&#10004; Payment Successful</h4><br>
-                                    <p>Your payment has been successfully processed. Thank you for your purchase!</p>
+                                    <p>Your payment has been successfully processed. <br>Thank you for your purchase!</p>
                                     <p>If you have any questions, please contact customer support.</p>
                                 </div>
 
@@ -83,9 +83,11 @@
         <!-- end page -->
 
         <footer class="footer footer-alt">
-            <p> <?= date('Y') ?> &copy; <?= "bigbamboobookpublish"; ?>.</p>
+            <p> <?= date('Y') ?> &copy; <?= "Vijayabharatham Prasuram. All rights reserved."; ?>.</p>
         </footer>
 
+    
+
         <!-- Vendor js -->
         <script src="<?= base_url() . "public/assets/js/vendor.min.js" ?>"></script>
 
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 @@
                         <thead>
                             <tr>
                                 <th hidden>id</th>
+                                <th>Member Name</th>
                                 <th>Membership ID</th>
                                 <th>From Subscription</th>
                                 <th>To Subscription</th>
-                                <th>Member Name</th>
                                 <th>Mobile Number</th>
                                 <th>Email</th>
                                 <th>Scheme Code</th>
@@ -46,11 +46,11 @@
                         <tbody>
                             <?php foreach ($expired_customers as $row) { ?>
                                 <tr>
+                                <td style="text-align: left;"><?= $row['first_name'] . ' ' . $row['last_name'] ?></td>
                                     <td style="text-align: center;"><?= $row['membership_id'] ?></td>
                                     <td style="text-align: center;"><?= date("d/m/Y", strtotime($row['from_subscription'])); ?></td>
                                     <td style="text-align: center;"><?= date("d/m/Y", strtotime($row['to_subscription'])); ?></td>
                                     <td hidden><?php echo $row["sub_id"]; ?></td>
-                                    <td style="text-align: left;"><?= $row['first_name'] . ' ' . $row['last_name'] ?></td>
                                     <td><?= $row['mobile_no'] ?></td>
                                     <td style="text-align: left;"><?= $row['email'] ?></td>
                                     <td><?= $row['short_code'] ?></td>
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 @@
 
     <!-- Form Section -->
     <div class="col-md-5 offset-md-3">
-        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
+        <form action="<?php echo base_url('itemwise_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-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 @@
     <div class="container">
         <div class="card">
             <div class="logo">
-            <img src="public/uploads/Vijayabharatham_withname.png" />
+            <img src="<?= base_url() . 'public/uploads/Vijayabharatham_withname_1.png' ?>" alt="Vijayabharatham Prasuram" />
             </div><div><br></div>
             <div class="card-header text-center">
                 <h4 class="mb-1">Renew Your Subscription</h4>