TreyWW · XinSkyrim · Apr 7, 2025 · Apr 8, 2025
diff --git a/assets/scripts/tableify.js b/assets/scripts/tableify.js
@@ -34,6 +34,11 @@ window.Tableify = class Tableify {
         this.handleSortButtonClick(colName);
       });
     });
+
+    // Handle the refresh button click event
+    document.getElementById('refresh_btn').addEventListener('click', () => {
+      this.refreshData();
+    });
   }
 
   handleSortButtonClick(colName, parentId) {
@@ -55,6 +60,27 @@ window.Tableify = class Tableify {
     this.redraw(); // Redraw the table with updated sorting
   }
 
+  getFilterParams() {
+    let params = {};
+
+    // Add filters to params from the filters object
+    for (const [colName, filterValues] of Object.entries(this.filters)) {
+        params[colName] = filterValues.join(',');
+    }
+
+    return params;
+  }
+
+  // Refresh data by triggering a GET request with the current filters
+  refreshData() {
+    const params = this.getFilterParams();
+    const url = "/api/invoices/single/fetch/";
+    const queryString = new URLSearchParams(params).toString();
+    const fullUrl = `${url}?${queryString}` ;
+
+    htmx.ajax('GET', fullUrl, { target: '#table_body', swap: 'outerHTML' });
+  }
+
   redraw() {
     const rows = this.table.find("tbody tr");
     rows.show(); // Show all rows initially

diff --git a/backend/finance/api/invoices/fetch.py b/backend/finance/api/invoices/fetch.py
@@ -1,5 +1,7 @@
 from django.shortcuts import render, redirect
 from django.views.decorators.http import require_http_methods
+from datetime import datetime
+from django.db.models import Q
 
 from backend.decorators import web_require_scopes
 from backend.finance.models import Invoice
@@ -14,10 +16,31 @@ def fetch_all_invoices(request: HtmxHttpRequest):
     if not request.htmx:
         return redirect("finance:invoices:single:dashboard")
 
+    due_date = request.GET.get("due_date")
+    invoice_id = request.GET.get("invoice-id")
+    client_name = request.GET.get("client_name")
+    amount = request.GET.get("amount")
+    status = request.GET.get("status")
+
+    query = Q()
+    if invoice_id:
+        query &= Q(id=invoice_id)
+    if client_name:
+        query &= Q(client_name__icontains=client_name)
+    if amount:
+        query &= Q(discount_amount__icontains=amount)
+    if status:
+        query &= Q(status=status)
+    if due_date:
+        date_range = due_date.split(',')
+        date_start = datetime.strptime(date_range[0], "%d/%m/%Y")
+        date_end = datetime.strptime(date_range[1], "%d/%m/%Y")
+        query &= Q(date_due__range=[date_start, date_end])
+
     if request.user.logged_in_as_team:
-        invoices = Invoice.objects.filter(organization=request.user.logged_in_as_team)
+        invoices = Invoice.objects.filter(organization=request.user.logged_in_as_team).filter(query)
     else:
-        invoices = Invoice.objects.filter(user=request.user)
+        invoices = Invoice.objects.filter(user=request.user).filter(query)
 
     # Get filter and sort parameters from the request
     # sort_by = request.GET.get("sort")

diff --git a/frontend/templates/pages/invoices/single/dashboard/dashboard.html b/frontend/templates/pages/invoices/single/dashboard/dashboard.html
@@ -44,8 +44,7 @@ <h2 class="menu-title">Sort by</h2>
                     hx-swap="outerHTML"
                     hx-trigger="click"
                     hx-indicator="#refresh_btn"
-                    hx-target="#table_body"
-                    hx-get="{% url 'api:finance:invoices:single:fetch' %}">
+                    hx-target="#table_body">
                 <span class="loading-htmx-text">
                     <i class="fa-refresh fa"></i>
                 </span>