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

Always show overpaid amount if invoice is overpaid (#4192)

Browse Source 
close #4146
This commit is contained in:
Umar Bolatov
2022-10-05 20:59:05 -07:00
committed by GitHub
parent 8155841a1d
commit d9f8c8d3b1
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BTCPayServer/Controllers/UIInvoiceController.UI.cs
View File

@@ -147,6 +147,7 @@ namespace BTCPayServer.Controllers
var details = InvoicePopulatePayments(invoice);
model.CryptoPayments = details.CryptoPayments;
model.Payments = details.Payments;
model.Overpaid = details.Overpaid;
return View(model);
}
@@ -467,15 +468,25 @@ namespace BTCPayServer.Controllers
private InvoiceDetailsModel InvoicePopulatePayments(InvoiceEntity invoice)
{
return new InvoiceDetailsModel
var overpaid = false;
var model = new InvoiceDetailsModel
{
Archived = invoice.Archived,
Payments = invoice.GetPayments(false),
Overpaid = true,
CryptoPayments = invoice.GetPaymentMethods().Select(
data =>
{
var accounting = data.Calculate();
var paymentMethodId = data.GetId();
var overpaidAmount = accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC);
if (overpaidAmount > 0)
{
overpaid = true;
}
return new InvoiceDetailsModel.CryptoPayment
{
PaymentMethodId = paymentMethodId,
@@ -486,13 +497,16 @@ namespace BTCPayServer.Controllers
accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC),
paymentMethodId.CryptoCode),
Overpaid = _CurrencyNameTable.DisplayFormatCurrency(
accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode),
overpaidAmount, paymentMethodId.CryptoCode),
Address = data.GetPaymentMethodDetails().GetPaymentDestination(),
Rate = ExchangeRate(data),
PaymentMethodRaw = data
};
}).ToList()
};
model.Overpaid = overpaid;
return model;
}
[HttpPost("invoices/{invoiceId}/archive")]