bump

Closes #570

BTCPayServer/BTCPayServer.csproj

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

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -85,6 +85,7 @@ namespace BTCPayServer.Controllers
             var settings = app.GetSettings<PointOfSaleSettings>();
             var vm = new UpdatePointOfSaleViewModel()
             {
+                Id = appId,
                 Title = settings.Title,
                 EnableShoppingCart = settings.EnableShoppingCart,
                 ShowCustomAmount = settings.ShowCustomAmount,

BTCPayServer/Controllers/AppsPublicController.cs

@@ -50,7 +50,7 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("/apps/{appId}/pos")]
-        [XFrameOptionsAttribute(null)]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ViewPointOfSale(string appId)
         {
             var app = await _AppsHelper.GetApp(appId, AppType.PointOfSale);
@@ -91,7 +91,7 @@ namespace BTCPayServer.Controllers
         
         [HttpGet]
         [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(null)]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
         
         {
@@ -120,7 +120,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(null)]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request)
@@ -213,6 +213,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("/apps/{appId}/pos")]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ViewPointOfSale(string appId,

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -65,6 +65,7 @@ namespace BTCPayServer.Controllers
                 OrderId = invoice.OrderId,
                 BuyerInformation = invoice.BuyerInformation,
                 Fiat = _CurrencyNameTable.DisplayFormatCurrency(dto.Price, dto.Currency),
+                TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.TaxIncluded, dto.Currency),
                 NotificationEmail = invoice.NotificationEmail,
                 NotificationUrl = invoice.NotificationURL,
                 RedirectUrl = invoice.RedirectURL,
@@ -81,9 +82,9 @@ namespace BTCPayServer.Controllers
                 var paymentMethodId = data.GetId();
                 var cryptoPayment = new InvoiceDetailsModel.CryptoPayment();
                 cryptoPayment.PaymentMethod = ToString(paymentMethodId);
-                cryptoPayment.Due = $"{accounting.Due} {paymentMethodId.CryptoCode}";
-                cryptoPayment.Paid = $"{accounting.CryptoPaid} {paymentMethodId.CryptoCode}";
-                cryptoPayment.Overpaid = $"{accounting.OverpaidHelper} {paymentMethodId.CryptoCode}";
+                cryptoPayment.Due = _CurrencyNameTable.DisplayFormatCurrency(accounting.Due.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
+                cryptoPayment.Paid = _CurrencyNameTable.DisplayFormatCurrency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
+                cryptoPayment.Overpaid = _CurrencyNameTable.DisplayFormatCurrency(accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
 
                 var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
                 if (onchainMethod != null)
@@ -189,7 +190,7 @@ namespace BTCPayServer.Controllers
             id = invoiceId;
             ////
 
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId);
+            var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId));
             if (model == null)
                 return NotFound();
 
@@ -212,31 +213,29 @@ namespace BTCPayServer.Controllers
             return View(nameof(Checkout), model);
         }
 
-        private async Task<PaymentModel> GetInvoiceModel(string invoiceId, string paymentMethodIdStr)
+        private async Task<PaymentModel> GetInvoiceModel(string invoiceId, PaymentMethodId paymentMethodId)
         {
             var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
             if (invoice == null)
                 return null;
             var store = await _StoreRepository.FindStore(invoice.StoreId);
-            bool isDefaultCrypto = false;
-            if (paymentMethodIdStr == null)
+            bool isDefaultPaymentId = false;
+            if (paymentMethodId == null)
             {
-                paymentMethodIdStr = store.GetDefaultCrypto(_NetworkProvider);
-                isDefaultCrypto = true;
+                paymentMethodId = store.GetDefaultPaymentId(_NetworkProvider);
+                isDefaultPaymentId = true;
             }
-            var paymentMethodId = PaymentMethodId.Parse(paymentMethodIdStr);
             var network = _NetworkProvider.GetNetwork(paymentMethodId.CryptoCode);
-            if (network == null && isDefaultCrypto)
+            if (network == null && isDefaultPaymentId)
             {
                 network = _NetworkProvider.GetAll().FirstOrDefault();
                 paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.BTCLike);
-                paymentMethodIdStr = paymentMethodId.ToString();
             }
             if (invoice == null || network == null)
                 return null;
             if (!invoice.Support(paymentMethodId))
             {
-                if (!isDefaultCrypto)
+                if (!isDefaultPaymentId)
                     return null;
                 var paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider)
                                                .Where(c => paymentMethodId.CryptoCode == c.GetId().CryptoCode)
@@ -245,7 +244,6 @@ namespace BTCPayServer.Controllers
                     paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider).First();
                 network = paymentMethodTemp.Network;
                 paymentMethodId = paymentMethodTemp.GetId();
-                paymentMethodIdStr = paymentMethodId.ToString();
             }
 
             var paymentMethod = invoice.GetPaymentMethod(paymentMethodId, _NetworkProvider);
@@ -374,7 +372,7 @@ namespace BTCPayServer.Controllers
         [Route("invoice/status")]
         public async Task<IActionResult> GetStatus(string invoiceId, string paymentMethodId = null)
         {
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId);
+            var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId));
             if (model == null)
                 return NotFound();
             return Json(model);
@@ -460,6 +458,7 @@ namespace BTCPayServer.Controllers
             invoiceQuery.Count = count;
             invoiceQuery.Skip = skip;
             var list = await _InvoiceRepository.GetInvoices(invoiceQuery);
+            
             foreach (var invoice in list)
             {
                 var state = invoice.GetInvoiceState();
@@ -471,7 +470,7 @@ namespace BTCPayServer.Controllers
                     InvoiceId = invoice.Id,
                     OrderId = invoice.OrderId ?? string.Empty,
                     RedirectUrl = invoice.RedirectURL ?? string.Empty,
-                    AmountCurrency = $"{invoice.ProductInformation.Price.ToString(CultureInfo.InvariantCulture)} {invoice.ProductInformation.Currency}",
+                    AmountCurrency = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.Price, invoice.ProductInformation.Currency),
                     CanMarkInvalid = state.CanMarkInvalid(),
                     CanMarkComplete = state.CanMarkComplete()
                 });

