From 466a0c6049599dc49ec4c7a6c772bb5d59cbc6fb Mon Sep 17 00:00:00 2001
From: rockstardev <rockstardev@users.noreply.github.com>
Date: Mon, 27 Jul 2020 16:45:50 -0500
Subject: [PATCH] Adding support for dynamic, special meaning date strings

---
 BTCPayServer/SearchString.cs                   | 10 ++++++++++
 BTCPayServer/Views/Invoice/ListInvoices.cshtml | 10 +++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/BTCPayServer/SearchString.cs b/BTCPayServer/SearchString.cs
index 7f94c73f2..52de3ca79 100644
--- a/BTCPayServer/SearchString.cs
+++ b/BTCPayServer/SearchString.cs
@@ -58,6 +58,16 @@ namespace BTCPayServer
                 return null;
 
             var val = Filters[key].First();
+
+            // handle special string values
+            if (val == "-24h")
+                return DateTimeOffset.UtcNow.AddHours(-24).AddMinutes(timezoneOffset);
+            else if (val == "-3d")
+                return DateTimeOffset.UtcNow.AddDays(-3).AddMinutes(timezoneOffset);
+            else if (val == "-7d")
+                return DateTimeOffset.UtcNow.AddDays(-7).AddMinutes(timezoneOffset);
+
+            // default parsing logic
             var success = DateTimeOffset.TryParse(val, null as IFormatProvider, DateTimeStyles.AssumeUniversal, out var r);
             if (success)
             {
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 85372a74e..7d144f569 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -74,9 +74,9 @@
                         <a class="dropdown-item" href="/invoices?Count=@Model.Count&SearchTerm=unusual%3Atrue@{@storeIds}">Unusual Invoices</a>
                         <a class="dropdown-item" href="/invoices?Count=@Model.Count&SearchTerm=includearchived%3Atrue@{@storeIds}">Archived Invoices</a>
                         <div role="separator" class="dropdown-divider"></div>
-                        <a class="dropdown-item last24" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3Alast24@{@storeIds}">Last 24 hours</a>
-                        <a class="dropdown-item last72" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3Alast72@{@storeIds}">Last 3 days</a>
-                        <a class="dropdown-item last168" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3Alast168@{@storeIds}">Last 7 days</a>
+                        <a class="dropdown-item" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3A-24h@{@storeIds}">Last 24 hours</a>
+                        <a class="dropdown-item" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3A-3d@{@storeIds}">Last 3 days</a>
+                        <a class="dropdown-item" href="/invoices?Count=@Model.Count&timezoneoffset=0&SearchTerm=startDate%3A-7d@{@storeIds}">Last 7 days</a>
                         <button type="button" class="dropdown-item" data-toggle="modal" data-target="#customRangeModal" data-backdrop="static">Custom Range</button>
                         <div role="separator" class="dropdown-divider"></div>
                         <a class="dropdown-item" href="/invoices?SearchTerm=">Unfiltered</a>
@@ -324,10 +324,6 @@
             $(".export-link, a.dropdown-item").each(function () {
                 this.href = this.href.replace("timezoneoffset=0", "timezoneoffset=" + timezoneOffset);
             });
-
-            $("a.last24").each(function () { this.href = this.href.replace("last24", getDateStringWithOffset(24)); });
-            $("a.last72").each(function () { this.href = this.href.replace("last72", getDateStringWithOffset(72)); });
-            $("a.last168").each(function () { this.href = this.href.replace("last168", getDateStringWithOffset(168)); });
             
         });