bump

This reverts commit fb57d8c3ce9f4b6e5d1ced035cda4cd385e6c75a.

BTCPayServer.Tests/UnitTest1.cs

@@ -806,6 +806,26 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CanParseCurrencyValue()
+        {
+            Assert.True(CurrencyValue.TryParse("1.50USD", out var result));
+            Assert.Equal("1.50 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1.50 USD", out result));
+            Assert.Equal("1.50 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1.50 usd", out result));
+            Assert.Equal("1.50 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1 usd", out result));
+            Assert.Equal("1 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1usd", out result));
+            Assert.Equal("1 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1.501 usd", out result));
+            Assert.Equal("1.50 USD", result.ToString());
+            Assert.False(CurrencyValue.TryParse("1.501 WTFF", out result));
+            Assert.False(CurrencyValue.TryParse("1,501 usd", out result));
+            Assert.False(CurrencyValue.TryParse("1.501", out result));
+        }
+
         [Fact]
         public void CanParseDerivationScheme()
         {
@@ -821,27 +841,29 @@ namespace BTCPayServer.Tests
             result = parser.Parse("xpub661MyMwAqRbcGeVGU5e5KBcau1HHEUGf9Wr7k4FyLa8yRPNQrrVa7Ndrgg8Afbe2UYXMSL6tJBFd2JewwWASsePPLjkcJFL1tTVEs3UQ23X");
             Assert.Equal("tpubD6NzVbkrYhZ4YSg7vGdAX6wxE8NwDrmih9SR6cK7gUtsAg37w5LfFpJgviCxC6bGGT4G3uckqH5fiV9ZLN1gm5qgQLVuymzFUR5ed7U7ksu-[legacy]", result.ToString());
             ////////////////
-        
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o", result.ToString());
+
+            var tpub = "tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o";
+
+            result = parser.Parse(tpub);
+            Assert.Equal(tpub, result.ToString());
             parser.HintScriptPubKey = BitcoinAddress.Create("tb1q4s33amqm8l7a07zdxcunqnn3gcsjcfz3xc573l", parser.Network).ScriptPubKey;
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o", result.ToString());
+            result = parser.Parse(tpub);
+            Assert.Equal(tpub, result.ToString());
 
             parser.HintScriptPubKey = BitcoinAddress.Create("2N2humNio3YTApSfY6VztQ9hQwDnhDvaqFQ", parser.Network).ScriptPubKey;
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o-[p2sh]", result.ToString());
+            result = parser.Parse(tpub);
+            Assert.Equal($"{tpub}-[p2sh]", result.ToString());
 
             parser.HintScriptPubKey = BitcoinAddress.Create("mwD8bHS65cdgUf6rZUUSoVhi3wNQFu1Nfi", parser.Network).ScriptPubKey;
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o-[legacy]", result.ToString());
+            result = parser.Parse(tpub);
+            Assert.Equal($"{tpub}-[legacy]", result.ToString());
 
             parser.HintScriptPubKey = BitcoinAddress.Create("2N2humNio3YTApSfY6VztQ9hQwDnhDvaqFQ", parser.Network).ScriptPubKey;
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o-[legacy]");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o-[p2sh]", result.ToString());
+            result = parser.Parse($"{tpub}-[legacy]");
+            Assert.Equal($"{tpub}-[p2sh]", result.ToString());
 
-            result = parser.Parse("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o");
-            Assert.Equal("tpubD6NzVbkrYhZ4Wc65tjhmcKdWFauAo7bGLRTxvggygkNyp6SMGutJp7iociwsinU33jyNBp1J9j2hJH5yQsayfiS3LEU2ZqXodAcnaygra8o-[p2sh]", result.ToString());
+            result = parser.Parse(tpub);
+            Assert.Equal($"{tpub}-[p2sh]", result.ToString());
         }
 
         [Fact]

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.62</Version>
+		<Version>1.0.1.70</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -208,10 +208,13 @@ namespace BTCPayServer.Controllers
             {
                 CryptoCode = network.CryptoCode,
                 PaymentMethodId = paymentMethodId.ToString(),
+                IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
                 ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
                 OrderId = invoice.OrderId,
                 InvoiceId = invoice.Id,
                 DefaultLang = storeBlob.DefaultLang ?? "en-US",
+                CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
+                CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
                 OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
                 BtcDue = accounting.Due.ToString(),

BTCPayServer/Controllers/InvoiceController.cs

@@ -79,28 +79,6 @@ namespace BTCPayServer.Controllers
 
         internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
         {
-            var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
-                                               .Select(c =>
-                                                (Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
-                                                SupportedPaymentMethod: c,
-                                                Network: _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode),
-                                                IsAvailable: Task.FromResult(false)))
-                                                .Where(c => c.Network != null)
-                                                .Select(c => 
-                                                {
-                                                    c.IsAvailable = c.Handler.IsAvailable(c.SupportedPaymentMethod, c.Network);
-                                                    return c;
-                                                })
-                                                .ToList();
-            foreach(var supportedPaymentMethod in supportedPaymentMethods.ToList())
-            {
-                if(!await supportedPaymentMethod.IsAvailable)
-                {
-                    supportedPaymentMethods.Remove(supportedPaymentMethod);
-                }
-            }
-            if (supportedPaymentMethods.Count == 0)
-                throw new BitpayHttpException(400, "No derivation strategy are available now for this store");
             var entity = new InvoiceEntity
             {
                 InvoiceTime = DateTimeOffset.UtcNow
@@ -132,34 +110,54 @@ namespace BTCPayServer.Controllers
             entity.Status = "new";
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 
-            var methods = supportedPaymentMethods
-                        .Select(async o =>
-                        {
-                            var rate = await storeBlob.ApplyRateRules(o.Network, _RateProviders.GetRateProvider(o.Network, false)).GetRateAsync(invoice.Currency);
-                            PaymentMethod paymentMethod = new PaymentMethod();
-                            paymentMethod.ParentEntity = entity;
-                            paymentMethod.SetId(o.SupportedPaymentMethod.PaymentId);
-                            paymentMethod.Rate = rate;
-                            var paymentDetails = await o.Handler.CreatePaymentMethodDetails(o.SupportedPaymentMethod, paymentMethod, o.Network);
-                            if (storeBlob.NetworkFeeDisabled)
-                                paymentDetails.SetNoTxFee();
-                            paymentMethod.SetPaymentMethodDetails(paymentDetails);
-#pragma warning disable CS0618
-                            if (paymentMethod.GetId().IsBTCOnChain)
-                            {
-                                entity.TxFee = paymentMethod.TxFee;
-                                entity.Rate = paymentMethod.Rate;
-                                entity.DepositAddress = paymentMethod.DepositAddress;
-                            }
-#pragma warning restore CS0618
-                            return paymentMethod;
-                        });
-            entity.SetSupportedPaymentMethods(supportedPaymentMethods.Select(s => s.SupportedPaymentMethod));
+
+            var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
+                                               .Select(c =>
+                                                (Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
+                                                SupportedPaymentMethod: c,
+                                                Network: _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode)))
+                                                .Where(c => c.Network != null)
+                                                .Select(o =>
+                                                    (SupportedPaymentMethod: o.SupportedPaymentMethod,
+                                                    PaymentMethod: CreatePaymentMethodAsync(o.Handler, o.SupportedPaymentMethod, o.Network, entity, storeBlob)))
+                                                .ToList();
+
+            List<string> paymentMethodErrors = new List<string>();
+            List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>();
             var paymentMethods = new PaymentMethodDictionary();
-            foreach (var method in methods)
+            foreach (var o in supportedPaymentMethods)
             {
-                paymentMethods.Add(await method);
+                try
+                {
+                    var paymentMethod = await o.PaymentMethod;
+                    if (paymentMethod == null)
+                        throw new PaymentMethodUnavailableException("Payment method unavailable (The handler returned null)");
+                    supported.Add(o.SupportedPaymentMethod);
+                    paymentMethods.Add(paymentMethod);
+                }
+                catch (PaymentMethodUnavailableException ex)
+                {
+                    paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
+                }
+                catch (Exception ex)
+                {
+                    paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
+                }
             }
+
+            if (supported.Count == 0)
+            {
+                StringBuilder errors = new StringBuilder();
+                errors.AppendLine("No payment method available for this store");
+                foreach(var error in paymentMethodErrors)
+                {
+                    errors.AppendLine(error);
+                }
+                throw new BitpayHttpException(400, errors.ToString());
+            }
+
+            entity.SetSupportedPaymentMethods(supported);
+            entity.SetPaymentMethods(paymentMethods);
 #pragma warning disable CS0618
             // Legacy Bitpay clients expect information for BTC information, even if the store do not support it
             var legacyBTCisSet = paymentMethods.Any(p => p.GetId().IsBTCOnChain);
@@ -177,15 +175,58 @@ namespace BTCPayServer.Controllers
                 }
 #pragma warning restore CS0618
             }