BTCPayServer/Controllers/RateController.cs

@@ -141,9 +141,9 @@ namespace BTCPayServer.Controllers
             {
                 var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
                 var currencyCodes = supportedMethods.Select(method => method.PaymentId.CryptoCode).Distinct();
-                var defaultCrypto = store.GetDefaultCrypto(_NetworkProvider);
+                var defaultPaymentId = store.GetDefaultPaymentId(_NetworkProvider);
 
-                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultCrypto);
+                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultPaymentId.CryptoCode);
 
                 if (string.IsNullOrEmpty(currencyPairs))
                 {

BTCPayServer/Controllers/StoresController.cs

@@ -331,7 +331,7 @@ namespace BTCPayServer.Controllers
         {
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new CheckoutExperienceViewModel();
-            vm.SetCryptoCurrencies(_ExplorerProvider, StoreData.GetDefaultCrypto(_NetworkProvider));
+            SetCryptoCurrencies(vm, StoreData);
             vm.SetLanguages(_LangService, storeBlob.DefaultLang);
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
@@ -341,6 +341,23 @@ namespace BTCPayServer.Controllers
             vm.HtmlTitle = storeBlob.HtmlTitle;
             return View(vm);
         }
+        void SetCryptoCurrencies(CheckoutExperienceViewModel vm, Data.StoreData storeData)
+        {
+            var choices = storeData.GetEnabledPaymentIds(_NetworkProvider)
+                                      .Select(o => new CheckoutExperienceViewModel.Format() { Name = GetDisplayName(o), Value = o.ToString(), PaymentId = o }).ToArray();
+
+            var defaultPaymentId = storeData.GetDefaultPaymentId(_NetworkProvider);
+            var chosen = choices.FirstOrDefault(c => c.PaymentId == defaultPaymentId);
+            vm.CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen?.Value);
+            vm.DefaultPaymentMethod = chosen?.Value;
+        }
+
+        private string GetDisplayName(PaymentMethodId paymentMethodId)
+        {
+            var display = _NetworkProvider.GetNetwork(paymentMethodId.CryptoCode)?.DisplayName ?? paymentMethodId.CryptoCode;
+            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                display : $"{display} (Lightning)";
+        }
 
         [HttpPost]
         [Route("{storeId}/checkout")]
@@ -365,12 +382,13 @@ namespace BTCPayServer.Controllers
             }
             bool needUpdate = false;
             var blob = StoreData.GetStoreBlob();
-            if (StoreData.GetDefaultCrypto(_NetworkProvider) != model.DefaultCryptoCurrency)
+            var defaultPaymentMethodId = model.DefaultPaymentMethod == null ? null : PaymentMethodId.Parse(model.DefaultPaymentMethod);
+            if (StoreData.GetDefaultPaymentId(_NetworkProvider) != defaultPaymentMethodId)
             {
                 needUpdate = true;
-                StoreData.SetDefaultCrypto(model.DefaultCryptoCurrency);
+                StoreData.SetDefaultPaymentId(defaultPaymentMethodId);
             }
-            model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
+            SetCryptoCurrencies(model, StoreData);
             model.SetLanguages(_LangService, model.DefaultLang);
 
             if (!ModelState.IsValid)

BTCPayServer/Data/StoreData.cs

@@ -56,7 +56,6 @@ namespace BTCPayServer.Data
             get;
             set;
         }
-
         public IEnumerable<ISupportedPaymentMethod> GetSupportedPaymentMethods(BTCPayNetworkProvider networks)
         {
 #pragma warning disable CS0618
@@ -195,7 +194,7 @@ namespace BTCPayServer.Data
             get;
             set;
         }
-        [Obsolete("Use GetDefaultCrypto instead")]
+        [Obsolete("Use GetDefaultPaymentId instead")]
         public string DefaultCrypto { get; set; }
         public List<PairedSINData> PairedSINs { get; set; }
         public IEnumerable<APIKeyData> APIKeys { get; set; }
@@ -204,13 +203,32 @@ namespace BTCPayServer.Data
         public List<Claim> AdditionalClaims { get; set; } = new List<Claim>();
 
 #pragma warning disable CS0618
-        public string GetDefaultCrypto(BTCPayNetworkProvider networkProvider = null)
+        public PaymentMethodId GetDefaultPaymentId(BTCPayNetworkProvider networks)
         {
-            return DefaultCrypto ?? (networkProvider == null ? "BTC" : GetSupportedPaymentMethods(networkProvider).Select(p => p.PaymentId.CryptoCode).FirstOrDefault() ?? "BTC");
+            PaymentMethodId[] paymentMethodIds = GetEnabledPaymentIds(networks);
+
+            var defaultPaymentId = string.IsNullOrEmpty(DefaultCrypto) ? null : PaymentMethodId.Parse(DefaultCrypto);
+            var chosen = paymentMethodIds.FirstOrDefault(f => f == defaultPaymentId) ??
+                         paymentMethodIds.FirstOrDefault(f => f.CryptoCode == defaultPaymentId?.CryptoCode) ??
+                         paymentMethodIds.FirstOrDefault();
+            return chosen;
         }
