|
@@ -284,37 +284,52 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@if(isset($_GET["showFilters"]))
|
|
@if(isset($_GET["showFilters"]))
|
|
|
- var filterStatus = localStorage.getItem("filterStatusReceipt");
|
|
|
|
|
- if (filterStatus) {
|
|
|
|
|
- $('.filterStatus').val(filterStatus).trigger('change');
|
|
|
|
|
- }
|
|
|
|
|
- var filterFrom = localStorage.getItem("filterFromReceipt");
|
|
|
|
|
- if (filterFrom) {
|
|
|
|
|
- $('input[name="txtFrom"]').val(filterFrom);
|
|
|
|
|
- }
|
|
|
|
|
- var filterTo = localStorage.getItem("filterToReceipt");
|
|
|
|
|
- if (filterTo) {
|
|
|
|
|
- $('input[name="txtTo"]').val(filterFrom);
|
|
|
|
|
- }
|
|
|
|
|
- var filterMember = localStorage.getItem("filterMemberReceipt");
|
|
|
|
|
- if (filterMember) {
|
|
|
|
|
- $('.filterMember').val(filterMember).trigger('change');
|
|
|
|
|
- }
|
|
|
|
|
- @endif
|
|
|
|
|
|
|
+ setTimeout(function() {
|
|
|
|
|
+ var filterStatus = localStorage.getItem("filterStatusReceipt");
|
|
|
|
|
+ if (filterStatus && filterStatus !== "null" && filterStatus !== "undefined") {
|
|
|
|
|
+ $('.filterStatus').val(filterStatus).trigger('change');
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- function reset() {
|
|
|
|
|
- $(".todayButton").addClass("lightGrey");
|
|
|
|
|
- $(".yesterdayButton").addClass("lightGrey");
|
|
|
|
|
- $('.filterStatus').val(null).trigger("change");
|
|
|
|
|
- $('.filterMember').val(null).trigger("change");
|
|
|
|
|
- $('.filterFrom').val('');
|
|
|
|
|
- $('.filterTo').val('');
|
|
|
|
|
- destroyDataTable();
|
|
|
|
|
|
|
+ var filterFrom = localStorage.getItem("filterFromReceipt");
|
|
|
|
|
+ if (filterFrom && filterFrom !== "null" && filterFrom !== "undefined") {
|
|
|
|
|
+ $('input[name="txtFrom"]').val(filterFrom);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ var filterTo = localStorage.getItem("filterToReceipt"); // Fixed typo in localStorage key
|
|
|
|
|
+ if (filterTo && filterTo !== "null" && filterTo !== "undefined") {
|
|
|
|
|
+ $('input[name="txtTo"]').val(filterTo); // Fixed: was filterFrom, now filterTo
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ var filterMember = localStorage.getItem("filterMemberReceipt");
|
|
|
|
|
+ if (filterMember && filterMember !== "null" && filterMember !== "undefined") {
|
|
|
|
|
+ $('.filterMember').val(filterMember).trigger('change');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Show the filter section
|
|
|
|
|
+ isFilter = true;
|
|
|
|
|
+ $(".showFilter").show();
|
|
|
|
|
+
|
|
|
|
|
+ // Load the DataTable with filters applied
|
|
|
loadDataTable();
|
|
loadDataTable();
|
|
|
- }
|
|
|
|
|
|
|
+ }, 100);
|
|
|
|
|
+ @else
|
|
|
|
|
+ // Load DataTable normally if no filters to restore
|
|
|
|
|
+ loadDataTable();
|
|
|
|
|
+ @endif
|
|
|
|
|
|
|
|
- function loadDataTable() {
|
|
|
|
|
|
|
+ function reset() {
|
|
|
|
|
+ $(".todayButton").addClass("lightGrey");
|
|
|
|
|
+ $(".yesterdayButton").addClass("lightGrey");
|
|
|
|
|
+ $('.filterStatus').val(null).trigger("change");
|
|
|
|
|
+ $('.filterMember').val(null).trigger("change");
|
|
|
|
|
+ $('.filterFrom').val('');
|
|
|
|
|
+ $('.filterTo').val('');
|
|
|
|
|
+ destroyDataTable();
|
|
|
|
|
+ loadDataTable();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ function loadDataTable() {
|
|
|
if ($.fn.DataTable.isDataTable('#tablesaw-350')) {
|
|
if ($.fn.DataTable.isDataTable('#tablesaw-350')) {
|
|
|
$('#tablesaw-350').DataTable().destroy();
|
|
$('#tablesaw-350').DataTable().destroy();
|
|
|
}
|
|
}
|
|
@@ -326,7 +341,7 @@
|
|
|
localStorage.setItem("filterFromReceipt", filterFrom);
|
|
localStorage.setItem("filterFromReceipt", filterFrom);
|
|
|
|
|
|
|
|
var filterTo = $('.filterTo').val();
|
|
var filterTo = $('.filterTo').val();
|
|
|
- localStorage.setItem("filterToReeipt", filterTo);
|
|
|
|
|
|
|
+ localStorage.setItem("filterToReceipt", filterTo);
|
|
|
|
|
|
|
|
var filterMember = $('.filterMember').val();
|
|
var filterMember = $('.filterMember').val();
|
|
|
localStorage.setItem("filterMemberReceipt", filterMember);
|
|
localStorage.setItem("filterMemberReceipt", filterMember);
|