-
-            entity.SetPaymentMethods(paymentMethods);
             entity.PosData = invoice.PosData;
-            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, _NetworkProvider);
+            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, paymentMethodErrors, _NetworkProvider);
+
             _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
+        private async Task<PaymentMethod> CreatePaymentMethodAsync(IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreBlob storeBlob)
+        {
+            var rate = await storeBlob.ApplyRateRules(network, _RateProviders.GetRateProvider(network, false)).GetRateAsync(entity.ProductInformation.Currency);
+            PaymentMethod paymentMethod = new PaymentMethod();
+            paymentMethod.ParentEntity = entity;
+            paymentMethod.Network = network;
+            paymentMethod.SetId(supportedPaymentMethod.PaymentId);
+            paymentMethod.Rate = rate;
+            var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, network);
+            if (storeBlob.NetworkFeeDisabled)
+                paymentDetails.SetNoTxFee();
+            paymentMethod.SetPaymentMethodDetails(paymentDetails);
+
+            // Check if Lightning Max value is exceeded
+            if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
+               storeBlob.LightningMaxValue != null)
+            {
+                var lightningMaxValue = storeBlob.LightningMaxValue;
+                var lightningMaxValueRate = 0.0m;
+                if (lightningMaxValue.Currency == entity.ProductInformation.Currency)
+                    lightningMaxValueRate = paymentMethod.Rate;
+                else
+                    lightningMaxValueRate = await storeBlob.ApplyRateRules(network, _RateProviders.GetRateProvider(network, false)).GetRateAsync(lightningMaxValue.Currency);
+
+                var lightningMaxValueCrypto = Money.Coins(lightningMaxValue.Value / lightningMaxValueRate);
+                if (paymentMethod.Calculate().Due > lightningMaxValueCrypto)
+                {
+                    throw new PaymentMethodUnavailableException("Lightning max value exceeded");
+                }
+            }
+            ///////////////
+
+
+#pragma warning disable CS0618
+            if (paymentMethod.GetId().IsBTCOnChain)
+            {
+                entity.TxFee = paymentMethod.TxFee;
+                entity.Rate = paymentMethod.Rate;
+                entity.DepositAddress = paymentMethod.DepositAddress;
+            }
+#pragma warning restore CS0618
+            return paymentMethod;
+        }
+
 #pragma warning disable CS0618
         private static Money GetTxFee(StoreBlob storeBlob, FeeRate feeRate)
         {

BTCPayServer/Controllers/StoresController.cs

@@ -183,6 +183,69 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(StoreUsers), new { storeId = storeId, userId = userId });
         }
 
+        [HttpGet]
+        [Route("{storeId}/checkout")]
+        public async Task<IActionResult> CheckoutExperience(string storeId)
+        {
+            var store = await _Repo.FindStore(storeId, GetUserId());
+            if (store == null)
+                return NotFound();
+            var storeBlob = store.GetStoreBlob();
+            var vm = new CheckoutExperienceViewModel();
+            vm.SetCryptoCurrencies(_ExplorerProvider, store.GetDefaultCrypto());
+            vm.SetLanguages(_LangService, storeBlob.DefaultLang);
+            vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
+            vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
+            vm.CustomCSS = storeBlob.CustomCSS;
+            vm.CustomLogo = storeBlob.CustomLogo;
+            return View(vm);
+        }
+
+        [HttpPost]
+        [Route("{storeId}/checkout")]
+        public async Task<IActionResult> CheckoutExperience(string storeId, CheckoutExperienceViewModel model)
+        {
+            CurrencyValue currencyValue = null;
+            if (!string.IsNullOrWhiteSpace(model.LightningMaxValue))
+            {
+                if (!CurrencyValue.TryParse(model.LightningMaxValue, out currencyValue))
+                {
+                    ModelState.AddModelError(nameof(model.LightningMaxValue), "Invalid currency value");
+                }
+            }
+            var store = await _Repo.FindStore(storeId, GetUserId());
+            if (store == null)
+                return NotFound();
+            bool needUpdate = false;
+            var blob = store.GetStoreBlob();
+            if (store.GetDefaultCrypto() != model.DefaultCryptoCurrency)
+            {
+                needUpdate = true;
+                store.SetDefaultCrypto(model.DefaultCryptoCurrency);
+            }
+            model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
+            model.SetLanguages(_LangService, model.DefaultLang);
+            blob.DefaultLang = model.DefaultLang;
+            blob.AllowCoinConversion = model.AllowCoinConversion;
+            blob.LightningMaxValue = currencyValue;
+            blob.CustomLogo = model.CustomLogo;
+            blob.CustomCSS = model.CustomCSS;
+            if (store.SetStoreBlob(blob))
+            {
+                needUpdate = true;
+            }
+            if (needUpdate)
+            {
+                await _Repo.UpdateStore(store);
+                StatusMessage = "Store successfully updated";
+            }
+
+            return RedirectToAction(nameof(CheckoutExperience), new
+            {
+                storeId = storeId
+            });
+        }
+
         [HttpGet]
         [Route("{storeId}")]
         public async Task<IActionResult> UpdateStore(string storeId)
@@ -195,18 +258,14 @@ namespace BTCPayServer.Controllers
             var vm = new StoreViewModel();
             vm.Id = store.Id;
             vm.StoreName = store.StoreName;
-            vm.SetCryptoCurrencies(_ExplorerProvider, store.GetDefaultCrypto());
-            vm.SetLanguages(_LangService, storeBlob.DefaultLang);
             vm.StoreWebsite = store.StoreWebsite;
             vm.NetworkFee = !storeBlob.NetworkFeeDisabled;
             vm.SpeedPolicy = store.SpeedPolicy;
             AddPaymentMethods(store, vm);
-            vm.StatusMessage = StatusMessage;
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
             vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
             vm.PreferredExchange = storeBlob.PreferredExchange.IsCoinAverage() ? "coinaverage" : storeBlob.PreferredExchange;
-            vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
             return View(vm);
         }
 