-        public void SetDefaultCrypto(string defaultCryptoCurrency)
+
+        public PaymentMethodId[] GetEnabledPaymentIds(BTCPayNetworkProvider networks)
         {
-            DefaultCrypto = defaultCryptoCurrency;
+            var excludeFilter = GetStoreBlob().GetExcludedPaymentMethods();
+            var paymentMethodIds = GetSupportedPaymentMethods(networks).Select(p => p.PaymentId)
+                                .Where(a => !excludeFilter.Match(a))
+                                .OrderByDescending(a => a.CryptoCode == "BTC")
+                                .ThenBy(a => a.CryptoCode)
+                                .ThenBy(a => a.PaymentType == PaymentTypes.LightningLike ? 1 : 0)
+                                .ToArray();
+            return paymentMethodIds;
+        }
+
+        public void SetDefaultPaymentId(PaymentMethodId defaultPaymentId)
+        {
+            DefaultCrypto = defaultPaymentId.ToString();
         }
 #pragma warning restore CS0618
 

BTCPayServer/Filters/XFrameOptionsAttribute.cs

@@ -12,13 +12,32 @@ namespace BTCPayServer.Filters
         {
             Value = value;
         }
-        public string Value
+
+        public XFrameOptionsAttribute(XFrameOptions type, string allowFrom = null)
         {
-            get; set;
+            switch (type)
+            {
+                case XFrameOptions.Deny:
+                    Value = "deny";
+                    break;
+                case XFrameOptions.SameOrigin:
+                    Value = "deny";
+                    break;
+                case XFrameOptions.AllowFrom:
+                    Value = $"allow-from {allowFrom}";
+                    break;
+                case XFrameOptions.AllowAll:
+                    Value = "allow-all";
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type), type, null);
+            }
         }
+
+        public string Value { get; set; }
+
         public void OnActionExecuted(ActionExecutedContext context)
         {
-
         }
 
         public void OnActionExecuting(ActionExecutingContext context)
@@ -28,5 +47,13 @@ namespace BTCPayServer.Filters
                 context.HttpContext.Response.SetHeaderOnStarting("X-Frame-Options", Value);
             }
         }
+
+        public enum XFrameOptions
+        {
+            Deny,
+            SameOrigin,
+            AllowFrom,
+            AllowAll
+        }
     }
 }

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -41,5 +41,7 @@ namespace BTCPayServer.Models.AppViewModels
         [MaxLength(500)]
         [Display(Name = "Custom bootstrap CSS file")]
         public string CustomCSSLink { get; set; }
+
+        public string Id { get; set; }
     }
 }

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -105,6 +105,7 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             set;
         }
