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

fix invoice exception status not displaying in list

Browse Source 
fixes #1960
This commit is contained in:
Kukks
2020-10-08 08:42:45 +02:00
parent 182d67881d
commit b2052ca308
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/InvoiceController.UI.cs
View File

@@ -669,7 +669,7 @@ namespace BTCPayServer.Controllers
var state = invoice.GetInvoiceState(); var state = invoice.GetInvoiceState();
model.Invoices.Add(new InvoiceModel() model.Invoices.Add(new InvoiceModel()
{ {
Status = invoice.Status, Status = state,
ShowCheckout = invoice.Status == InvoiceStatus.New, ShowCheckout = invoice.Status == InvoiceStatus.New,
Date = invoice.InvoiceTime, Date = invoice.InvoiceTime,
InvoiceId = invoice.Id, InvoiceId = invoice.Id,

2
BTCPayServer/Models/InvoicingModels/InvoicesModel.cs
View File

@@ -19,7 +19,7 @@ namespace BTCPayServer.Models.InvoicingModels
public string RedirectUrl { get; set; } public string RedirectUrl { get; set; }
public string InvoiceId { get; set; } public string InvoiceId { get; set; }
public InvoiceStatus Status { get; set; } public InvoiceState Status { get; set; }
public bool CanMarkComplete { get; set; } public bool CanMarkComplete { get; set; }
public bool CanMarkInvalid { get; set; } public bool CanMarkInvalid { get; set; }
public bool CanMarkStatus => CanMarkComplete || CanMarkInvalid; public bool CanMarkStatus => CanMarkComplete || CanMarkInvalid;

2
BTCPayServer/Views/Invoice/ListInvoices.cshtml
View File

@@ -267,7 +267,7 @@
{ {
<div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.ToString().ToLower()"> <div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.ToString().ToLower()">
<span class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <span class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@invoice.Status.ToString().ToLower() @invoice.Status.ToString()
</span> </span>
<div class="dropdown-menu pull-right"> <div class="dropdown-menu pull-right">
@if (invoice.CanMarkInvalid) @if (invoice.CanMarkInvalid)