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

Payment details: Re-add unit for displayed amount (#5541)

Browse Source 
* Payment details: Re-add unit for displayed amount

Fixes #5540.

* Ensure we are not using the symbol for BTC
This commit is contained in:
d11n
2023-12-07 12:40:13 +01:00
committed by GitHub
parent eda437995f
commit 0c16492d1c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
View File

@@ -233,7 +233,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
Amount = paymentEntity.PaidAmount.Gross, Amount = paymentEntity.PaidAmount.Gross,
Paid = paymentEntity.InvoicePaidAmount.Net, Paid = paymentEntity.InvoicePaidAmount.Net,
ReceivedDate = paymentEntity.ReceivedTime.DateTime, ReceivedDate = paymentEntity.ReceivedTime.DateTime,
AmountFormatted = displayFormatter.Currency(paymentEntity.PaidAmount.Gross, paymentEntity.PaidAmount.Currency, DisplayFormatter.CurrencyFormat.None), AmountFormatted = displayFormatter.Currency(paymentEntity.PaidAmount.Gross, paymentEntity.PaidAmount.Currency),
PaidFormatted = displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol), PaidFormatted = displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
RateFormatted = displayFormatter.Currency(paymentEntity.Rate, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol), RateFormatted = displayFormatter.Currency(paymentEntity.Rate, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
PaymentMethod = paymentMethodId.ToPrettyString(), PaymentMethod = paymentMethodId.ToPrettyString(),

6
BTCPayServer/Services/DisplayFormatter.cs
View File

@@ -44,6 +44,12 @@ public class DisplayFormatter
} }
var formatted = value.ToString("C", provider); var formatted = value.ToString("C", provider);
// Ensure we are not using the symbol for BTC — we made that design choice consciously.
if (format == CurrencyFormat.Symbol && currencyData.Code == "BTC")
{
format = CurrencyFormat.Code;
}
return format switch return format switch
{ {
CurrencyFormat.None => formatted.Replace(provider.CurrencySymbol, "").Trim(), CurrencyFormat.None => formatted.Replace(provider.CurrencySymbol, "").Trim(),