+        public string TaxIncluded { get; set; }
         public BuyerInformation BuyerInformation
         {
             get;

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Payments;
 using BTCPayServer.Services;
 using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -11,16 +12,17 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class CheckoutExperienceViewModel
     {
-        class Format
+        public class Format
         {
             public string Name { get; set; }
             public string Value { get; set; }
+            public PaymentMethodId PaymentId { 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 the default payment method on checkout")]
+        public string DefaultPaymentMethod { get; set; }
         [Display(Name = "Default language on checkout")]
         public string DefaultLang { get; set; }
         [Display(Name = "Do not propose lightning payment if value of the invoice is above...")]
@@ -47,15 +49,6 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Custom HTML title to display on Checkout page")]
         public string HtmlTitle { 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 = langService.GetLanguages().Any(language => language.Code == defaultLang)? defaultLang : "en";

BTCPayServer/Services/Rates/CurrencyNameTable.cs

@@ -121,15 +121,18 @@ namespace BTCPayServer.Services.Rates
             var provider = GetNumberFormatInfo(currency, true);
             var currencyData = GetCurrencyData(currency, true);
             var divisibility = currencyData.Divisibility;
-            while (true)
+            if (value != 0m)
             {
-                var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
-                if ((Math.Abs(rounded - value) / value) < 0.001m)
+                while (true)
                 {
-                    value = rounded;
-                    break;
+                    var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
+                    if ((Math.Abs(rounded - value) / value) < 0.001m)
+                    {
+                        value = rounded;
+                        break;
+                    }
+                    divisibility++;
                 }
-                divisibility++;
             }
             if (divisibility != provider.CurrencyDecimalDigits)
             {

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -97,34 +97,83 @@
                         <span asp-validation-for="Template" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <h5>Host button externally</h5>
-                        <p>You can host point of sale buttons in an external website with the following code.</p>
-                        @if (Model.Example1 != null)
-                        {
-                            <span>For anything with a custom amount</span>
-                            <pre><code class="html">@Model.Example1</code></pre>
-                        }
-                        @if (Model.Example2 != null)
-                        {
-                            <span>For a specific item of your template</span>
-                            <pre><code class="html">@Model.Example2</code></pre>
-                        }
-                        <p>A <code>POST</code> callback will be sent to notification with the following form will be sent to <code>notificationUrl</code> once the enough is paid and once again once there is enough confirmations to the payment:</p>
-                        <pre><code class="json">@Model.ExampleCallback</code></pre>
-                        <p><strong>Never</strong> trust anything but <code>id</code>, <strong>ignore</strong> the other fields completely, an attacker can spoof those, they are present only for backward compatibility reason:</p>
-                        <p>
-                            <ul>
-                                <li>Send a <code>GET</code> request to <code>https://btcpay.example.com/invoices/{invoiceId}</code> with <code>Content-Type: application/json</code></li>
-                                <li>Verify that the <code>orderId</code> is from your backend, that the <code>price</code> is correct and that <code>status</code> is either <code>confirmed</code> or <code>complete</code></li>
-                                <li>You can then ship your order</li>
-                            </ul>
-                        </p>
+                        <input type="submit" class="btn btn-primary" value="Save Settings" />
                     </div>
                     <div class="form-group">
-                        <input type="submit" class="btn btn-primary" value="Save Settings" />
+                        <div class="accordion" id="accordian-dev-info">
+                            <div class="card">
+                                <div class="card-header" id="accordian-dev-info-embed-payment-button-header">
+                                    <h2 class="mb-0">
+                                        <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#accordian-dev-info-embed-payment-button" aria-expanded="true" aria-controls="accordian-dev-info-embed-payment-button">
+                                            Embed Payment Button linking to POS item
+                                        </button>
+                                    </h2>
+                                </div>
+
+                                <div id="accordian-dev-info-embed-payment-button" class="collapse" aria-labelledby="accordian-dev-info-embed-payment-button-header" data-parent="#accordian-dev-info">
+                                    <div class="card-body">
+                                        <p>You can host point of sale buttons in an external website with the following code.</p>
+                                        @if (Model.Example1 != null)
+                                        {
+                                            <span>For anything with a custom amount</span>
+                                            <pre><code class="html">@Model.Example1</code></pre>
+                                        }
+                                        @if (Model.Example2 != null)
+                                        {
+                                            <span>For a specific item of your template</span>
+                                            <pre><code class="html">@Model.Example2</code></pre>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="card">
+                                <div class="card-header" id="accordian-dev-info-embed-pos-iframe-header">
+                                    <h2 class="mb-0">
+                                        <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#accordian-dev-info-embed-pos-iframe" aria-expanded="false" aria-controls="accordian-dev-info-embed-pos-iframe">
+                                            Embed POS with Iframe
+                                          
+                                        </button>
+                                    </h2>
+                                </div>
+                                <div id="accordian-dev-info-embed-pos-iframe" class="collapse" aria-labelledby="accordian-dev-info-embed-pos-iframe-header" data-parent="#accordian-dev-info">
+                                    <div class="card-body">
+                                        You can embed the POS using an iframe
+                                        @{
+                                            var iframe = $"<iframe src='{(Url.Action("ViewPointOfSale", "AppsPublic", new {appId = Model.Id}, Context.Request.Scheme))}' style='max-width: 100%; border: 0;'></iframe>";
+                                        }
+                                        <pre><code class="html">@iframe</code></pre>
+                                        </div>
+                                </div>
+                            </div>
+                            <div class="card">
+                                <div class="card-header" id="accordian-dev-info-notification-header">
+                                    <h2 class="mb-0">
+                                        <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#accordian-dev-info-notification" aria-expanded="false" aria-controls="accordian-dev-info-notification">
+                                           Notification Url Callbacks
+                                        </button>
+                                    </h2>
+                                </div>
+                                <div id="accordian-dev-info-notification" class="collapse" aria-labelledby="accordian-dev-info-notification-header" data-parent="#accordian-dev-info">
+                                    <div class="card-body">
+                                        <p>A <code>POST</code> callback will be sent to notification with the following form will be sent to <code>notificationUrl</code> once the enough is paid and once again once there is enough confirmations to the payment:</p>
+                                        <pre><code class="json">@Model.ExampleCallback</code></pre>
+                                        <p><strong>Never</strong> trust anything but <code>id</code>, <strong>ignore</strong> the other fields completely, an attacker can spoof those, they are present only for backward compatibility reason:</p>
+                                        <p>
+                                            <ul>
+                                                <li>Send a <code>GET</code> request to <code>https://btcpay.example.com/invoices/{invoiceId}</code> with <code>Content-Type: application/json</code></li>
+                                                <li>Verify that the <code>orderId</code> is from your backend, that the <code>price</code> is correct and that <code>status</code> is either <code>confirmed</code> or <code>complete</code></li>
+                                                <li>You can then ship your order</li>
+                                            </ul>
+                                        </p> </div>
+                                </div>
+                            </div>
+                        </div>
+
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>
+                
+                
             </div>
         </div>
     </div>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -155,11 +155,11 @@
                     </tr>
                     <tr>
                         <th>Price</th>
-                        <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
+                        <td>@Model.Fiat</td>
                     </tr>
                     <tr>
                         <th>Tax included</th>
-                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                        <td>@Model.TaxIncluded</td>
                     </tr>
                 </table>
             }
@@ -182,11 +182,11 @@
                     </tr>
                     <tr>
                         <th>Price</th>
-                        <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
+                        <td>@Model.Fiat</td>
                     </tr>
                     <tr>
                         <th>Tax included</th>
-                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                        <td>@Model.TaxIncluded</td>
                     </tr>
                 </table>
             </div>

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -42,8 +42,8 @@
                             <button class="btn btn-primary dropdown-toggle" type="button" id="ledgerAccountsDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 Select ledger wallet account
                             </button>
-                            <div class="dropdown-menu" aria-labelledby="ledgerAccountsDropdownMenuButton">
-                                @for (var i = 0; i < 5; i++)
+                            <div class="dropdown-menu overflow-auto" style="max-height: 200px;" aria-labelledby="ledgerAccountsDropdownMenuButton">
+                                @for (var i = 0; i < 20; i++)
                                 {
                                     <a class="dropdown-item ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a>
                                 }
@@ -63,27 +63,27 @@
                         <tbody>
                             <tr>
                                 <td>P2WPKH</td>
-                                <td>xpub</td>
+                                <td>xpub...</td>
                             </tr>
                             <tr>
                                 <td>P2SH-P2WPKH</td>
-                                <td>xpub-[p2sh]</td>
+                                <td>xpub...-[p2sh]</td>
                             </tr>
                             <tr>
                                 <td>P2PKH</td>
-                                <td>xpub-[legacy]</td>
+                                <td>xpub...-[legacy]</td>
                             </tr>
                             <tr>
                                 <td>Multi-sig P2WSH</td>
-                                <td>2-of-xpub1-xpub2</td>
+                                <td>2-of-xpub1...-xpub2...</td>
                             </tr>
                             <tr>
                                 <td>Multi-sig P2SH-P2WSH</td>
-                                <td>2-of-xpub1-xpub2-[p2sh]</td>
+                                <td>2-of-xpub1...-xpub2...-[p2sh]</td>
                             </tr>
                             <tr>
                                 <td>Multi-sig P2SH</td>
-                                <td>2-of-xpub1-xpub2-[legacy]</td>
+                                <td>2-of-xpub1...-xpub2...-[legacy]</td>
                             </tr>
                         </tbody>
                     </table>

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -31,8 +31,8 @@
                 <span asp-validation-for="HtmlTitle" 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>
+                <label asp-for="DefaultPaymentMethod"></label>
+                <select asp-for="DefaultPaymentMethod" asp-items="Model.CryptoCurrencies" class="form-control"></select>
             </div>
             <div class="form-group">
                 <label asp-for="DefaultLang"></label>

BTCPayServer/wwwroot/locales/cs-CZ.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transakce",
   "txCount_plural": "{{count}} transakcí",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/de-DE.json

@@ -5,7 +5,7 @@
   "lang": "Sprache",
   "Awaiting Payment...": "Warten auf Zahlung...",
   "Pay with": "Bezahlen mit",
-  "Contact and Refund Email": "Kontakt und Rückerstattungs Email",
+  "Contact and Refund Email": "Kontakt und Rückerstattungs E-Mail",
   "Contact_Body": "Bitte geben Sie unten eine E-Mail-Adresse an. Wir werden Sie unter dieser Adresse kontaktieren, falls ein Problem mit Ihrer Zahlung vorliegt.",
   "Your email": "Ihre Email-Adresse",
   "Continue": "Fortsetzen",
@@ -24,16 +24,16 @@
   "Copied": "Kopiert",
   "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 als bezahlt markiert, wenn das Geld in {{cryptoCode}} Blockchain eingegangen ist.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_CalculateAmount_Error": "Wiederholen",
+  "ConversionTab_LoadCurrencies_Error": "Wiederholen",
   "ConversionTab_Lightning": "Für Lightning Network-Zahlungen sind keine Umrechnungsanbieter verfügbar.",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "Bitte eine Ausgangswährung zum Geldwechsel auswählen",
   "Invoice expiring soon...": "Die Rechnung läuft bald ab...",
   "Invoice expired": "Die Rechnung ist abgelaufen",
   "What happened?": "Was ist passiert?",
   "InvoiceExpired_Body_1": "Diese Rechnung ist abgelaufen. Eine Rechnung ist nur für {{maxTimeMinutes}} Minuten gültig. \nSie können zu {{storeName}} zurückkehren, wenn Sie Ihre Zahlung erneut senden möchten.",
   "InvoiceExpired_Body_2": "Wenn Sie versucht haben, eine Zahlung zu senden, wurde sie vom Netzwerk noch nicht akzeptiert. Wir haben Ihre Gelder noch nicht erhalten.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_3": "Sollten Ihre Gelder zu einem späteren Zeitpunkt ankommen, werden wir entweder Ihren Auftrag bearbeiten oder Sie bezüglich der Rückerstattung kontaktieren...",
   "Invoice ID": "Rechnungs ID",
   "Order ID": "Auftrag ID",
   "Return to StoreName": "Zurück zu {{storeName}}",
@@ -42,8 +42,9 @@
   "Archived_Body": "Bitte kontaktieren Sie den Shop für Bestellinformationen oder Hilfe",
   "BOLT 11 Invoice": "BOLT 11 Rechnung",
   "Node Info": "Netzwerkknoten Info",
-  "txCount": "{{count}} transaktion",
-  "txCount_plural": "{{count}} transaktionen",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "txCount": "{{count}} Transaktion",
+  "txCount_plural": "{{count}} Transaktionen",
+  "Pay with CoinSwitch": "Zahlen mit CoinSwitch",
+  "Pay with Changelly": "Zahlen mit Changelly",
+  "Close": "Schließen"
 }

BTCPayServer/wwwroot/locales/en.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transaction",
   "txCount_plural": "{{count}} transactions",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/es-ES.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transacción",
   "txCount_plural": "{{count}} transacciones",
   "Pay with CoinSwitch": "Pagar con CoinSwitch",
-  "Pay with Changelly": "Pagar con Changelly"
+  "Pay with Changelly": "Pagar con Changelly",
+  "Close": "Cerrar"
 }

BTCPayServer/wwwroot/locales/fr-FR.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transaction",
   "txCount_plural": "{{count}} transactions",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/hi.json

@@ -45,5 +45,6 @@
   "txCount": "लेनदेन",
   "txCount_plural": "लेनदेनों",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/hr-HR.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transaction",
   "txCount_plural": "{{count}} transactions",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/hu-HU.json

@@ -0,0 +1,50 @@
+{
+  "NOTICE_WARN": "THIS CODE HAS BEEN AUTOMATICALLY GENERATED FROM TRANSIFEX, IF YOU WISH TO HELP TRANSLATION COME ON THE SLACK http://slack.btcpayserver.org TO REQUEST PERMISSION TO https://www.transifex.com/btcpayserver/btcpayserver/",
+  "code": "hu-HU",
+  "currentLanguage": "Magyar",
+  "lang": "Nyelv",
+  "Awaiting Payment...": "A fizetés még folyamatban...",
+  "Pay with": "Fizetési mód kiválasztása",
+  "Contact and Refund Email": "e-mail cím kapcsolattartáshoz és visszautaláshoz",
+  "Contact_Body": "Kérjük adja meg az e-mail címét. Abban az esetben ha felmerülne valami a fizetése kapcsán, ezen az e-mail címen fogjuk értesíteni.",
+  "Your email": "e-mail címe",
+  "Continue": "Tovább",
+  "Please enter a valid email address": "Kérjük adjon meg egy érvényes e-mail címet",
+  "Order Amount": "Rendelés összege",
+  "Network Cost": "Hálozat költsége",
+  "Already Paid": "Már befizetve",
+  "Due": "Fennálló összeg",
+  "Scan": "Szkennelés",
+  "Copy": "Másolás",
+  "Conversion": "Átváltás",
+  "Open in wallet": "Nyisd ki a pénztárcában",
+  "CompletePay_Body": "A fizetés végrehajtásához, kérjük küldjön {{btcDue}} {{cryptoCode}} az alábbi címre.",
+  "Amount": "Összeg",
+  "Address": "Cím",
+  "Copied": "Másolva",
+  "ConversionTab_BodyTop": "Fizethet {{btcDue}} {{cryptoCode}} olyan altcoin-okkal melyeket a kereskedő nem támogat közvetlenlül.",
+  "ConversionTab_BodyDesc": "Ezt a szolgáltatást harmadik fél nyújtja. Kérjük figyelembe venni, hogy nem áll módunkban befolyásolni a szolgáltatók hogyan fogják továbbítani a pénzét. A számla csak akkor lesz fizetettként jelölve, miután a tranzakciója megérkezett a {{cryptoCode}} Blockchain-re. ",
+  "ConversionTab_CalculateAmount_Error": "Próbáld újra",
+  "ConversionTab_LoadCurrencies_Error": "Próbáld újra",
+  "ConversionTab_Lightning": "A Lightning Network tranzakciók támogatására átváltási szolgáltató nem található",
+  "ConversionTab_CurrencyList_Select_Option": "Valuta kiválasztása a konvertáláshoz",
+  "Invoice expiring soon...": "A számla rövidesen le fog járni...",
+  "Invoice expired": "A számla lejárt",
+  "What happened?": "Mi történt?",
+  "InvoiceExpired_Body_1": "Ez a számla lejárt. A számla csak {{maxTimeMinutes}} percig érvényes. \nHa a fizetést újra szeretné indítani, visszaléphet a(z) {{storeName}} boltba ",
+  "InvoiceExpired_Body_2": "Abban az esetben ha fizetni próbált, a hálozát nem fogadta el a tanzakciót. Befizetése még nem érkezett meg.",
+  "InvoiceExpired_Body_3": "Ha a tranzakciója később érkezne meg hozzánk, megbízását feldolgozzuk, vagy a visszautalás megbeszélése érdekében, kapcsolatba lépünk Önnel... ",
+  "Invoice ID": "Számla azonosító",
+  "Order ID": "Megbízás azonosítója",
+  "Return to StoreName": "Vissza a(z) {{storeName}} boltba",
+  "This invoice has been paid": "A számla kifizetve",
+  "This invoice has been archived": "A számla archiválva",
+  "Archived_Body": "Rendelési információkhoz vagy ha támogatásra szorul, kérjük lépjen kapcsolatba az eladóval",
+  "BOLT 11 Invoice": "BOLT 11 számla",
+  "Node Info": "Node információ",
+  "txCount": "{{count}} tranzakció",
+  "txCount_plural": "{{count}} tranzakció",
+  "Pay with CoinSwitch": "Fizess CoinSwitch-csel",
+  "Pay with Changelly": "Fizess Changelly-vel",
+  "Close": "Bezár"
+}

BTCPayServer/wwwroot/locales/is-IS.json

@@ -24,10 +24,10 @@
   "Copied": "Afritað",
   "ConversionTab_BodyTop": "Þú getur borgað {{btcDue}} {{cryptoCode}} með altcoins.",
   "ConversionTab_BodyDesc": "Þessi þjónusta er veitt af þriðja aðila. Mundu að við höfum ekki stjórn á því hvað þeir gera við peningana. Reikningurinn verður aðeins móttekinn þegar {{cryptoCode}} greiðslan hefur verið staðfest á netinu.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_CalculateAmount_Error": "reyndu aftur",
+  "ConversionTab_LoadCurrencies_Error": "reyndu aftur",
   "ConversionTab_Lightning": "Engir viðskiptaveitendur eru í boði fyrir Lightning Network greiðslur.",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "veldu gjaldmiðil til að breyta frá",
   "Invoice expiring soon...": "Reikningurinn rennur út fljótlega...",
   "Invoice expired": "Reikningurinn er útrunnin",
   "What happened?": "Hvað gerðist?",
@@ -44,6 +44,7 @@
   "Node Info": "Nótu upplýsingar",
   "txCount": "{{count}} reikningur",
   "txCount_plural": "{{count}} reikningar",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Borga með Coinswitch",
+  "Pay with Changelly": "Borgar með Changelly",
+  "Close": "Loka"
 }

BTCPayServer/wwwroot/locales/it-IT.json

@@ -23,27 +23,28 @@
   "Address": "Indirizzo",
   "Copied": "Copiato",
   "ConversionTab_BodyTop": "Puoi pagare {{btcDue}} {{cryptoCode}} usando altcoin diverse da quelle che il commerciante supporta direttamente.",
-  "ConversionTab_BodyDesc": "Questo servizio è fornito da terze parti. Si prega di tenere presente che non abbiamo alcun controllo su come i fornitori inoltreranno i fondi. La fattura verrà contrassegnata solo dopo aver ricevuto i fondi su {{cryptoCode}} Blockchain.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_BodyDesc": "Questo servizio è fornito da terze parti. Ricorda che non abbiamo alcun controllo su come tali parti inoltreranno i fondi. La fattura verrà contrassegnata come pagata solo dopo aver ricevuto i fondi su {{cryptoCode}} Blockchain.",
+  "ConversionTab_CalculateAmount_Error": "Riprova",
+  "ConversionTab_LoadCurrencies_Error": "Riprova",
   "ConversionTab_Lightning": "Nessun fornitore di conversione disponibile per i pagamenti Lightning Network.",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "Seleziona una valuta da convertire",
   "Invoice expiring soon...": "Fattura in scadenza a breve...",
   "Invoice expired": "Fattura scaduta",
   "What happened?": "Cosa è successo?",
-  "InvoiceExpired_Body_1": "Questa fattura è scaduta. Una fattura è valida solo per {{maxTime minuti}} minuti. \nPuoi tornare a {{store name}} se desideri inviare nuovamente il pagamento.",
-  "InvoiceExpired_Body_2": "Se hai provato a inviare un pagamento, non è ancora stato accettato dalla rete. Non abbiamo ancora ricevuto i tuoi fondi.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_1": "Questa fattura è scaduta. Una fattura è valida solo per {{maxTimeMinutes}} minuti. \nPuoi tornare a {{storeName}} se desideri inviare nuovamente il pagamento.",
+  "InvoiceExpired_Body_2": "Se hai provato ad inviare un pagamento, non è ancora stato accettato dalla rete. Non abbiamo ancora ricevuto i tuoi fondi.",
+  "InvoiceExpired_Body_3": "Se lo riceviamo in un secondo momento, processeremo comunque il tuo ordine o ti contatteremo per rimborsarti...",
   "Invoice ID": "Numero della Fattura",
   "Order ID": "Numero dell'Ordine",
   "Return to StoreName": "Ritorna a {{storeName}}",
   "This invoice has been paid": "La fattura è stata pagata",
-  "This invoice has been archived": "TQuesta fattura è stata pagata",
+  "This invoice has been archived": "Questa fattura è stata archiviata",
   "Archived_Body": "Contatta il negozio per informazioni sull'ordine o per assistenza",
   "BOLT 11 Invoice": "Fattura BOLT 11",
   "Node Info": "Informazioni sul Nodo",
   "txCount": "{{count}} transazione",
   "txCount_plural": "{{count}} transazioni",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Paga con CoinSwitch",
+  "Pay with Changelly": "Paga con Changelly",
+  "Close": "Chiudi"
 }

BTCPayServer/wwwroot/locales/ja-JP.json

@@ -45,5 +45,6 @@
   "txCount": "取引 {{count}} 個",
   "txCount_plural": "取引 {{count}} 個",
   "Pay with CoinSwitch": "CoinSwitchでのお支払い",
-  "Pay with Changelly": "Changellyでのお支払い"
+  "Pay with Changelly": "Changellyでのお支払い",
+  "Close": "閉じる"
 }

BTCPayServer/wwwroot/locales/kk-KZ.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} Транзакция",
   "txCount_plural": "{{count}} Транзакциялар",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/nl-NL.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transactie",
   "txCount_plural": "{{count}} transacties",
   "Pay with CoinSwitch": "Betalen met CoinSwitch",