@@ -248,7 +307,6 @@ namespace BTCPayServer.Controllers
         [Route("{storeId}")]
         public async Task<IActionResult> UpdateStore(string storeId, StoreViewModel model)
         {
-
             if (!ModelState.IsValid)
             {
                 return View(model);
@@ -277,25 +335,15 @@ namespace BTCPayServer.Controllers
                 store.StoreWebsite = model.StoreWebsite;
             }
 
-            if (store.GetDefaultCrypto() != model.DefaultCryptoCurrency)
-            {
-                needUpdate = true;
-                store.SetDefaultCrypto(model.DefaultCryptoCurrency);
-            }
-            model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
-            model.SetLanguages(_LangService, model.DefaultLang);
-
             var blob = store.GetStoreBlob();
             blob.NetworkFeeDisabled = !model.NetworkFee;
             blob.MonitoringExpiration = model.MonitoringExpiration;
             blob.InvoiceExpiration = model.InvoiceExpiration;
-            blob.DefaultLang = model.DefaultLang;
 
             bool newExchange = blob.PreferredExchange != model.PreferredExchange;
             blob.PreferredExchange = model.PreferredExchange;
 
             blob.SetRateMultiplier(model.RateMultiplier);
-            blob.AllowCoinConversion = model.AllowCoinConversion;
 
             if (store.SetStoreBlob(blob))
             {

BTCPayServer/CurrencyValue.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+
+namespace BTCPayServer
+{
+    public class CurrencyValue
+    {
+        static Regex _Regex = new Regex("^([0-9]+(\\.[0-9]+)?)\\s*([a-zA-Z]+)$");
+        static CurrencyNameTable _CurrencyTable = new CurrencyNameTable();
+        public static bool TryParse(string str, out CurrencyValue value)
+        {
+            value = null;
+            var match = _Regex.Match(str);
+            if (!match.Success ||
+                !decimal.TryParse(match.Groups[1].Value, out var v))
+                return false;
+
+            var currency = match.Groups.Last().Value.ToUpperInvariant();
+            var currencyData = _CurrencyTable.GetCurrencyData(currency);
+            if (currencyData == null)
+                return false;
+            v = Math.Round(v, currencyData.Divisibility);
+            value = new CurrencyValue()
+            {
+                Value = v,
+                Currency = currency
+            };
+            return true;
+        }
+
+        public decimal Value { get; set; }
+        public string Currency { get; set; }
+
+        public override string ToString()
+        {
+            return Value.ToString(CultureInfo.InvariantCulture) + " " + Currency;
+        }
+    }
+}

BTCPayServer/Data/StoreData.cs

@@ -13,6 +13,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Payments;
+using BTCPayServer.JsonConverters;
 
 namespace BTCPayServer.Data
 {
@@ -254,6 +255,14 @@ namespace BTCPayServer.Data
         public List<RateRule> RateRules { get; set; } = new List<RateRule>();
         public string PreferredExchange { get; set; }
 
+        [JsonConverter(typeof(CurrencyValueJsonConverter))]
+        public CurrencyValue LightningMaxValue { get; set; }
+
+        [JsonConverter(typeof(UriJsonConverter))]
+        public Uri CustomLogo { get; set; }
+        [JsonConverter(typeof(UriJsonConverter))]
+        public Uri CustomCSS { get; set; }
+
         public IRateProvider ApplyRateRules(BTCPayNetwork network, IRateProvider rateProvider)
         {
             if (!PreferredExchange.IsCoinAverage())

BTCPayServer/JsonConverters/CurrencyValueJsonConverter.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Reflection;
+using Newtonsoft.Json;
+using NBitcoin.JsonConverters;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class CurrencyValueJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(CurrencyValue).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                return reader.TokenType == JsonToken.Null ? null :
+                       CurrencyValue.TryParse((string)reader.Value, out var result) ? result :
+                       throw new JsonObjectException("Invalid Currency value", reader);
+            }
+            catch (InvalidCastException)
+            {
+                throw new JsonObjectException("Invalid Currency value", reader);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if(value != null)
+                writer.WriteValue(value.ToString());
+        }
+    }
+}

BTCPayServer/JsonConverters/UriJsonConverter.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Reflection;
+using Newtonsoft.Json;
+using NBitcoin.JsonConverters;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class UriJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(Uri).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                return reader.TokenType == JsonToken.Null ? null :
+                       Uri.TryCreate((string)reader.Value, UriKind.Absolute, out var result) ? result :
+                       throw new JsonObjectException("Invalid Currency value", reader);
+            }
+            catch (InvalidCastException)
+            {
+                throw new JsonObjectException("Invalid Currency value", reader);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value != null)
+                writer.WriteValue(((Uri)value).AbsoluteUri);
+        }
+    }
+}

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -13,9 +13,11 @@ namespace BTCPayServer.Models.InvoicingModels
             public string CryptoImage { get; set; }
             public string Link { get; set; }
         }
-
+        public string CustomCSSLink { get; set; }
+        public string CustomLogoLink { get; set; }
         public string DefaultLang { get; set; }
         public List<AvailableCrypto> AvailableCryptos { get; set; } = new List<AvailableCrypto>();
+        public bool IsLightning { get; set; }
         public string CryptoCode { get; set; }
         public string ServerUrl { get; set; }
         public string InvoiceId { get; set; }

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace BTCPayServer.Models.StoreViewModels
+{
+    public class CheckoutExperienceViewModel
+    {
+        class Format
+        {
+            public string Name { get; set; }
+            public string Value { get; set; }
+        }
+        public SelectList CryptoCurrencies { get; set; }
+        public SelectList Languages { get; set; }
+
+        [Display(Name = "Default crypto currency on checkout")]
+        public string DefaultCryptoCurrency { get; set; }
+        [Display(Name = "Default language on checkout")]
+        public string DefaultLang { get; set; }
+        [Display(Name = "Allow conversion through third party (Shapeshift, Changelly...)")]
+        public bool AllowCoinConversion
+        {
+            get; set;
+        }
+        [Display(Name = "Do not propose lightning payment if value of the invoice is above...")]
+        [MaxLength(20)]
+        public string LightningMaxValue { get; set; }
+
+        [Display(Name = "Link to a custom CSS stylesheet")]
+        [Url]
+        public Uri CustomCSS { get; set; }
+        [Display(Name = "Link to a custom logo")]
+        [Url]
+        public Uri CustomLogo { get; set; }
+        public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto)
+        {
+            var choices = explorerProvider.GetAll().Select(o => new Format() { Name = o.Item1.CryptoCode, Value = o.Item1.CryptoCode }).ToArray();
+            var chosen = choices.FirstOrDefault(f => f.Value == defaultCrypto) ?? choices.FirstOrDefault();
+            CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
+            DefaultCryptoCurrency = chosen.Name;
+        }
+
+        public void SetLanguages(LanguageService langService, string defaultLang)
+        {
+            defaultLang = defaultLang ?? "en-US";
+            var choices = langService.GetLanguages().Select(o => new Format() { Name = o.DisplayName, Value = o.Code }).ToArray();
+            var chosen = choices.FirstOrDefault(f => f.Value == defaultLang) ?? choices.FirstOrDefault();
+            Languages = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
+            DefaultLang = chosen.Value;
+        }
+    }
+}

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -17,11 +17,7 @@ namespace BTCPayServer.Models.StoreViewModels
             public string Crypto { get; set; }
             public string Value { get; set; }
         }
-        class Format
-        {
-            public string Name { get; set; }
-            public string Value { get; set; }
-        }
+
         public StoreViewModel()
         {
 
@@ -95,24 +91,6 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
-        [Display(Name = "Allow conversion through third party (Shapeshift, Changelly...)")]
-        public bool AllowCoinConversion
-        {
-            get; set;
-        }
-
-        public string StatusMessage
-        {
-            get; set;
-        }
-        public SelectList CryptoCurrencies { get; set; }
-        public SelectList Languages { get; set; }
-
-        [Display(Name = "Default crypto currency on checkout")]
-        public string DefaultCryptoCurrency { get; set; }
-        [Display(Name = "Default language on checkout")]
-        public string DefaultLang { get; set; }
-
         public class LightningNode
         {
             public string CryptoCode { get; set; }
@@ -123,21 +101,5 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         } = new List<LightningNode>();
 
-        public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto)
-        {
-            var choices = explorerProvider.GetAll().Select(o => new Format() { Name = o.Item1.CryptoCode, Value = o.Item1.CryptoCode }).ToArray();
-            var chosen = choices.FirstOrDefault(f => f.Value == defaultCrypto) ?? choices.FirstOrDefault();
-            CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
-            DefaultCryptoCurrency = chosen.Name;
-        }
-
-        public void SetLanguages(LanguageService langService, string defaultLang)
-        {
-            defaultLang = defaultLang ?? "en-US";
-            var choices = langService.GetLanguages().Select(o => new Format() { Name = o.DisplayName, Value = o.Code }).ToArray();
-            var chosen = choices.FirstOrDefault(f => f.Value == defaultLang) ?? choices.FirstOrDefault();
-            Languages = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
-            DefaultLang = chosen.Value;
-        }
     }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -29,6 +29,8 @@ namespace BTCPayServer.Payments.Bitcoin
 
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(DerivationStrategy supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network)
         {
+            if (!_ExplorerProvider.IsAvailable(network))
+                throw new PaymentMethodUnavailableException($"Full node not available");
             var getFeeRate = _FeeRateProviderFactory.CreateFeeProvider(network).GetFeeRateAsync();
             var getAddress = _WalletProvider.GetWallet(network).ReserveAddressAsync(supportedPaymentMethod.DerivationStrategyBase);
             Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod onchainMethod = new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod();
@@ -37,10 +39,5 @@ namespace BTCPayServer.Payments.Bitcoin
             onchainMethod.DepositAddress = (await getAddress).ToString();
             return onchainMethod;
         }
