aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-23 15:14:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1964 from btcpayserver/decouple-icon-from-invoice

Browse Source 
Decouple payment type icon from UI
This commit is contained in:
Nicolas Dorier
2020-10-08 16:30:07 +09:00
committed by GitHub
parent 10bf914d78 8cb3757f5c
commit 911a7ef6b5
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer/Payments/PaymentTypes.Bitcoin.cs
View File

@@ -19,10 +19,8 @@ namespace BTCPayServer.Payments
public override string ToPrettyString() => "On-Chain";
public override string GetId() => "BTCLike";
public override string ToStringNormalized()
{
return "OnChain";
}
public override string ToStringNormalized() => "OnChain";
public override string GetBadge() => "🔗";
public override CryptoPaymentData DeserializePaymentData(BTCPayNetworkBase network, string str)
{

2
BTCPayServer/Payments/PaymentTypes.Lightning.cs
View File

@@ -17,6 +17,8 @@ namespace BTCPayServer.Payments
public override string ToPrettyString() => "Off-Chain";
public override string GetId() => "LightningLike";
public override string GetBadge() => "⚡";
public override string ToStringNormalized()
{
return "LightningNetwork";

1
BTCPayServer/Payments/PaymentTypes.cs
View File

@@ -82,6 +82,7 @@ namespace BTCPayServer.Payments
}
public abstract string GetId();
public virtual string GetBadge() => null;
public abstract CryptoPaymentData DeserializePaymentData(BTCPayNetworkBase network, string str);
public abstract string SerializePaymentData(BTCPayNetworkBase network, CryptoPaymentData paymentData);
public abstract IPaymentMethodDetails DeserializePaymentMethodDetails(BTCPayNetworkBase network, string str);

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

@@ -291,18 +291,9 @@
@invoice.Status.ToString().ToLower()
</span>
}
@{
var grouped = invoice.Details.Payments.GroupBy(payment => payment.GetPaymentMethodId()?.PaymentType).Where(entities => entities.Key!= null);
var paiOnChain = grouped.Where(g => g.Key == BitcoinPaymentType.Instance).Any();
var paidOffChain = grouped.Where(g => g.Key == LightningPaymentType.Instance).Any();
}
@if (paiOnChain)
@foreach (var paymentType in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()?.PaymentType).Distinct().Where(type => type != null && !string.IsNullOrEmpty(type.GetBadge())))
{
<span class="badge">🔗</span>
}
@if (paidOffChain)
{
<span class="badge">⚡️</span>
<span class="badge">@paymentType.GetBadge()</span>
}
</td>
<td style="text-align:right">@invoice.AmountCurrency</td>