-  "Pay with Changelly": "Betalen met Changelly"
+  "Pay with Changelly": "Betalen met Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/np-NP.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} लेनदेन",
   "txCount_plural": "{{count}} लेनदेन",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/pl.json

@@ -33,7 +33,7 @@
   "What happened?": "Co się stało?",
   "InvoiceExpired_Body_1": "Płatność wygasła. Płatność jest prawidłowa przez {{maxTimeMinutes}} minut. Jeśli chcesz wysłaść płatność ponownie wróć do {{storeName}}.",
   "InvoiceExpired_Body_2": "Jeżeli próbowałeś wysłać płatność to nie została ona zaakcepowana przez sieć. Nie otrzymaliśmy jeszcze twoich funduszy.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_3": "Jeśli otrzymamy go w późniejszym terminie, wykonamy transakcję lub skontaktujemy się z tobą aby uzgodnić zwrot",
   "Invoice ID": "Płatność ID",
   "Order ID": "Zamówienie ID",
   "Return to StoreName": "Wróć do {{storeName}}",
@@ -44,6 +44,7 @@
   "Node Info": "Informacja o węźle",
   "txCount": "{{count}} transakcja",
   "txCount_plural": "{{count}} transakcji",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Zapłać z CoinSwitch",
+  "Pay with Changelly": "Zapłać z Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/pt-BR.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transação",
   "txCount_plural": "{{count}} transações",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/pt-PT.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transação",
   "txCount_plural": "{{count}} transações",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/ru-RU.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} Сделка",
   "txCount_plural": "{{count}} операции",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/sk-SK.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transakcia",
   "txCount_plural": "{{count}} transakcií",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/sl-SI.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} transakcija",
   "txCount_plural": "{{count}} transakcij/e",
   "Pay with CoinSwitch": "Plačilo z CoinSwitch",