-
-        public override Task<bool> IsAvailable(DerivationStrategy supportedPaymentMethod, BTCPayNetwork network)
-        {
-            return Task.FromResult(_ExplorerProvider.IsAvailable(network));
-        }
     }
 }

BTCPayServer/Payments/IPaymentMethodHandler.cs

@@ -11,14 +11,6 @@ namespace BTCPayServer.Payments
     /// </summary>
     public interface IPaymentMethodHandler
     {
-        /// <summary>
-        /// Returns true if the dependencies for a specific payment method are satisfied. 
-        /// </summary>
-        /// <param name="supportedPaymentMethod"></param>
-        /// <param name="network"></param>
-        /// <returns>true if this payment method is available</returns>
-        Task<bool> IsAvailable(ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network);
-
         /// <summary>
         /// Create needed to track payments of this invoice
         /// </summary>
@@ -31,7 +23,6 @@ namespace BTCPayServer.Payments
 
     public interface IPaymentMethodHandler<T> : IPaymentMethodHandler where T : ISupportedPaymentMethod
     {
-        Task<bool> IsAvailable(T supportedPaymentMethod, BTCPayNetwork network);
         Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network);
     }
 
@@ -47,16 +38,5 @@ namespace BTCPayServer.Payments
             }
             throw new NotSupportedException("Invalid supportedPaymentMethod");
         }
-
-        public abstract Task<bool> IsAvailable(T supportedPaymentMethod, BTCPayNetwork network);
-
-        Task<bool> IPaymentMethodHandler.IsAvailable(ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
-        {
-            if(supportedPaymentMethod is T method)
-            { 
-                return IsAvailable(method, network);
-            }
-            return Task.FromResult(false);
-        }
     }
 }

BTCPayServer/Payments/Lightning/CLightning/CLightningInvoice.cs

@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 
 namespace BTCPayServer.Payments.Lightning.CLightning
 {
-    public class CreateInvoiceResponse
+    public class CLightningInvoice
     {
         [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
         [JsonProperty("payment_hash")]

BTCPayServer/Payments/Lightning/CLightning/CLightningRPCClient.cs

@@ -7,7 +7,6 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using BTCPayServer.Payments.Lightning.Charge;
 using Mono.Unix;
 using NBitcoin;
 using NBitcoin.RPC;
@@ -42,9 +41,9 @@ namespace BTCPayServer.Payments.Lightning.CLightning
             Network = network;
         }
 
-        public Task<GetInfoResponse> GetInfoAsync(CancellationToken cancellation = default(CancellationToken))
+        public Task<Charge.GetInfoResponse> GetInfoAsync(CancellationToken cancellation = default(CancellationToken))
         {
-            return SendCommandAsync<GetInfoResponse>("getinfo", cancellation: cancellation);
+            return SendCommandAsync<Charge.GetInfoResponse>("getinfo", cancellation: cancellation);
         }
 
         public Task SendAsync(string bolt11)
@@ -168,24 +167,24 @@ namespace BTCPayServer.Payments.Lightning.CLightning
 
         async Task<LightningInvoice> ILightningInvoiceClient.GetInvoice(string invoiceId, CancellationToken cancellation)
         {
-            var invoices = await SendCommandAsync<ChargeInvoice[]>("listinvoices", new[] { invoiceId }, false, true, cancellation);
+            var invoices = await SendCommandAsync<CLightningInvoice[]>("listinvoices", new[] { invoiceId }, false, true, cancellation);
             if (invoices.Length == 0)
                 return null;
-            return ChargeClient.ToLightningInvoice(invoices[0]);
+            return ToLightningInvoice(invoices[0]);
         }
 
         static NBitcoin.DataEncoders.DataEncoder InvoiceIdEncoder = NBitcoin.DataEncoders.Encoders.Base58;
         async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, TimeSpan expiry, CancellationToken cancellation)
         {
             var id = InvoiceIdEncoder.EncodeData(RandomUtils.GetBytes(20));
-            var invoice = await SendCommandAsync<CreateInvoiceResponse>("invoice", new object[] { amount.MilliSatoshi, id, "" }, cancellation: cancellation);
+            var invoice = await SendCommandAsync<CLightningInvoice>("invoice", new object[] { amount.MilliSatoshi, id, "" }, cancellation: cancellation);
             invoice.Label = id;
             invoice.MilliSatoshi = amount;
             invoice.Status = "unpaid";
             return ToLightningInvoice(invoice);
         }
 
-        private static LightningInvoice ToLightningInvoice(CreateInvoiceResponse invoice)
+        private static LightningInvoice ToLightningInvoice(CLightningInvoice invoice)
         {
             return new LightningInvoice()
             {
@@ -204,9 +203,9 @@ namespace BTCPayServer.Payments.Lightning.CLightning
         long lastInvoiceIndex = 99999999999;
         async Task<LightningInvoice> ILightningListenInvoiceSession.WaitInvoice(CancellationToken cancellation)
         {
-            var chargeInvoice = await SendCommandAsync<CreateInvoiceResponse>("waitanyinvoice", new object[] { lastInvoiceIndex }, cancellation: cancellation);
-            lastInvoiceIndex = chargeInvoice.PayIndex.Value;
-            return ToLightningInvoice(chargeInvoice);
+            var invoice = await SendCommandAsync<CLightningInvoice>("waitanyinvoice", new object[] { lastInvoiceIndex }, cancellation: cancellation);
+            lastInvoiceIndex = invoice.PayIndex.Value;
+            return ToLightningInvoice(invoice);
         }
 
         async Task<LightningNodeInformation> ILightningInvoiceClient.GetInfo(CancellationToken cancellation)

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -25,30 +25,32 @@ namespace BTCPayServer.Payments.Lightning
         }
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network)
         {
+            var test = Test(supportedPaymentMethod, network);
             var invoice = paymentMethod.ParentEntity;
             var due = Extensions.RoundUp(invoice.ProductInformation.Price / paymentMethod.Rate, 8);
             var client = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
             var expiry = invoice.ExpirationTime - DateTimeOffset.UtcNow;
             if (expiry < TimeSpan.Zero)
                 expiry = TimeSpan.FromSeconds(1);
-            var lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), expiry);
+
+            LightningInvoice lightningInvoice = null;
+            try
+            {
+                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), expiry);
+            }
+            catch(Exception ex)
+            {
+                throw new PaymentMethodUnavailableException($"Impossible to create lightning invoice ({ex.Message})", ex);
+            }
+            var nodeInfo = await test;
             return new LightningLikePaymentMethodDetails()
             {
                 BOLT11 = lightningInvoice.BOLT11,
-                InvoiceId = lightningInvoice.Id
+                InvoiceId = lightningInvoice.Id,
+                NodeInfo = nodeInfo.ToString()
             };
         }
 
-        public async override Task<bool> IsAvailable(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
-        {
-            try
-            {
-                await Test(supportedPaymentMethod, network);
-                return true;
-            }
-            catch { return false; }
-        }
-
         /// <summary>
         /// Used for testing
         /// </summary>
@@ -57,8 +59,8 @@ namespace BTCPayServer.Payments.Lightning
         public async Task<NodeInfo> Test(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
-                throw new Exception($"Full node not available");
-            
+                throw new PaymentMethodUnavailableException($"Full node not available");
+
             var cts = new CancellationTokenSource(5000);
             var client = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
             LightningNodeInformation info = null;
@@ -68,37 +70,39 @@ namespace BTCPayServer.Payments.Lightning
             }
             catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
-                throw new Exception($"The lightning node did not replied in a timely maner");
+                throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely maner");
             }
             catch (Exception ex)
             {
-                throw new Exception($"Error while connecting to the API ({ex.Message})");
+                throw new PaymentMethodUnavailableException($"Error while connecting to the API ({ex.Message})");
             }
 
