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

Add InvoiceEntity.NetSettled property

Browse Source
This commit is contained in:
nicolas.dorier
2025-03-23 10:53:05 +09:00
parent 0c8b0d1dd3
commit 019c878c4e
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer.Tests/FastTests.cs
View File

@@ -2252,17 +2252,21 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
PaymentMethodId = btcId
});
invoiceEntity.UpdateTotals();
var prevNetSettled = invoiceEntity.NetSettled;
Assert.Equal(invoiceEntity.PaidAmount.Net, invoiceEntity.NetSettled);
accounting = btc.Calculate();
invoiceEntity.Payments.Add(
new PaymentEntity()
{
Status = PaymentStatus.Settled,
Status = PaymentStatus.Processing,
Currency = "BTC",
Value = accounting.Due,
PaymentMethodFee = 0.00000100m,
PaymentMethodId = btcId
});
invoiceEntity.UpdateTotals();
Assert.NotEqual(invoiceEntity.PaidAmount.Net, invoiceEntity.NetSettled);
Assert.Equal(prevNetSettled, invoiceEntity.NetSettled);
accounting = btc.Calculate();
Assert.Equal(0.0m, accounting.Due);
Assert.Equal(0.0m, accounting.DueUncapped);

9
BTCPayServer/Services/Invoices/InvoiceEntity.cs
View File

@@ -416,6 +416,7 @@ namespace BTCPayServer.Services.Invoices
{
Currency = Currency
};
NetSettled = 0.0m;
foreach (var payment in GetPayments(false))
{
payment.Rate = GetInvoiceRate(payment.Currency);
@@ -425,6 +426,8 @@ namespace BTCPayServer.Services.Invoices
{
PaidAmount.Gross += payment.InvoicePaidAmount.Gross;
PaidAmount.Net += payment.InvoicePaidAmount.Net;
if (payment.Status == PaymentStatus.Settled)
NetSettled += payment.InvoicePaidAmount.Net;
}
}
NetDue = Price - PaidAmount.Net;
@@ -772,6 +775,12 @@ namespace BTCPayServer.Services.Invoices
}
[JsonIgnore]
public Amounts PaidAmount { get; set; }
/// <summary>
/// Same as <see cref="Amounts.Net"/> of <see cref="PaidAmount"/>, but only counting payments in 'Settled' state
/// </summary>
[JsonIgnore]
public decimal NetSettled { get; private set; }
}
public enum InvoiceStatusLegacy