-  "Pay with Changelly": "Plačilo z Changelly"
+  "Pay with Changelly": "Plačilo z Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/sr.json

@@ -23,7 +23,7 @@
   "Address": "Adresa",
   "Copied": "Kopirano",
   "ConversionTab_BodyTop": "Možete platiti {{btcDue}} {{cryptoCode}} pomoću altcoina koje prodavac ne podržava direktno.",
-  "ConversionTab_BodyDesc": "Ovu usluga pruža treća strana. Vodite računa da nemamo kontroliu nad načinom kako će Vam davatelji usluge proslijediti sredstva. Račun je plaćen tek kada su sredstva primljena na {{cryptoCode}} blokčejnu.",
+  "ConversionTab_BodyDesc": "Ovu uslugu pruža treća strana. Vodite računa da nemamo kontroliu nad načinom kako će Vam davatelji usluge proslijediti sredstva. Račun je plaćen tek kada su sredstva primljena na {{cryptoCode}} blokčejnu.",
   "ConversionTab_CalculateAmount_Error": "Pokušaj ponovo",
   "ConversionTab_LoadCurrencies_Error": "Pokušaj ponovo",
   "ConversionTab_Lightning": "Ne postoji provajder koji će konvertovati Lightning Network uplate.",
@@ -31,7 +31,7 @@
   "Invoice expiring soon...": "Račun uskoro ističe...",
   "Invoice expired": "Račun je istekao",
   "What happened?": "Šta se desilo?",
