bump

Ref: https://github.com/btcpayserver/btcpayserver/issues/180

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.21</Version>
+		<Version>1.0.2.22</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -85,7 +85,7 @@ namespace BTCPayServer.Controllers
                 {
                     cryptoPayment.Address = onchainMethod.DepositAddress;
                 }
-                cryptoPayment.Rate = FormatCurrency(data);
+                cryptoPayment.Rate = ExchangeRate(data);
                 cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;
                 model.CryptoPayments.Add(cryptoPayment);
             }
@@ -244,14 +244,14 @@ namespace BTCPayServer.Controllers
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
                 BtcDue = accounting.Due.ToString(),
                 OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
-                OrderAmountFiat = OrderAmountFiat(invoice.ProductInformation),
+                OrderAmountFiat = OrderAmountFromInvoice(network.CryptoCode, invoice.ProductInformation),
                 CustomerEmail = invoice.RefundMail,
                 RequiresRefundEmail = storeBlob.RequiresRefundEmail,
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes,
                 ItemDesc = invoice.ProductInformation.ItemDesc,
-                Rate = FormatCurrency(paymentMethod),
+                Rate = ExchangeRate(paymentMethod),
                 MerchantRefLink = invoice.RedirectURL ?? "/",
                 StoreName = store.StoreName,
                 InvoiceBitcoinUrl = paymentMethodId.PaymentType == PaymentTypes.BTCLike ? cryptoInfo.PaymentUrls.BIP21 :
@@ -289,11 +289,20 @@ namespace BTCPayServer.Controllers
             return (paymentMethodId.PaymentType == PaymentTypes.BTCLike ? Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath));
         }
 
-        private string FormatCurrency(PaymentMethod paymentMethod)
+        private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
+        {
+            // if invoice source currency is the same as currently display currency, no need for "order amount from invoice"
+            if (cryptoCode == productInformation.Currency)
+                return null;
+
+            return FormatCurrency(productInformation.Price, productInformation.Currency, _CurrencyNameTable);
+        }
+        private string ExchangeRate(PaymentMethod paymentMethod)
         {
             string currency = paymentMethod.ParentEntity.ProductInformation.Currency;
             return FormatCurrency(paymentMethod.Rate, currency, _CurrencyNameTable);
         }
+
         public static string FormatCurrency(decimal price, string currency, CurrencyNameTable currencies)
         {
             var provider = currencies.GetNumberFormatInfo(currency);
@@ -314,17 +323,11 @@ namespace BTCPayServer.Controllers
                 provider = (NumberFormatInfo)provider.Clone();
                 provider.CurrencyDecimalDigits = divisibility;
             }
-            return price.ToString("C", provider) + $" ({currency})";
-        }
-        private string OrderAmountFiat(ProductInformation productInformation)
-        {
-            // check if invoice source currency is crypto... if it is there is no "order amount in fiat"
-            if (_NetworkProvider.GetNetwork(productInformation.Currency) != null)
-            {
-                return null;
-            }
-
-            return FormatCurrency(productInformation.Price, productInformation.Currency, _CurrencyNameTable);
+            
+            if (currencyData.Crypto)
+                return price.ToString("C", provider);
+            else
+                return price.ToString("C", provider) + $" ({currency})";
         }
 
         [HttpGet]

BTCPayServer/Models/InvoiceResponse.cs

@@ -224,21 +224,21 @@ namespace BTCPayServer.Models
         {
             get; set;
         }
-        
+
         [JsonProperty("paymentSubtotals")]
         public Dictionary<string, long> PaymentSubtotals { get; set; }
 
         [JsonProperty("paymentTotals")]
         public Dictionary<string, long> PaymentTotals { get; set; }
 
-        [JsonProperty("amountPaid")]
+        [JsonProperty("amountPaid", DefaultValueHandling = DefaultValueHandling.Include)]
         public long AmountPaid { get; set; }
 
         [JsonProperty("minerFees")]
         public long MinerFees { get; set; }
 
         [JsonProperty("exchangeRates")]
-        public Dictionary<string, Dictionary<string, decimal>> ExchangeRates{ get; set; }
+        public Dictionary<string, Dictionary<string, decimal>> ExchangeRates { get; set; }
 
         [JsonProperty("supportedTransactionCurrencies")]
         public Dictionary<string, NBitpayClient.InvoiceSupportedTransactionCurrency> SupportedTransactionCurrencies { get; set; }
@@ -246,7 +246,7 @@ namespace BTCPayServer.Models
         [JsonProperty("addresses")]
         public Dictionary<string, string> Addresses { get; set; }
         [JsonProperty("paymentCodes")]
-        public Dictionary<string, NBitpayClient.InvoicePaymentUrls> PaymentCodes{get; set;}
+        public Dictionary<string, NBitpayClient.InvoicePaymentUrls> PaymentCodes { get; set; }
     }
     public class Flags
     {

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -338,9 +338,8 @@ namespace BTCPayServer.Services.Invoices
                 Status = Status,
                 Currency = ProductInformation.Currency,
                 Flags = new Flags() { Refundable = Refundable },
-
                 PaymentSubtotals = new Dictionary<string, long>(),
-                PaymentTotals= new Dictionary<string, long>(),
+                PaymentTotals = new Dictionary<string, long>(),
                 SupportedTransactionCurrencies = new Dictionary<string, InvoiceSupportedTransactionCurrency>(),
                 Addresses = new Dictionary<string, string>(),
                 PaymentCodes = new Dictionary<string, InvoicePaymentUrls>(),
@@ -351,7 +350,6 @@ namespace BTCPayServer.Services.Invoices
             dto.CryptoInfo = new List<NBitpayClient.InvoiceCryptoInfo>();
             foreach (var info in this.GetPaymentMethods(networkProvider))
             {
-               
                 var accounting = info.Calculate();
                 var cryptoInfo = new NBitpayClient.InvoiceCryptoInfo();
                 var subtotalPrice = accounting.TotalDue - accounting.NetworkFee;
@@ -375,7 +373,7 @@ namespace BTCPayServer.Services.Invoices
                 cryptoInfo.CryptoPaid = accounting.CryptoPaid.ToString();
 
                 cryptoInfo.Address = address;
-               
+
                 cryptoInfo.ExRates = exrates;
                 var paymentId = info.GetId();
                 var scheme = info.Network.UriScheme;
@@ -392,7 +390,7 @@ namespace BTCPayServer.Services.Invoices
                         BIP21 = $"{scheme}:{cryptoInfo.Address}?amount={cryptoInfo.Due}",
                     };
                 }
-                
+
                 if (paymentId.PaymentType == PaymentTypes.LightningLike)
                 {
                     cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()

BTCPayServer/Services/Rates/CurrencyNameTable.cs

@@ -31,6 +31,7 @@ namespace BTCPayServer.Services.Rates
             get;
             internal set;
         }
+        public bool Crypto { get; set; }
     }
     public class CurrencyNameTable
     {
@@ -125,7 +126,8 @@ namespace BTCPayServer.Services.Rates
                 {
                     Code = network.CryptoCode,
                     Divisibility = 8,
-                    Name = network.CryptoCode
+                    Name = network.CryptoCode,
+                    Crypto = true
                 });
             }
 

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -73,7 +73,7 @@
                 <span>{{ srvModel.btcDue }} {{ srvModel.cryptoCode }}</span>
             </div>
 
-            <div class="single-item-order__right__ex-rate"  v-if="srvModel.orderAmountFiat">
+            <div class="single-item-order__right__ex-rate" v-if="srvModel.orderAmountFiat">
                 1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}
             </div>
         </div>