aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 05:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add All time to the Time filter, PlanB Assignment (#6514)" (#6519)

Browse Source 
This reverts commit 79c5ff9ed0.
This commit is contained in:
Nicolas Dorier
2024-12-23 18:56:22 +09:00
committed by GitHub
parent 79c5ff9ed0
commit f1719ed3d2
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BTCPayServer/SearchString.cs
View File

@@ -127,8 +127,6 @@ namespace BTCPayServer
return DateTimeOffset.UtcNow.AddDays(-3).AddMinutes(timezoneOffset); return DateTimeOffset.UtcNow.AddDays(-3).AddMinutes(timezoneOffset);
case "-7d": case "-7d":
return DateTimeOffset.UtcNow.AddDays(-7).AddMinutes(timezoneOffset); return DateTimeOffset.UtcNow.AddDays(-7).AddMinutes(timezoneOffset);
case "alltime":
return null; // No filtering by date, so return null
} }
// default parsing logic // default parsing logic
@@ -157,6 +155,5 @@ namespace BTCPayServer
var value = str.Trim().TrimStart(FilterSeparator).TrimEnd(FilterSeparator); var value = str.Trim().TrimStart(FilterSeparator).TrimEnd(FilterSeparator);
return string.IsNullOrEmpty(value) ? " " : value; return string.IsNullOrEmpty(value) ? " " : value;
} }
} }
} }

6
BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
View File

@@ -250,11 +250,6 @@
{ {
<span text-translate="true">7 Days</span> <span text-translate="true">7 Days</span>
} }
else if (HasArrayFilter("startdate", "alltime"))
{
<span text-translate="true">All Time</span>
}
else else
{ {
<span text-translate="true">Custom</span> <span text-translate="true">Custom</span>
@@ -269,7 +264,6 @@
<a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-1d")" class="dropdown-item @(HasArrayFilter("startdate", "-1d") ? "custom-active" : "")" text-translate="true">Last 24 hours</a> <a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-1d")" class="dropdown-item @(HasArrayFilter("startdate", "-1d") ? "custom-active" : "")" text-translate="true">Last 24 hours</a>
<a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-3d")" class="dropdown-item @(HasArrayFilter("startdate", "-3d") ? "custom-active" : "")" text-translate="true">Last 3 days</a> <a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-3d")" class="dropdown-item @(HasArrayFilter("startdate", "-3d") ? "custom-active" : "")" text-translate="true">Last 3 days</a>
<a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-7d")" class="dropdown-item @(HasArrayFilter("startdate", "-7d") ? "custom-active" : "")" text-translate="true">Last 7 days</a> <a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "-7d")" class="dropdown-item @(HasArrayFilter("startdate", "-7d") ? "custom-active" : "")" text-translate="true">Last 7 days</a>
<a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("startdate", "alltime")" class="dropdown-item @(HasArrayFilter("startdate", "alltime") || !Model.Search.ContainsFilter("startdate") ? "custom-active" : "")" text-translate="true">All Time</a>
<button type="button" class="dropdown-item @(HasCustomDateFilter() ? "custom-active" : "")" data-bs-toggle="modal" data-bs-target="#customRangeModal" text-translate="true">Custom Range</button> <button type="button" class="dropdown-item @(HasCustomDateFilter() ? "custom-active" : "")" data-bs-toggle="modal" data-bs-target="#customRangeModal" text-translate="true">Custom Range</button>
</div> </div>
</div> </div>