FIX_DESIGN ISSUES IN REPORTS

app/Controllers/Invoice.php

@@ -1195,14 +1195,8 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_
             $data['selected_data'] = $this->request->getVar('date');
             $this->logger->info("Itemwise Report ");
         }
-        $this->logger->info("'Membership Renewals Report'");
+
-        if (empty($data['selected_data'])){
+        $data['page_name'] = 'Membership Renewals Report (30 days)';
-            //dd($data['selected_data']);
-            $data['page_name'] = 'Membership Renewals Report (30 days)';
-        }else{
-            list($fromDate, $toDate) = explode(" - ", $data['selected_data']);
-            $data['page_name'] = 'Membership Renewals Report - <br>(From '.$fromDate.' To '.$toDate.')';
-        }
         $this->render_page('report_expired_customers', $data);
     }
 

app/Controllers/Payment.php

@@ -204,6 +204,7 @@ public function payment_success() {
             'billing_address'=> $address['address_1'],
             'billing_address_id' => isset($address['customer_address_id']) ? $address['customer_address_id'] : '',
             'payment_method'  =>  $payment_method,
+            'business_id'   =>2 //ask vel
         ];
         $model->save($data);
         $update_invoice_numbering = [
@@ -260,7 +261,10 @@ public function payment_success() {
             'is_renew' => 1,
             'business_id'=>2,
             'status' =>1,
-            'membership_id' =>$membership_id
+            'membership_id' =>$membership_id,
+            'isactive' =>1,
+            'business_id'   =>2 //ask vel
+
         ];
             $db->table('subscription')->insert($subscriptionData);
         

app/Models/InvoiceModel.php

@@ -147,7 +147,7 @@ public function getJoinedData($where, $orderby = [])
     
 
     // Print the last executed query
-    // echo $this->db->getLastQuery();die;
+    //echo $this->db->getLastQuery();die;
 
     return $resultArray;
 }

app/Views/invoice_form.php