-            if(info.Address == null)
+            if (info.Address == null)
             {
-                throw new Exception($"No lightning node public address has been configured");
+                throw new PaymentMethodUnavailableException($"No lightning node public address has been configured");
             }
 
             var blocksGap = Math.Abs(info.BlockHeight - summary.Status.ChainHeight);
             if (blocksGap > 10)
             {
-                throw new Exception($"The lightning is not synched ({blocksGap} blocks)");
+                throw new PaymentMethodUnavailableException($"The lightning is not synched ({blocksGap} blocks)");
             }
 
             try
             {
-                if(!SkipP2PTest)
+                if (!SkipP2PTest)
+                {
                     await TestConnection(info.Address, info.P2PPort, cts.Token);
+                }
             }
             catch (Exception ex)
             {
-                throw new Exception($"Error while connecting to the lightning node via {info.Address}:{info.P2PPort} ({ex.Message})");
+                throw new PaymentMethodUnavailableException($"Error while connecting to the lightning node via {info.Address}:{info.P2PPort} ({ex.Message})");
             }
             return new NodeInfo(info.NodeId, info.Address, info.P2PPort);
         }
 
-        private async Task<bool> TestConnection(string addressStr, int port, CancellationToken cancellation)
+        private async Task TestConnection(string addressStr, int port, CancellationToken cancellation)
         {
             IPAddress address = null;
             try
@@ -107,25 +111,16 @@ namespace BTCPayServer.Payments.Lightning
             }
             catch
             {
-                try
-                {
-                    address = (await Dns.GetHostAddressesAsync(addressStr)).FirstOrDefault();
-                }
-                catch { }
+                address = (await Dns.GetHostAddressesAsync(addressStr)).FirstOrDefault();
             }
 
             if (address == null)
-                throw new Exception($"DNS did not resolved {addressStr}");
+                throw new PaymentMethodUnavailableException($"DNS did not resolved {addressStr}");
 
             using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
             {
-                try
-                {
-                    await WithTimeout(tcp.ConnectAsync(new IPEndPoint(address, port)), cancellation);
-                }
-                catch { return false; }
+                await WithTimeout(tcp.ConnectAsync(new IPEndPoint(address, port)), cancellation);
             }
-            return true;
         }
 
         static Task WithTimeout(Task task, CancellationToken token)

BTCPayServer/Payments/Lightning/LightningLikePaymentMethodDetails.cs

@@ -9,6 +9,7 @@ namespace BTCPayServer.Payments.Lightning
     {
         public string BOLT11 { get; set; }
         public string InvoiceId { get; set; }
+        public string NodeInfo { get; set; }
 
         public string GetPaymentDestination()
         {

BTCPayServer/Payments/PaymentMethodUnavailableException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Payments
+{
+    public class PaymentMethodUnavailableException : Exception
+    {
+        public PaymentMethodUnavailableException(string message) : base(message)
+        {
+
+        }
+        public PaymentMethodUnavailableException(string message, Exception inner) : base(message, inner)
+        {
+
+        }
+    }
+}

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -242,7 +242,7 @@ namespace BTCPayServer.Services.Invoices
 #pragma warning disable CS0618
         public List<PaymentEntity> GetPayments()
         {
-            return Payments.ToList();
+            return Payments?.ToList() ?? new List<PaymentEntity>();
         }
         public List<PaymentEntity> GetPayments(string cryptoCode)
         {
@@ -375,7 +375,8 @@ namespace BTCPayServer.Services.Invoices
                         BIP21 = $"{scheme}:{cryptoInfo.Address}?amount={cryptoInfo.Due}",
                     };
                 }
-                if (info.GetId().PaymentType == PaymentTypes.LightningLike)
+                var paymentId = info.GetId();
+                if (paymentId.PaymentType == PaymentTypes.LightningLike)
                 {
                     cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
                     {
@@ -383,7 +384,7 @@ namespace BTCPayServer.Services.Invoices
                     };
                 }
 #pragma warning disable CS0618
-                if (info.CryptoCode == "BTC")
+                if (info.CryptoCode == "BTC" && paymentId.PaymentType == PaymentTypes.BTCLike)
                 {
                     dto.Url = cryptoInfo.Url;
                     dto.BTCPrice = cryptoInfo.Price;

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -101,7 +101,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        public async Task<InvoiceEntity> CreateInvoiceAsync(string storeId, InvoiceEntity invoice, BTCPayNetworkProvider networkProvider)
+        public async Task<InvoiceEntity> CreateInvoiceAsync(string storeId, InvoiceEntity invoice, IEnumerable<string> creationLogs, BTCPayNetworkProvider networkProvider)
         {
             List<string> textSearch = new List<string>();
             invoice = Clone(invoice, null);
@@ -146,6 +146,17 @@ namespace BTCPayServer.Services.Invoices
                     textSearch.Add(paymentMethod.Calculate().TotalDue.ToString());
                 }
                 context.PendingInvoices.Add(new PendingInvoiceData() { Id = invoice.Id });
+
+                foreach(var log in creationLogs)
+                {
+                    context.InvoiceEvents.Add(new InvoiceEventData()
+                    {
+                        InvoiceDataId = invoice.Id,
+                        Message = log,
+                        Timestamp = invoice.InvoiceTime,
+                        UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10))
+                    });
+                }
                 await context.SaveChangesAsync().ConfigureAwait(false);
             }
 

BTCPayServer/Services/LanguageService.cs

