aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-09 00:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

App: Sales stats should only include paid invoices (#6444)

Browse Source 
Fixes btcpayserver/app#110
This commit is contained in:
d11n
2024-11-29 08:23:53 +01:00
committed by GitHub
parent 299527fe16
commit bdf12aab0f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BTCPayServer/Services/Apps/AppService.cs
View File

@@ -43,6 +43,10 @@ namespace BTCPayServer.Services.Apps
private readonly DisplayFormatter _displayFormatter;
private readonly StoreRepository _storeRepository;
public CurrencyNameTable Currencies => _Currencies;
private readonly string[] _paidStatuses = [
InvoiceStatus.Processing.ToString(),
InvoiceStatus.Settled.ToString()
];
public AppService(
IEnumerable<AppBaseType> apps,
@@ -86,11 +90,7 @@ namespace BTCPayServer.Services.Apps
{
if (GetAppType(appData.AppType) is not IHasItemStatsAppType salesType)
throw new InvalidOperationException("This app isn't a SalesAppBaseType");
var paidInvoices = await GetInvoicesForApp(_InvoiceRepository, appData, null,
[
InvoiceStatus.Processing.ToString(),
InvoiceStatus.Settled.ToString()
]);
var paidInvoices = await GetInvoicesForApp(_InvoiceRepository, appData, null, _paidStatuses);
return await salesType.GetItemStats(appData, paidInvoices);
}
@@ -132,8 +132,7 @@ namespace BTCPayServer.Services.Apps
{
if (GetAppType(app.AppType) is not IHasSaleStatsAppType salesType)
throw new InvalidOperationException("This app isn't a SalesAppBaseType");
var paidInvoices = await GetInvoicesForApp(_InvoiceRepository, app, DateTimeOffset.UtcNow - TimeSpan.FromDays(numberOfDays));
var paidInvoices = await GetInvoicesForApp(_InvoiceRepository, app, DateTimeOffset.UtcNow - TimeSpan.FromDays(numberOfDays), _paidStatuses);
return await salesType.GetSalesStats(app, paidInvoices, numberOfDays);
}