@@ -1559,7 +1559,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                     return b.is_renew - a.is_renew;
                 });
                 if (cm.length > 0) {
-                    text1 = cm[0].is_renew == 1 ? " - Renewal" : "";
+                    text1 = cm[0].is_renew == 1 ? " - Renewed" : "";
                     text2 = cm[0].isactive == 0 ? " - Expried" : "";
                     $(".subscribedetails").show(); // Change this line to use the class selector
                     let message = "Earlier Membership : " + cm[0].title + " ( From: " + cm[0].formatted_from_subscription + " To: " + cm[0].formatted_to_subscription + " )" + text1 + text2;

app/Views/itemwise_report_with_payment_method.php

@@ -1,12 +1,15 @@
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
+    <!-- Title Section -->
     <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
-        <form action="<?php echo base_url('itemwise_report_with_payment_method'); ?>" method="post">
+    <!-- Form Section -->
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
@@ -21,6 +24,7 @@
     </div>
 </div>
 
+
 <div class="row">
     <div class="col-12">
         <div class="card">

app/Views/received_payments_report.php

@@ -35,15 +35,17 @@
 
 </style>
    <!-- start page title -->
-    <div class="row">
+   <div class="row d-flex align-items-center">
-        <div class="col-md-4">
+    <!-- Title Section -->
-            <div class="page-title-box page-title-box-alt">
+    <div class="col-md-4">
-                <h4 class="page-title"><?= $page_name ?></h4>
+        <div class="page-title-box page-title-box-alt">
-            </div>
+            <h4 class="page-title"><?= $page_name ?></h4>
         </div>
+    </div>
 
-        <div class="offset-md-3 col-md-5">
+    <!-- Form Section -->
-        <form action="<?php echo base_url('received_payments_report'); ?>" method="post">
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
@@ -55,8 +57,9 @@
                 </div>
             </div>
         </form>
-        </div>
+    </div>
-        </div>
+</div>
+
 
         <div class="row">
     <div>
@@ -64,31 +67,31 @@
             <!-- Card 1 -->
             <li>
                 <div class="card-summary"<?= isset($payment_data['result2']['UPI'])?'':'hidden'?>>
-                    <span>UPI - ₹<?= isset($payment_data['result2']['UPI'])?$payment_data['result2']['UPI']:''?></span>
+                    <span>UPI  ₹<?= isset($payment_data['result2']['UPI'])?$payment_data['result2']['UPI']:''?></span>
                 </div>
             </li>
             <!-- Card 2 -->
             <li>
                 <div class="card-summary" <?= isset($payment_data['result2']['cash'])?'':'hidden'?>>
-                    <span>CASH - ₹<?= isset($payment_data['result2']['cash'])?$payment_data['result2']['cash']:''?></span>
+                    <span>CASH  ₹<?= isset($payment_data['result2']['cash'])?$payment_data['result2']['cash']:''?></span>
                 </div>
             </li>
             <!-- Card 3 -->
             <li>
                 <div class="card-summary" <?= isset($payment_data['result2']['debit'])?'':'hidden'?>>
-                    <span>DEBIT CARD - ₹<?= isset($payment_data['result2']['debit'])?$payment_data['result2']['debit']:''?></span>
+                    <span>DEBIT CARD  ₹<?= isset($payment_data['result2']['debit'])?$payment_data['result2']['debit']:''?></span>
                 </div>
             </li>
             <!-- Card 4 -->
             <li>
                 <div class="card-summary" <?= isset($payment_data['result2']['credit'])?'':'hidden'?>>
-                    <span>CREDIT CARD - ₹<?= isset($payment_data['result2']['credit'])?$payment_data['result2']['credit']:''?></span>
+                    <span>CREDIT CARD  ₹<?= isset($payment_data['result2']['credit'])?$payment_data['result2']['credit']:''?></span>
                 </div>
             </li>
             <!-- Card 5 -->
             <li>
                 <div class="card-summary" <?= isset($payment_data['result2']['banktransfer'])?'':'hidden'?>>
-                    <span>BANK TRANSFER - ₹<?= isset($payment_data['result2']['banktransfer'])?$payment_data['result2']['banktransfer']:''?></span>
+                    <span>BANK TRANSFER  ₹<?= isset($payment_data['result2']['banktransfer'])?$payment_data['result2']['banktransfer']:''?></span>
                 </div>
             </li>
         </ul>

app/Views/report_book_publish.php

@@ -1,22 +1,20 @@
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
+    <!-- Title Section -->
     <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
-        <form action="<?php echo base_url('book_publishwise_Report'); ?>" method="post">
+    <!-- Form Section -->
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
-                    <div class="input-group">
+                        <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" />
-        <input type="text" class="form-control input-daterange-datepicker" name="date" />
-       
-    </div>
-                        <!-- <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php if (isset($selected_data)) { echo $selected_data; } ?>" /> -->
                     </div>
-                    
                     <div class="col-md-5">
                         <button type="submit" class="btn btn-primary">Generate Report</button>
                     </div>
@@ -25,6 +23,7 @@
         </form>
     </div>
 </div>
+
 <!-- end page title -->
 
 <div class="row">

app/Views/report_expired_customers.php

@@ -1,11 +1,14 @@
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
-    <div style="max-width: max-content;" class="col-md-4">
+    <!-- Title Section -->
+    <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
+    <!-- Form Section -->
+    <div class="col-md-5 offset-md-3">
         <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
@@ -21,6 +24,7 @@
     </div>
 </div>
 
+
 <div class="row">
     <div class="col-12">
         <div class="card">

app/Views/report_general_invoice.php

@@ -1,33 +1,29 @@
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
+    <!-- Title Section -->
     <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
-        <form action="<?php echo base_url('general_inv_rp'); ?>" method="post">
+    <!-- Form Section -->
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
-                    <div class="input-group">
+                        <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" />
-             
-        <input type="text" class="form-control input-daterange-datepicker" name="date" value="<?php echo $selected_data?>" />
-       
-    </div>
-                        <!-- <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php if (isset($selected_data)) { echo $selected_data; } ?>" /> -->
                     </div>
-                    
                     <div class="col-md-5">
                         <button type="submit" class="btn btn-primary">Generate Report</button>
                     </div>
-                   
-       
                 </div>
             </div>
         </form>
     </div>
 </div>
+
 <!-- end page title -->
 
 <div class="row">

app/Views/report_itemwise.php

@@ -24,19 +24,21 @@
 </style>
 
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
+    <!-- Title Section -->
     <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
-        <form action="<?php echo base_url('itemwise_report'); ?>" method="post">
+    <!-- Form Section -->
-            <input type="hidden" value="date" id="value" name="value">
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
-                        <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data ?>" />
+                        <input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" />
                     </div>
                     <div class="col-md-5">
                         <button type="submit" class="btn btn-primary">Generate Report</button>
@@ -46,6 +48,7 @@
         </form>
     </div>
 </div>
+
 <!-- end page title -->
 
 <div class="row">

app/Views/report_userwise_and_eventwise.php

@@ -1,12 +1,15 @@
 <!-- start page title -->
-<div class="row">
+<div class="row d-flex align-items-center">
+    <!-- Title Section -->
     <div class="col-md-4">
         <div class="page-title-box page-title-box-alt">
             <h4 class="page-title"><?= $page_name ?></h4>
         </div>
     </div>
-    <div class="offset-md-3 col-md-5">
+
-        <form action="<?php echo base_url('report_userwise_and_eventwise'); ?>" method="post">
+    <!-- Form Section -->
+    <div class="col-md-5 offset-md-3">
+        <form action="<?php echo base_url('expired_customer_report'); ?>" method="post">
             <div class="form-group">
                 <div class="row">
                     <div class="col-md-7">
@@ -21,6 +24,7 @@
     </div>
 </div>
 
+
 <div class="row">
     <div class="col-12">
         <div class="card">

app/Views/subscribers_list.php

@@ -37,8 +37,8 @@
                                 <th>Member's Mobile</th>
                                 <th>From Subscription</th>
                                 <th>To Subscription</th>
-                                <th>Short-Code</th>
                                 <th>Expiring Status</th>
+                                <th>Short-Code</th>
                                 <th>Invoice Number</th>
                                 <th>Total (₹) </th>
                                 <th>Status</th>
@@ -96,8 +96,8 @@
                                     <td data-order="<?= $row['mobile_no']; ?>"><?= $row['mobile_no']; ?></td>
                                     <td data-order="<?= strtotime($row['from_subscription']); ?>"><?= $from_date; ?></td>
                                     <td data-order="<?= strtotime($row['to_subscription']); ?>"><?= $to_date; ?></td>
-                                    <td data-order="<?= $row['scheme_code']; ?>"><?= $row['scheme_code']; ?></td>
                                     <td data-order="<?= $message; ?>"><span class="<?php echo $class; ?>"><?php echo $message; ?></span></td>
+                                    <td data-order="<?= $row['scheme_code']; ?>"><?= $row['scheme_code']; ?></td>
                                     <td data-order="<?= $row['invoice_number']; ?>"><?= $row['invoice_number']; ?></td>
                                     <td style="text-align: end;" data-order="<?= $row['total_amount']; ?>"><?=$row['total_amount']; ?></td>
                                     <td data-order="<?= $row['status']; ?>"><?= $row['status']; ?></td>