From 2f3eedea5b9b8cf1d6cae503a2cb12239af1014e Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Sat, 8 Jul 2023 17:33:13 +0200
Subject: [PATCH] Invoice lists: Show icons for payment methods (#5137)

---
 .../StoreRecentInvoices/Default.cshtml        | 51 ++++++----
 .../Views/UIInvoice/ListInvoices.cshtml       | 99 +++++++++++--------
 2 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
index eb0c45ed8..360ca7d7c 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
+++ b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
@@ -3,6 +3,7 @@
 @using BTCPayServer.Services
 @using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
+@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
 <div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
@@ -51,27 +52,41 @@
                         <a asp-controller="UIInvoice" asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId" class="text-break">@invoice.InvoiceId</a>
                     </td>
                     <td>
-                        @if (invoice.Details.Archived)
-                        {
-                            <span class="badge bg-warning">archived</span>
-                        }
-                        <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                            @invoice.Status.Status.ToModernStatus().ToString()
-                            @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                        <div class="d-flex align-items-center gap-2">
+                            @if (invoice.Details.Archived)
                             {
-                                @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                <span class="badge bg-warning">archived</span>
                             }
-                        </span>
-                        @foreach (var paymentType in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()?.PaymentType).Distinct().Where(type => type != null && !string.IsNullOrEmpty(type.GetBadge())))
-                        {
-                            <span class="badge">@paymentType.GetBadge()</span>
-                        }
-                        @if (invoice.HasRefund)
-                        {
-                            <span class="badge bg-warning">
-                                Refund
+                            <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                @invoice.Status.Status.ToModernStatus().ToString()
+                                @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                {
+                                    @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                }
                             </span>
-                        }
+                            @foreach (var paymentMethodId in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()).Distinct())
+                            {
+                                var image = PaymentMethodHandlerDictionary[paymentMethodId]?.GetCryptoImage(paymentMethodId);
+                                var badge = paymentMethodId.PaymentType.GetBadge();
+                                if (!string.IsNullOrEmpty(image) || !string.IsNullOrEmpty(badge))
+                                {
+                                    <span class="d-inline-flex align-items-center gap-1">
+                                        @if (!string.IsNullOrEmpty(image))
+                                        {
+                                            <img src="@Context.Request.GetRelativePathOrAbsolute(image)" alt="@paymentMethodId.PaymentType.ToString()" style="height:1.5em" />
+                                        }
+                                        @if (!string.IsNullOrEmpty(badge))
+                                        {
+                                            @badge
+                                        }
+                                    </span>
+                                }
+                            }
+                            @if (invoice.HasRefund)
+                            {
+                                <span class="badge bg-warning">Refund</span>
+                            }
+                        </div>
                     </td>
                     <td class="text-end">
                         <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>
diff --git a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
index 6368fa529..3acf06795 100644
--- a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
@@ -2,6 +2,7 @@
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Services
 @inject DisplayFormatter DisplayFormatter
+@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @model InvoicesModel
 @{
     ViewData.SetActivePage(InvoiceNavPages.Index, "Invoices");
@@ -391,50 +392,66 @@
                             </td>
                             <td class="text-break">@invoice.InvoiceId</td>
                             <td>
-                                @if (invoice.Details.Archived)
-                                {
-                                    <span class="badge bg-warning">archived</span>
-                                }
-                                @if (invoice.CanMarkStatus)
-                                {
-                                    <div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                                        <span class="dropdown-toggle changeInvoiceStateToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            @invoice.Status.ToString()
-                                        </span>
-                                        <div class="dropdown-menu">
-                                            @if (invoice.CanMarkInvalid)
-                                            {
-                                                <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="invalid">
-                                                    Mark as invalid
-                                                </button>
-                                            }
-                                            @if (invoice.CanMarkSettled)
-                                            {
-                                                <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="settled">
-                                                    Mark as settled
-                                                </button>
-                                            }
+                                <div class="d-flex align-items-center gap-2">
+                                    @if (invoice.Details.Archived)
+                                    {
+                                        <span class="badge bg-warning">archived</span>
+                                    }
+                                    @if (invoice.CanMarkStatus)
+                                    {
+                                        <div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                            <span class="dropdown-toggle changeInvoiceStateToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                @invoice.Status.ToString()
+                                            </span>
+                                            <div class="dropdown-menu">
+                                                @if (invoice.CanMarkInvalid)
+                                                {
+                                                    <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="invalid">
+                                                        Mark as invalid
+                                                    </button>
+                                                }
+                                                @if (invoice.CanMarkSettled)
+                                                {
+                                                    <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="settled">
+                                                        Mark as settled
+                                                    </button>
+                                                }
+                                            </div>
                                         </div>
-                                    </div>
-                                }
-                                else
-                                {
-                                    <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                                        @invoice.Status.Status.ToModernStatus().ToString()
-                                        @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                    }
+                                    else
+                                    {
+                                        <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                            @invoice.Status.Status.ToModernStatus().ToString()
+                                            @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                            {
+                                                @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                            }
+                                        </span>
+                                    }
+                                    @foreach (var paymentMethodId in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()).Distinct())
+                                    {
+                                        var image = PaymentMethodHandlerDictionary[paymentMethodId]?.GetCryptoImage(paymentMethodId);
+                                        var badge = paymentMethodId.PaymentType.GetBadge();
+                                        if (!string.IsNullOrEmpty(image) || !string.IsNullOrEmpty(badge))
                                         {
-                                            @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                            <span class="d-inline-flex align-items-center gap-1">
+                                                @if (!string.IsNullOrEmpty(image))
+                                                {
+                                                    <img src="@Context.Request.GetRelativePathOrAbsolute(image)" alt="@paymentMethodId.PaymentType.ToString()" style="height:1.5em" />
+                                                }
+                                                @if (!string.IsNullOrEmpty(badge))
+                                                {
+                                                    @badge
+                                                }
+                                            </span>
                                         }
-                                    </span>
-                                }
-                                @foreach (var paymentType in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()?.PaymentType).Distinct().Where(type => type != null && !string.IsNullOrEmpty(type.GetBadge())))
-                                {
-                                    <span class="badge">@paymentType.GetBadge()</span>
-                                }
-                                @if (invoice.HasRefund)
-                                {
-                                    <span class="badge bg-warning">Refund</span>
-                                }
+                                    }
+                                    @if (invoice.HasRefund)
+                                    {
+                                        <span class="badge bg-warning">Refund</span>
+                                    }
+                                </div>
                             </td>
                             <td class="text-end text-nowrap">
                                 <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>