@@ -23,11 +23,12 @@ namespace BTCPayServer.Services
             {
                 new Language("en-US", "English"),
                 new Language("de-DE", "Deutsch"),
-                //new Language("ja-JP", "日本語"),
+                new Language("ja-JP", "日本語"),
                 new Language("fr-FR", "Français"),
                 new Language("es-ES", "Spanish"),
                 new Language("pt-BR", "Portuguese (Brazil)"),
                 new Language("nl-NL", "Dutch"),
+                new Language("cs-CZ", "Česky"),
             };
         }
     }

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -41,6 +41,8 @@ namespace BTCPayServer.Services.Rates
 
         private decimal GetRate(Dictionary<string, decimal> rates, string currency)
         {
+            if (currency == "BTC")
+                return 1.0m;
             if (rates.TryGetValue(currency, out decimal result))
                 return result;
             throw new RateUnavailableException(currency);

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -3,7 +3,14 @@
 <div class="top-header">
     <div class="header">
         <div class="header__icon">
-            <img class="header__icon__img" src="~/img/logo-white.png" height="40">
+            @if(Model.CustomLogoLink != null)
+            {
+                <img class="header__icon__img" src="@Model.CustomLogoLink" height="40">
+            }
+            else
+            {
+                <img class="header__icon__img" src="~/img/logo-white.png" height="40">
+            }
         </div>
     </div>
     <div class="timer-row">
@@ -26,7 +33,7 @@
     </div>
 </div>
 <div class="order-details">
-    @if (Model.AvailableCryptos.Count > 1)
+    @if(Model.AvailableCryptos.Count > 1)
     {
         <div class="currency-selection">
             <div class="single-item-order__left">
@@ -36,7 +43,7 @@
             </div>
             <div class="single-item-order__right">
                 <div class="payment__currencies">
-                    @foreach (var crypto in Model.AvailableCryptos)
+                    @foreach(var crypto in Model.AvailableCryptos)
                     {
                         <a href="@crypto.Link" onclick="return changeCurrency('@crypto.PaymentMethodId');">
                             <img style="height:32px; margin-left:5px;" alt="@crypto.PaymentMethodId" src="@crypto.CryptoImage" />
@@ -101,7 +108,7 @@
         <div class="payment-tabs__tab" id="copy-tab">
             <span>{{$t("Copy")}}</span>
         </div>
-        @if (Model.AllowCoinConversion)
+        @if(Model.AllowCoinConversion)
         {
             <div class="payment-tabs__tab" id="altcoins-tab">
                 <span>{{$t("Conversion")}}</span>
@@ -142,7 +149,7 @@
     </div>
     <div class="bp-view payment scan" id="scan">
         <div class="payment__scan">
-            <img v-bind:src="srvModel.cryptoImage" style="position: absolute; height:64px; width:64px; left:118px; top:96px;" />
+            <img v-bind:src="srvModel.cryptoImage" class="qr_currency_icon" />
             <qrcode v-bind:val="srvModel.invoiceBitcoinUrlQR" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
             </qrcode>
         </div>
@@ -193,10 +200,17 @@
             </div>
         </div>
     </div>
-    @if (Model.AllowCoinConversion)
+    @if(Model.AllowCoinConversion)
     {
         <div id="altcoins" class="bp-view payment manual-flow">
-            <div v-if="srvModel.paymentMethodId != 'BTC_LightningLike'">
+            <div v-if="srvModel.isLightning">
+                <div class="manual__step-two__instructions">
+                    <span>
+                        {{$t("ConversionTab_Lightning")}}
+                    </span>
+                </div>
+            </div>
+            <div v-else>
                 <div class="manual__step-two__instructions">
                     <span>
                         {{$t("ConversionTab_BodyTop", srvModel)}}
@@ -217,13 +231,6 @@
                         </a>*@
                 </center>
             </div>
-            <div v-else>
-                <div class="manual__step-two__instructions">
-                    <span>
-                        {{$t("ConversionTab_Lightning")}}
-                    </span>
-                </div>
-            </div>
         </div>
     }
 

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -20,6 +20,12 @@
     </script>
 
     <bundle name="wwwroot/bundles/checkout-bundle.min.js" />
+
+
+    @if(Model.CustomCSSLink != null)
+    {
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
+    }
 </head>
 <body style="background: #E4E4E4">
     <noscript>
@@ -83,6 +89,9 @@
                             });
                         </script>
                     </div>
+                    <div style="margin-top: 10px; text-align: right;" class="form-text small text-muted">
+                        <span>Powered by <a target="_blank" href="https://github.com/btcpayserver/btcpayserver">BTCPay Server</a></span>
+                    </div>
                 </div>
             </div>
         </div>
@@ -99,10 +108,11 @@
                 'en-US': { translation: locales_en },
                 'de-DE': { translation: locales_de },
                 'es-ES': { translation: locales_es },
-                //'ja-JP': { translation: locales_ja },
+                'ja-JP': { translation: locales_ja },
                 'fr-FR': { translation: locales_fr },
                 'pt-BR': { translation: locales_pt_br },
-                'nl': { translation: locales_nl }
+                'nl': { translation: locales_nl },
+                'cs-CZ': { translation: locales_cs }
             },
         });
 

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -0,0 +1,54 @@
+@model CheckoutExperienceViewModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData["Title"] = "Checkout experience";
+    ViewData.AddActivePage(BTCPayServer.Views.Stores.StoreNavPages.Checkout);
+}
+
+<h4>@ViewData["Title"]</h4>
+@Html.Partial("_StatusMessage", TempData["TempDataProperty-StatusMessage"])
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-8">
+        <form method="post">
+            <div class="form-group">
+                <label asp-for="CustomLogo"></label>
+                <input asp-for="CustomLogo" class="form-control" />
+                <span asp-validation-for="CustomLogo" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="CustomCSS"></label>
+                <input asp-for="CustomCSS" class="form-control" />
+                <span asp-validation-for="CustomCSS" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="DefaultCryptoCurrency"></label>
+                <select asp-for="DefaultCryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
+            </div>
+            <div class="form-group">
+                <label asp-for="DefaultLang"></label>
+                <select asp-for="DefaultLang" asp-items="Model.Languages" class="form-control"></select>
+            </div>
+            <div class="form-group">
+                <label asp-for="AllowCoinConversion"></label>
+                <input asp-for="AllowCoinConversion" type="checkbox" class="form-check" />
+            </div>
+            <div class="form-group">
+                <label asp-for="LightningMaxValue"></label>
+                <input asp-for="LightningMaxValue" class="form-control" />
+                <span asp-validation-for="LightningMaxValue" class="text-danger"></span>
+                <p class="form-text text-muted">Example: 5.50 USD</p>
+            </div>
+            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Stores/StoreNavPages.cs

@@ -11,13 +11,14 @@ namespace BTCPayServer.Views.Stores
     {
         public static string ActivePageKey => "ActivePage";
         public static string Index => "Index";
-
+        public static string Checkout => "Checkout experience";
 
         public static string Tokens => "Tokens";
         public static string Users => "Users";
         public static string UsersNavClass(ViewContext viewContext) => PageNavClass(viewContext, Users);
         public static string TokensNavClass(ViewContext viewContext) => PageNavClass(viewContext, Tokens);
 
+        public static string CheckoutNavClass(ViewContext viewContext) => PageNavClass(viewContext, Checkout);
         public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index);
 
         public static string PageNavClass(ViewContext viewContext, string page)

BTCPayServer/Views/Stores/StoreUsers.cshtml

@@ -17,7 +17,8 @@
     <div class="col-md-8">
         <div class="form-group">
             <h5>Users</h5>
-            <span>Add access to your store to other users (Guest will not be able to see and modify the store settings)</span>
+            <span>Add access to your store to other users (Guest will not be able to see and modify the store settings)<br />
+            Note that the user must have a registered account on this BTCPay Server.</span>
         </div>
         <div class="form-inline">
             <form method="post">

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -6,7 +6,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+@Html.Partial("_StatusMessage", TempData["TempDataProperty-StatusMessage"])
 
 <div class="row">
     <div class="col-md-6">
@@ -30,14 +30,6 @@
                 <input asp-for="StoreWebsite" class="form-control" />
                 <span asp-validation-for="StoreWebsite" class="text-danger"></span>
             </div>
-            <div class="form-group">
-                <label asp-for="DefaultCryptoCurrency"></label>
-                <select asp-for="DefaultCryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
-            </div>
-            <div class="form-group">
-                <label asp-for="DefaultLang"></label>
-                <select asp-for="DefaultLang" asp-items="Model.Languages" class="form-control"></select>
-            </div>
             <div class="form-group">
                 <label asp-for="NetworkFee"></label>
                 <input asp-for="NetworkFee" type="checkbox" class="form-check" />
@@ -74,10 +66,6 @@
                 </select>
                 <span asp-validation-for="SpeedPolicy" class="text-danger"></span>
             </div>
-            <div class="form-group">
-                <label asp-for="AllowCoinConversion"></label>
-                <input asp-for="AllowCoinConversion" type="checkbox" class="form-check" />
-            </div>
             <div class="form-group">
                 <h5>Derivation Scheme</h5>
                 <span>The DerivationScheme represents the destination of the funds received by your invoice on chain.</span>
@@ -94,19 +82,19 @@
                     </thead>
                     <tbody>
                         @foreach(var scheme in Model.DerivationSchemes)