-  "InvoiceExpired_Body_1": "Ovaj račun je istekao. Račun važi samo {{maxTimeMinutes}} minuta. \nMožete se vratiti na {{storeName}} ukoliko želite da ponovo inicirate plaćanje.",
+  "InvoiceExpired_Body_1": "Ovaj račun je istekao. Račun važi samo {{maxTimeMinutes}} minuta. \nMožete se vratiti na {{storeName}} ukoliko želite da ponovo inicirate plaćanje.",
   "InvoiceExpired_Body_2": "Ako ste pokušali da pošaljete uplatu, još uvek nije prihvaćena na mreži. Nismo još zaprimili Vašu uplatu.",
   "InvoiceExpired_Body_3": "Ukoliko vašu uplatu primimo kasnije, procesuiraćemo vašu narudžbinu ili ćemo vas kontaktirati za povraćaj novca...",
   "Invoice ID": "Broj računa",
@@ -39,11 +39,12 @@
   "Return to StoreName": "Vrati se na {{storeName}}",
   "This invoice has been paid": "Račun je plaćen.",
   "This invoice has been archived": "Račun je arhiviran.",
-  "Archived_Body": "Molimo kontaktirajte prodaca za bili kakvu informaciju ili pomoć u vezi narudžbine.",
+  "Archived_Body": "Molimo kontaktirajte prodavca za bili kakvu informaciju ili pomoć u vezi narudžbine.",
   "BOLT 11 Invoice": "BOLT 11 Račun",
   "Node Info": "Informacije Node-a",
   "txCount": "{{count}} transakcija",
   "txCount_plural": "{{count}} transakcije",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Plati putem CoinSwitch-a",
