Save the latest search on invoices

This commit is contained in:
nicolas.dorier
2020-07-17 13:24:41 +09:00
parent 7d0aa8d91f
commit f3700c39e3
2 changed files with 32 additions and 3 deletions

View File

@@ -29,6 +29,7 @@ using Microsoft.EntityFrameworkCore;
using NBitcoin;
using NBitpayClient;
using NBXplorer;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using StoreData = BTCPayServer.Data.StoreData;
@@ -597,12 +598,40 @@ namespace BTCPayServer.Controllers
return Ok("{}");
}
public class InvoicePreference
{
public int? TimezoneOffset { get; set; }
public string SearchTerm { get; set; }
}
[HttpGet]
[Route("invoices")]
[Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)]
[BitpayAPIConstraint(false)]
public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50, int timezoneOffset = 0)
public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50, int? timezoneOffset = null)
{
// If the user enter an empty searchTerm, then the variable will be null and not empty string
// but we want searchTerm to be null only if the user is browsing the page via some link
// NOT if the user entered some empty search
searchTerm = searchTerm is string ? searchTerm :
this.Request.Query.ContainsKey(nameof(searchTerm)) ? string.Empty :
null;
if (searchTerm is null)
{
if (this.Request.Cookies.TryGetValue("ListInvoicePreferences", out var str))
{
var preferences = JsonConvert.DeserializeObject<InvoicePreference>(str);
searchTerm = preferences.SearchTerm;
timezoneOffset = timezoneOffset is int v ? v : preferences.TimezoneOffset;
}
}
else
{
var preferences = new InvoicePreference();
preferences.SearchTerm = searchTerm;
preferences.TimezoneOffset = timezoneOffset;
this.Response.Cookies.Append("ListInvoicePreferences", JsonConvert.SerializeObject(preferences));
}
var fs = new SearchString(searchTerm);
var storeIds = fs.GetFilterArray("storeid") != null ? fs.GetFilterArray("storeid") : new List<string>().ToArray();
@@ -614,7 +643,7 @@ namespace BTCPayServer.Controllers
StoreIds = storeIds,
TimezoneOffset = timezoneOffset
};
InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm, timezoneOffset);
InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm, timezoneOffset ?? 0);
var counting = _InvoiceRepository.GetInvoicesTotal(invoiceQuery);
invoiceQuery.Count = count;
invoiceQuery.Skip = skip;