-                {
-                    <tr>
-                        <td>@scheme.Crypto</td>
-                        <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
-                        <td style="text-align:right">
-                            @if(!string.IsNullOrWhiteSpace(scheme.Value))
-                    {
-                        <a asp-action="Wallet" asp-route-cryptoCode="@scheme.Crypto">Wallet</a><span> - </span>
-            }
-                            <a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto">Modify</a>
-                        </td>
-                    </tr>
-        }
+                        {
+                            <tr>
+                                <td>@scheme.Crypto</td>
+                                <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
+                                <td style="text-align:right">
+                                    @if(!string.IsNullOrWhiteSpace(scheme.Value))
+                                    {
+                                        <a asp-action="Wallet" asp-route-cryptoCode="@scheme.Crypto">Wallet</a><span> - </span>
+                                    }
+                                    <a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto">Modify</a>
+                                </td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
             </div>
@@ -130,13 +118,13 @@
                         </thead>
                         <tbody>
                             @foreach(var scheme in Model.LightningNodes)
-                    {
-                        <tr>
-                            <td>@scheme.CryptoCode</td>
-                            <td>@scheme.Address</td>
-                            <td style="text-align:right"><a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode">Modify</a></td>
-                        </tr>
-            }
+                            {
+                                <tr>
+                                    <td>@scheme.CryptoCode</td>
+                                    <td>@scheme.Address</td>
+                                    <td style="text-align:right"><a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode">Modify</a></td>
+                                </tr>
+                            }
                         </tbody>
                     </table>
                 </div>

BTCPayServer/Views/Stores/_Nav.cshtml

@@ -2,7 +2,8 @@
 @inject SignInManager<ApplicationUser> SignInManager
 
 <ul class="nav nav-pills nav-stacked">
-    <li class="@StoreNavPages.IndexNavClass(ViewContext)"><a asp-action="UpdateStore">Information</a></li>
+    <li class="@StoreNavPages.IndexNavClass(ViewContext)"><a asp-action="UpdateStore">General settings</a></li>
+    <li class="@StoreNavPages.CheckoutNavClass(ViewContext)"><a asp-action="CheckoutExperience">Checkout experience</a></li>
     <li class="@StoreNavPages.TokensNavClass(ViewContext)"><a asp-action="ListTokens">Access Tokens</a></li>
     <li class="@StoreNavPages.UsersNavClass(ViewContext)"><a asp-action="StoreUsers">Users</a></li>
 </ul>

BTCPayServer/wwwroot/css/normalizer.css

@@ -9883,6 +9883,17 @@ strong {
         border-right: 1px solid rgba(0, 0, 0, 0.1);
     }
 
+.qr_currency_icon {
+    height: 64px;
+    width: 64px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+}
+
 /* Warning Page */
 .manual__step-two--warning {
     display: block;

BTCPayServer/wwwroot/js/checkout/core.js

@@ -62,7 +62,7 @@ function onDataCallback(jsonData) {
     }
 
     // restoring qr code view only when currency is switched
-    if (jsonData.paymentMethodId == srvModel.paymentMethodId) {
+    if (jsonData.paymentMethodId === srvModel.paymentMethodId) {
         $(".payment__currencies").show();
         $(".payment__spinner").hide();
     }
@@ -72,7 +72,7 @@ function onDataCallback(jsonData) {
 }
 
 function changeCurrency(currency) {
-    if (srvModel.paymentMethodId != currency) {
+    if (srvModel.paymentMethodId !== currency) {
         $(".payment__currencies").hide();
         $(".payment__spinner").show();
         srvModel.paymentMethodId = currency;

BTCPayServer/wwwroot/js/checkout/langs/cs.js

@@ -0,0 +1,48 @@
+const locales_cs = {
+    nested: {
+        lang: 'Jazyk'
+    },
+    "Awaiting Payment...": "Očekávám platbu...",
+    "Pay with": "Zaplatit pomocí",
+    "Contact and Refund Email": "Kontaktní email",
+    "Contact_Body": "Prosímte poskytněte vaši emailovou adresu. Kontaktujeme vás v případě, že se objeví problému s vaší platbou.",
+    "Your email": "Váš email",
+    "Continue": "Pokračovat",
+    "Please enter a valid email address": "Prosíme vložte platnou emailovou adresu",
+    "Order Amount": "Cena objednávky",
+    "Network Cost": "Síťové náklady",
+    "Already Paid": "Již zaplaceno",
+    "Due": "Zbývá",
+    // Tabs
+    "Scan": "Skenovat",
+    "Copy": "Kopírovat",
+    "Conversion": "Konverze",
+    // Scan tab
+    "Open in wallet": "Otevřít v peněžence",
+    // Copy tab
+    "CompletePay_Body": "K dokončení platby, prosíme pošlete {{btcDue}} {{cryptoCode}} na adresu níže.",
+    "Amount": "Částka",
+    "Address": "Adresa",
+    "Copied": "Zkopírováno",
+    // Conversion tab
+    "ConversionTab_BodyTop": "Můžete zaplatit {{btcDue}} {{cryptoCode}} i pomocí altcoinů které přímo nepodporuje obchodník.",
+    "ConversionTab_BodyDesc": "Tato služba je poskytována třetí stranou. Prosíme mějte na paměti, že nemáme žádnou kontrolu nad tím, jak poskytovatelé budou nakládat s vašimi prostředky. Faktura bude označena jako zaplacena, pouze když jsou prostředky obdrženy v {{cryptoCode}} Blockchainu.",
+    "Shapeshift_Button_Text": "Zaplatit pomocí Altcoinů",
+    "ConversionTab_Lightning": "Pro platby Lightning Network nejsou dostupní žádní poskytovatelé konverzí.",
+    // Invoice expired
+    "Invoice expiring soon...": "Faktura brzy vyprší...",
+    "Invoice expired": "Faktura vypršela",
+    "What happened?": "Co se stalo?",
+    "InvoiceExpired_Body_1": "Tato faktura již  vypršela. Faktura je platná pouze {{maxTimeMinutes}} minut.  \
+Můžete se vrátit do {{storeName}}, pokud chcete svojí objednávku založit znovu.",
+    "InvoiceExpired_Body_2": "Pokud jste se pokoušeli poslat platbu, nebyla zatím zaznamenána v Bitcoinové síti. Zatím jsme neobdrželi vaše prostředky.",
+    "InvoiceExpired_Body_3": "Pokud nebude transakce přijata Bitcoinovou sítí, vaše prostředky bude opět použitelné ve vaší peněžence. V závislosti na vaší peněžence toto může trvat 48-72 hodin.",
+    "Invoice ID": "ID Faktury",
+    "Order ID": "ID Objednávky",
+    "Return to StoreName": "Vrátit se na {{storeName}}",
+    // Invoice paid
+    "This invoice has been paid": "Faktura byla zaplacena",
+    // Invoice archived
+    "This invoice has been archived": "Tato faktura byla archivována",
+    "Archived_Body": "Prosíme kontaktujte prodejce pro informace o objednávce a případnou pomoc"
+};

BTCPayServer/wwwroot/js/checkout/langs/de.js

@@ -28,7 +28,7 @@ const locales_de = {
     "ConversionTab_BodyTop": "Sie können {{btcDue}} {{cryptoCode}} mit altcoins bezahlen, die nicht direkt vom Händler unterstützt werden.",
     "ConversionTab_BodyDesc": "Dieser Service wird von Drittanbietern bereitgestellt. Bitte beachten Sie, dass wir keine Kontrolle darüber haben, wie die Anbieter Ihre Gelder weiterleiten. Die Rechnung wird erst bezahlt, wenn das Geld in {{cryptoCode}} Blockchain eingegangen ist.",
     "Shapeshift_Button_Text": "Bezahlen mit Altcoins",
-    "ConversionTab_Lightning": "Für BTC Lightning Network-Zahlungen sind keine Conversion-Anbieter verfügbar.",
+    "ConversionTab_Lightning": "Für Lightning Network-Zahlungen sind keine Conversion-Anbieter verfügbar.",
     // Invoice expired
     "Invoice expiring soon...": "Die Rechnung läuft bald ab...",
     "Invoice expired": "Die Rechnung ist abgelaufen",

BTCPayServer/wwwroot/js/checkout/langs/en.js

@@ -28,7 +28,7 @@ const locales_en = {
     "ConversionTab_BodyTop": "You can pay {{btcDue}} {{cryptoCode}} using altcoins other than the ones merchant directly supports.",
     "ConversionTab_BodyDesc": "This service is provided by 3rd party. Please keep in mind that we have no control over how providers will forward your funds. Invoice will only be marked paid once funds are received on {{cryptoCode}} Blockchain.",
     "Shapeshift_Button_Text": "Pay with Altcoins",
-    "ConversionTab_Lightning": "No conversion providers available for BTC Lightning Network payments.",
+    "ConversionTab_Lightning": "No conversion providers available for Lightning Network payments.",
     // Invoice expired
     "Invoice expiring soon...": "Invoice expiring soon...",
     "Invoice expired": "Invoice expired",

BTCPayServer/wwwroot/js/checkout/langs/es.js

@@ -28,7 +28,7 @@ const locales_es = {
     "ConversionTab_BodyTop": "Puede pagar {{btcDue}} {{cryptoCode}} usando altcoins que no sean los que el comerciante soporta directamente.",
     "ConversionTab_BodyDesc": "Este servicio es proveído por terceros. Tenga en cuenta que no tenemos control sobre cómo los proveedores enviarán sus fondos. La factura solo se marcará como abonada una vez que se reciban los fondos en el bloque de cadenas de {{cryptoCode}} .",
     "Shapeshift_Button_Text": "Pagar con Altcoins",
-    "ConversionTab_Lightning": "No hay proveedores de conversión disponibles para los pagos de BTC Lightning Network.",
+    "ConversionTab_Lightning": "No hay proveedores de conversión disponibles para los pagos de Lightning Network.",
     // Invoice expired
     "Invoice expiring soon...": "La factura expira pronto...",
     "Invoice expired": "La factura expiro",

BTCPayServer/wwwroot/js/checkout/langs/ja.js

@@ -2,47 +2,47 @@
     nested: {
         lang: 'Language'
     },
-    "Awaiting Payment...": "決済をお待ちください...",
-    "Pay with": "支払い方法",
-    "Contact and Refund Email": "コンタクトと返金メール",
-    "Contact_Body": "メールアドレスを下記にお送りください。何か決済に問題があれば、頂いたアドレスにコンタクト致します。",
-    "Your email": "メール",
+    "Awaiting Payment...": "お支払いをお待ちしております…",
+    "Pay with": "お支払い方法",
+    "Contact and Refund Email": "問題発生時の連絡先",
+    "Contact_Body": "決済においては、何か問題が発生したらこちらのメールアドレスに対してご連絡差し上げることもございますので、ご記入ください",
+    "Your email": "ご自分のメールアドレス",
     "Continue": "続ける",
-    "Please enter a valid email address": "正しいメールアドレスを記入してください",
-    "Order Amount": "注文総額",
-    "Network Cost": "ネットワークコスト",
-    "Already Paid": "支払われた額",
-    "Due": "合計",
+    "Please enter a valid email address": "正常なメールアドレスをご記入ください",
+    "Order Amount": "注文金額",
+    "Network Cost": "ネットワーク手数料",
+    "Already Paid": "支払い済み金額",
+    "Due": "未払い金額",
     // Tabs
     "Scan": "スキャン",
     "Copy": "コピー",
     "Conversion": "変換",
     // Scan tab
-    "Open in wallet": "ウォレットを開く",
+    "Open in wallet": "ウォレットで開く",
     // Copy tab
-    "CompletePay_Body": "決済をするために、こちらに{{btcDue}} {{cryptoCode}}お送りください",
-    "Amount": "額",
+    "CompletePay_Body": "決済をするために、下記のアドレスに {{btcDue}} {{cryptoCode}} をお送りください",
+    "Amount": "金額",
     "Address": "アドレス",
-    "Copied": "コピー",
+    "Copied": "コピーしました",
     // Conversion tab
-    "ConversionTab_BodyTop": "You can pay {{btcDue}} {{cryptoCode}} using altcoins other than the ones merchant directly supports.",
-    "ConversionTab_BodyDesc": "This service is provided by 3rd party. Please keep in mind that we have no control over how providers will forward your funds. Invoice will only be marked paid once funds are received on {{cryptoCode}} Blockchain.",
-    "Shapeshift_Button_Text": "アルトコインで支払う",
-    "ConversionTab_Lightning": "No conversion providers available for BTC Lightning Network payments.",
+    "ConversionTab_BodyTop": "代わりに、お店が受け付けていなくても {{btcDue}} {{cryptoCode}} での支払いもできます。",
+    "ConversionTab_BodyDesc": "ただし、この変換は第三者サービスによるものですので、お店が受け付けている通貨で着金するまでの間の処理に関しては何の保証もいたしません。変換後に受付中の通貨 ({{cryptoCode}}) がお店に着金してから支払い済みとなりますのでご了承ください。",
+    "Shapeshift_Button_Text": "他の仮想通貨で支払う",
+    "ConversionTab_Lightning": "ライトニングのペイメントでは現在変換サービスが存在しないためご利用いただけません。ご了承ください。",
     // Invoice expired
-    "Invoice expiring soon...": "請求書の期限が迫っています...",
-    "Invoice expired": "請求書の期限が切れました",
-    "What happened?": "何が起こったか？",
-    "InvoiceExpired_Body_1": "This invoice has expired. An invoice is only valid for {{maxTimeMinutes}} minutes.  \
-You can return to {{storeName}} if you would like to submit your payment again.",
-    "InvoiceExpired_Body_2": "If you tried to send a payment, it has not yet been accepted by the Bitcoin network. We have not yet received your funds.",
-    "InvoiceExpired_Body_3": "If the transaction is not accepted by the Bitcoin network, the funds will be spendable again in your wallet. Depending on your wallet, this may take 48-72 hours.",
-    "Invoice ID": "請求書ID",
-    "Order ID": "オーダーID",
-    "Return to StoreName": "{{storeName}}に戻る",
+    "Invoice expiring soon...": "お支払いの期限が迫っています...",
+    "Invoice expired": "お支払いの期限が切れました",
+    "What happened?": "え！？ナニコレ！？",
+    "InvoiceExpired_Body_1": "当件のお支払いの有効期限が過ぎてしまいました。最大 {{maxTimeMinutes}} 分以内に支払うことが義務付けられています。  \
+まだお支払いのご希望の場合 {{storeName}} に一旦戻っていただき、もう一度お支払いの手続きを最初からやり直してみてください。",
+    "InvoiceExpired_Body_2": "送金手続きを完了したつもりでも、ネットワークにて取り込まれて処理されるまでは決済となりません。現時点ではまだ着金しておりません。",
+    "InvoiceExpired_Body_3": "ネットワークにて取り込まれなかった送金はいずれ送金元のウォレットに戻りますが、ウォレットソフトによっては２〜３日かかる場合もございますのでご了承ください。",
+    "Invoice ID": "お支払い ID",
+    "Order ID": "ご注文 ID",
+    "Return to StoreName": "{{storeName}} に戻る",
     // Invoice paid
-    "This invoice has been paid":　"この請求は支払いが完了しました",
+    "This invoice has been paid":　"お支払いが完了しました",
     // Invoice archived
-    "This invoice has been archived": "This invoice has been archived",
-    "Archived_Body": "お店のオーダーインフォメーション、又はアシスタントにコンタクトしてください。"
+    "This invoice has been archived": "お支払いをアーカイブしました",
+    "Archived_Body": "ご注文に関わる詳細などでお困りの場合はお店の担当窓口へお問い合わせください。"
 };

BTCPayServer/wwwroot/js/checkout/langs/pt_BR.js

@@ -28,7 +28,7 @@ const locales_pt_br = {
     "ConversionTab_BodyTop": "Você pode pagar {{btcDue}} {{cryptoCode}} utilizando outras altcoins além das que a loja aceita diretamente.",
     "ConversionTab_BodyDesc": "Esse serviço é oferecido por terceiros. Por favor, tenha em mente que não temos nenhum controle sobre como seus fundos serão utilizados. A fatura apenas será marcada como paga quando os fundos forem recebidos na Blockchain {{cryptoCode}}.",
     "Shapeshift_Button_Text": "Pague com Altcoins",
-    "ConversionTab_Lightning": "Não há provedores de conversão disponíveis para pagamentos via Lightning Network de BTC.",
+    "ConversionTab_Lightning": "Não há provedores de conversão disponíveis para pagamentos via Lightning Network.",
     // Invoice expired
     "Invoice expiring soon...": "A fatura está vencendo...",
     "Invoice expired": "Fatura vencida",

publish-docker.ps1

@@ -1,3 +1,6 @@
 $ver = [regex]::Match((Get-Content BTCPayServer\BTCPayServer.csproj), '<Version>([^<]+)<').Groups[1].Value
 git tag -a "v$ver" -m "$ver"
-git push --tags
+git push --tags
+git tag -d "stable"
+git tag -a "stable" -m "stable"
+git push --tags --force