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

Partially paid invoices should be reused in payment requests. Cleanup the code. (#2008)

Browse Source
This commit is contained in:
Nicolas Dorier
2020-10-23 21:00:23 +09:00
committed by GitHub
parent 20322c6ab8
commit 758f627e12
5 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BTCPayServer/Controllers/PaymentRequestController.cs
View File

@@ -233,17 +233,22 @@ namespace BTCPayServer.Controllers
return BadRequest("Payment Request has expired");
}
var statusesAllowedToDisplay = new List<InvoiceStatus>() { InvoiceStatus.New };
var validInvoice = result.Invoices.FirstOrDefault(invoice => statusesAllowedToDisplay.Contains(invoice.Status));
if (validInvoice != null)
var stateAllowedToDisplay = new HashSet<InvoiceState>()
{
new InvoiceState(InvoiceStatus.New, InvoiceExceptionStatus.None),
new InvoiceState(InvoiceStatus.New, InvoiceExceptionStatus.PaidPartial),
};
var currentInvoice = result
.Invoices
.FirstOrDefault(invoice => stateAllowedToDisplay.Contains(invoice.State));
if (currentInvoice != null)
{
if (redirectToInvoice)
{
return RedirectToAction("Checkout", "Invoice", new { Id = validInvoice.Id });
return RedirectToAction("Checkout", "Invoice", new { Id = currentInvoice.Id });
}
return Ok(validInvoice.Id);
return Ok(currentInvoice.Id);
}
if (result.AllowCustomPaymentAmounts && amount != null)
@@ -295,8 +300,7 @@ namespace BTCPayServer.Controllers
}
var invoices = result.Invoices.Where(requestInvoice =>
requestInvoice.StatusFormatted.Equals(InvoiceState.ToString(InvoiceStatus.New),
StringComparison.InvariantCulture) && !requestInvoice.Payments.Any());
requestInvoice.State.Status == InvoiceStatus.New && !requestInvoice.Payments.Any());
if (!invoices.Any())
{