+  "Pay with Changelly": "Plati putem Changelly-ja",
+  "Close": "Zatvori"
 }

BTCPayServer/wwwroot/locales/tr.json

@@ -44,6 +44,7 @@
   "Node Info": "Düğüm Bilgisi",
   "txCount": "{{count}} işlem",
   "txCount_plural": "{{count}} işlem",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "CoinSwitch ile Öde",
+  "Pay with Changelly": "Changelly ile Öde",
+  "Close": "Kapat"
 }

BTCPayServer/wwwroot/locales/uk-UA.json

@@ -45,5 +45,6 @@
   "txCount": "транзакція {{count}}",
   "txCount_plural": "транзакції {{count}}",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/vi-VN.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}} giao dịch",
   "txCount_plural": "{{count}} các giao dịch",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

BTCPayServer/wwwroot/locales/zh-SP.json

@@ -45,5 +45,6 @@
   "txCount": "{{count}}笔交易",
   "txCount_plural": "{{count}}笔交易",
   "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with Changelly": "Pay with Changelly",
+  "Close": "Close"
 }

README.md

@@ -19,47 +19,52 @@ You can run BTCPay as a self-hosted solution on your own server, or use a [third
 
 The self-hosted solution allows you not only to attach an unlimited number of stores and use the Lightning Network but also become the payment processor for others.
 
-Thanks to the apps built on top of it, you can use BTCPay to receive donations or have an in-store POS system.
+Thanks to the [apps](https://github.com/btcpayserver/btcpayserver-doc/blob/master/Apps.md) built on top of it, you can use BTCPay to receive donations, start a crowdfunding campaign or have an in-store Point of Sale.
 
 ## Features
 
-* Direct, P2P Bitcoin payments
-* Lightning Network support (LND and c-lightning)
-* Altcoin support
-* Complete control over private keys
-* Full compatibility with BitPay API (easy migration)
-* Enhanced privacy
-* SegWit support
-* Process payments for others
-* Payment buttons
-* Point of sale
+* Direct, peer-to-peer Bitcoin and altcoin payments
 * No transaction fees (other than those for the crypto networks)
 * No processing fees
 * No middleman
 * No KYC
+* User has complete control over private keys
+* Enhanced privacy
+* Enhanced security
+* Self-hosted
+* SegWit support
+* Lightning Network support (LND and c-lightning)
+* Altcoin support
+* Full compatibility with BitPay API (easy migration)
+* Process payments for others
+* Easy-embeddable Payment buttons
+* Point of sale app
+* Crowdfunding app
 
 ## Supported Altcoins
 
-In addition to Bitcoin, BTCPay supports the following cryptocurrencies:
+Bitcoin is the only focus of the project and its core developers. However, support is implemented for several altcoins:
 
-* BGold
-* Bitcore
-* Dash
-* Dogecoin
-* Feathercoin
-* Groestlcoin
-* Litecoin
-* Monacoin
-* Polis
-* UFO
-* Viacoin
-* Bitcoinplus
+* Bitcoin Gold (BTG)
+* Bitcoin Plus (XBC)
+* Bitcore (BTX)
+* Dash (DASH)
+* Dogecoin (DOGE)
+* Feathercoin (FTC)
+* Groestlcoin (GRS)
+* Litecoin (LTC)
+* Monacoin (MONA)
+* Polis (POLIS)
+* Viacoin (VIA)
+
+Altcoins are maintained by their respective communities.
 
 ## Documentation
 
-Please check out our [complete documentation](https://github.com/btcpayserver/btcpayserver-doc) for more details.
+Please check out our [complete documentation](https://github.com/btcpayserver/btcpayserver-doc) and [FAQ](https://github.com/btcpayserver/btcpayserver-doc/tree/master/FAQ#btcpay-frequently-asked-questions-and-common-issues) for more details. 
 
-You can also read the [BTCPay Merchants Guide](https://www.reddit.com/r/Bitcoin/comments/8f1eqf/the_ultimate_guide_to_btcpay_the_free_and/).
+If you have any troubles with BTCPay, please file a [Github issue](https://github.com/btcpayserver/btcpayserver/issues).
+For general questions, please join the community chat on [Mattermost](https://chat.btcpayserver.org/).
 
 ## How to build