From 8bd80a6896c851341ac22deb3477ced0684e931c Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 7 Dec 2024 10:32:32 +0530
Subject: [PATCH] FIX_PAYMENT METHOD FILTER, FEAT_ TABLE FILTER FOR EMAIL ADDED

---
 app/Views/notify_the_expiry_subscribers.php | 34 ++++++++++++++++++++-
 app/Views/received_payments_report.php      |  4 +--
 app/Views/report_general_invoice.php        | 16 +++++-----
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/Views/notify_the_expiry_subscribers.php b/app/Views/notify_the_expiry_subscribers.php
index c1d6dcdc..b947f817 100755
--- a/app/Views/notify_the_expiry_subscribers.php
+++ b/app/Views/notify_the_expiry_subscribers.php
@@ -28,7 +28,7 @@
                     <table id="datatable-buttons" class="table table-striped nowrap w-100">
                         <thead>
                             <tr>
-                            <th hidden>id</th>
+                            <!-- <th hidden>id</th> -->
                             <th>Customer Name</th>
                                 <th>Sent Date</th>
                                 <th>Membership ID</th>
@@ -55,6 +55,8 @@
             "searching": true,
             "autoWidth":true 
         });
+
+        
             var $select_data = '<?php echo $selected_data; ?>';
     var dateRangeFilter = $('input.input-daterange-datepicker').daterangepicker({
         locale: {
@@ -154,9 +156,13 @@
                         item.mode,
                         status
                     ]);
+                
                 });
+                
                 table.draw();
+                regenerateFilters(table);
                 $('#modal_table').show();
+                
                 // table.draw();
             } else {
                 tableBody.append('<tr><td colspan="6" class="text-center">No data available</td></tr>');
@@ -169,6 +175,32 @@
         }
     });
 }
+function regenerateFilters(table) {
+    $('#datatable-buttons thead tr:eq(1)').remove();
+    $('#datatable-buttons thead tr').clone(true).appendTo('#datatable-buttons thead');
+
+    $('#datatable-buttons thead tr:eq(1) th').each(function(i) {
+        var title = $(this).text();
+        var column = table.column(i);
+
+        var uniqueValues = column.data().unique().sort();
+
+        var select = $('<select class="form-control form-control-sm"><option value="">Search ' + title + '</option></select>')
+            .appendTo($(this).empty())
+            .on('change', function() {
+                var val = $.fn.dataTable.util.escapeRegex($(this).val());
+                column
+                    .search(val ? '^' + val + '$' : '', true, false)
+                    .draw();
+            });
+
+        uniqueValues.each(function(d) {
+            if (d) {
+                select.append('<option value="' + d + '">' + d + '</option>');
+            }
+        });
+    });
+}
 
     
 </script>
diff --git a/app/Views/received_payments_report.php b/app/Views/received_payments_report.php
index 214796d0..633c3b5e 100644
--- a/app/Views/received_payments_report.php
+++ b/app/Views/received_payments_report.php
@@ -179,8 +179,8 @@
                 paymentMethod = 'Cash on delivery';
             }
             table.column(3)
-                .search(paymentMethod, true, false)
-                .draw();
+            .search('^' + paymentMethod + '$', true, false) // Use regex for exact match
+            .draw();
 
             updateTotal();
         });
diff --git a/app/Views/report_general_invoice.php b/app/Views/report_general_invoice.php
index 240291cd..f46540ce 100755
--- a/app/Views/report_general_invoice.php
+++ b/app/Views/report_general_invoice.php
@@ -102,31 +102,31 @@
                 <input type="checkbox" class="form-check-input column-toggle" data-column="3" checked> Customer Name
             </div><br>
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="4" checked> GST
+                <input type="checkbox" class="form-check-input column-toggle" data-column="4" checked> Count
             </div><br>
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="5" checked> Discount
+                <input type="checkbox" class="form-check-input column-toggle" data-column="5" checked> Invoice Type
             </div><br>
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="6" checked> Count
+                <input type="checkbox" class="form-check-input column-toggle" data-column="6" checked> Status
             </div><br>
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="7" checked> OT Charges
+                <input type="checkbox" class="form-check-input column-toggle" data-column="7" checked> Payment
             </div><br>
 
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="8" checked> Total
+                <input type="checkbox" class="form-check-input column-toggle" data-column="8" checked> Discount
             </div><br>
 
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="9" checked>Status
+                <input type="checkbox" class="form-check-input column-toggle" data-column="9" checked> OT Charges
             </div><br>
 
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="10" checked>Type of Invoice
+                <input type="checkbox" class="form-check-input column-toggle" data-column="10" checked> GST
             </div><br>
             <div class="form-check form-check-inline">
-                <input type="checkbox" class="form-check-input column-toggle" data-column="11" checked>Payment
+                <input type="checkbox" class="form-check-input column-toggle" data-column="11" checked> Total
             </div><br>