Fix search for macaroon

HTML formatting fix for issue #448.

.circleci/config.yml

@@ -7,23 +7,16 @@ jobs:
       - checkout
 
   test:
-    machine: true
+    machine:
+        docker_layer_caching: true
     steps:
       - checkout
       - run:
           command: |
-            lsb_release -a
-            wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
-            sudo dpkg -i packages-microsoft-prod.deb
-            sudo apt-get install apt-transport-https
-            sudo apt-get update
-            sudo apt-get install dotnet-sdk-2.1
-            dotnet --info
-            dotnet build /p:TreatWarningsAsErrors=true
             cd BTCPayServer.Tests
-            dotnet test --filter Fast=Fast
-            docker-compose up -d dev
-            dotnet test --filter Integration=Integration
+            docker-compose down --v
+            docker-compose build
+            docker-compose run tests
 
   # publish jobs require $DOCKERHUB_REPO, $DOCKERHUB_USER, $DOCKERHUB_PASS defined
   publish_docker_linuxamd64:

BTCPayServer.Tests/Dockerfile

@@ -1,12 +1,17 @@
-FROM microsoft/dotnet:2.1.403-sdk-alpine3.7
-WORKDIR /app
- # caches restore result by copying csproj file separately
-COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
+FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 AS builder
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
+RUN apk add --no-cache icu-libs
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+
+# This should be removed soon https://github.com/dotnet/corefx/issues/30003
+RUN apk add --no-cache curl 
+
+WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
-
-WORKDIR /app/BTCPayServer.Tests
-RUN dotnet restore
-# copies the rest of your code
-COPY . ../.
-
-ENTRYPOINT ["dotnet", "test"]
+COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
+RUN dotnet restore BTCPayServer.Tests/BTCPayServer.Tests.csproj
+COPY . .
+RUN dotnet build
+WORKDIR /source/BTCPayServer.Tests
+ENTRYPOINT ["./docker-entrypoint.sh"]

BTCPayServer.Tests/UnitTest1.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Tests.Logging;
+using BTCPayServer.Tests.Logging;
 using System.Linq;
 using NBitcoin;
 using NBitcoin.DataEncoders;
@@ -340,13 +340,17 @@ namespace BTCPayServer.Tests
         {
             foreach (var test in new[]
             {
-                (0.0005m, "$0.0005 (USD)"),
-                (0.001m, "$0.001 (USD)"),
-                (0.01m, "$0.01 (USD)"),
-                (0.1m, "$0.10 (USD)"),
+                (0.0005m, "$0.0005 (USD)", "USD"),
+                (0.001m, "$0.001 (USD)", "USD"),
+                (0.01m, "$0.01 (USD)", "USD"),
+                (0.1m, "$0.10 (USD)", "USD"),
+                (0.1m, "0,10 € (EUR)", "EUR"),
+                (1000m, "¥1,000 (JPY)", "JPY"),
+                (1000.0001m, "₹ 1,000.00 (INR)", "INR")
             })
             {
-                var actual = new CurrencyNameTable().DisplayFormatCurrency(test.Item1, "USD");
+                var actual = new CurrencyNameTable().DisplayFormatCurrency(test.Item1, test.Item3);                
+                actual = actual.Replace("￥", "¥"); // Hack so JPY test pass on linux as well
                 Assert.Equal(test.Item2, actual);
             }
         }
@@ -884,7 +888,7 @@ namespace BTCPayServer.Tests
                 var result = client.SendAsync(message).GetAwaiter().GetResult();
                 result.EnsureSuccessStatusCode();
                 /////////////////////
-                
+
                 // Have error 403 with bad signature
                 client = new HttpClient();
                 HttpRequestMessage mess = new HttpRequestMessage(HttpMethod.Get, tester.PayTester.ServerUri.AbsoluteUri + "tokens");
@@ -1467,6 +1471,44 @@ donation:
                 Assert.NotNull(donationInvoice);
                 Assert.Equal("CAD", donationInvoice.Currency);
                 Assert.Equal("donation", donationInvoice.ItemDesc);
+
+                foreach (var test in new[]
+                {
+                    (Code: "EUR", ExpectedSymbol: "€", ExpectedDecimalSeparator: ",", ExpectedDivisibility: 2, ExpectedThousandSeparator: "\xa0", ExpectedPrefixed: false, ExpectedSymbolSpace: true),
+                    (Code: "INR", ExpectedSymbol: "₹", ExpectedDecimalSeparator: ".", ExpectedDivisibility: 2, ExpectedThousandSeparator: ",", ExpectedPrefixed: true, ExpectedSymbolSpace: true),
+                    (Code: "JPY", ExpectedSymbol: "¥", ExpectedDecimalSeparator: ".", ExpectedDivisibility: 0, ExpectedThousandSeparator: ",", ExpectedPrefixed: true, ExpectedSymbolSpace: false),
+                    (Code: "BTC", ExpectedSymbol: "BTC", ExpectedDecimalSeparator: ".", ExpectedDivisibility: 8, ExpectedThousandSeparator: ",", ExpectedPrefixed: false, ExpectedSymbolSpace: true),
+                })
+                {
+                    Logs.Tester.LogInformation($"Testing for {test.Code}");
+                    vmpos = Assert.IsType<UpdatePointOfSaleViewModel>(Assert.IsType<ViewResult>(apps.UpdatePointOfSale(appId).Result).Model);
+                    vmpos.Title = "hello";
+                    vmpos.Currency = test.Item1;
+                    vmpos.ButtonText = "{0} Purchase";
+                    vmpos.CustomButtonText = "Nicolas Sexy Hair";
+                    vmpos.CustomTipText = "Wanna tip?";
+                    vmpos.Template = @"
+apple:
+  price: 1000.0
+  title: good apple
+orange:
+  price: 10.0
+donation:
+  price: 1.02
+  custom: true
+";
+                    Assert.IsType<RedirectToActionResult>(apps.UpdatePointOfSale(appId, vmpos).Result);
+                    publicApps = user.GetController<AppsPublicController>();
+                    vmview = Assert.IsType<ViewPointOfSaleViewModel>(Assert.IsType<ViewResult>(publicApps.ViewPointOfSale(appId).Result).Model);
+                    Assert.Equal(test.Code, vmview.CurrencyCode);
+                    Assert.Equal(test.ExpectedSymbol, vmview.CurrencySymbol.Replace("￥", "¥")); // Hack so JPY test pass on linux as well);
+                    Assert.Equal(test.ExpectedSymbol, vmview.CurrencyInfo.CurrencySymbol.Replace("￥", "¥")); // Hack so JPY test pass on linux as well);
+                    Assert.Equal(test.ExpectedDecimalSeparator, vmview.CurrencyInfo.DecimalSeparator);
+                    Assert.Equal(test.ExpectedThousandSeparator, vmview.CurrencyInfo.ThousandSeparator);
+                    Assert.Equal(test.ExpectedPrefixed, vmview.CurrencyInfo.Prefixed);
+                    Assert.Equal(test.ExpectedDivisibility, vmview.CurrencyInfo.Divisibility);
+                    Assert.Equal(test.ExpectedSymbolSpace, vmview.CurrencyInfo.SymbolSpace);
+                }
             }
         }
 
@@ -1580,10 +1622,9 @@ donation:
                     var jsonResultPaid = user.GetController<InvoiceController>().Export("json").GetAwaiter().GetResult();
                     var paidresult = Assert.IsType<ContentResult>(jsonResultPaid);
                     Assert.Equal("application/json", paidresult.ContentType);
-                    Assert.Contains("\"ItemDesc\": \"Some \\\", description\"", paidresult.Content);
-                    Assert.Contains("\"FiatPrice\": 500.0", paidresult.Content);
+                    Assert.Contains("\"InvoiceItemDesc\": \"Some \\\", description\"", paidresult.Content);
+                    Assert.Contains("\"InvoicePrice\": 500.0", paidresult.Content);
                     Assert.Contains("\"ConversionRate\": 5000.0", paidresult.Content);
-                    Assert.Contains("\"PaymentDue\": \"0.10020000 BTC\"", paidresult.Content);
                     Assert.Contains($"\"InvoiceId\": \"{invoice.Id}\",", paidresult.Content);
                 });
 
@@ -1648,14 +1689,9 @@ donation:
                     var paidresult = Assert.IsType<ContentResult>(exportResultPaid);
                     Assert.Equal("application/csv", paidresult.ContentType);
                     Assert.Contains($",\"orderId\",\"{invoice.Id}\",", paidresult.Content);
-                    Assert.Contains($",\"OnChain\",\"0.10020000 BTC\",\"0.10009990 BTC\",\"0.00000000 BTC\",\"5000.0\",\"500.0\"", paidresult.Content);
-                    Assert.Contains($",\"USD\",\"\",\"Some ``, description\",\"new\"", paidresult.Content);
+                    Assert.Contains($",\"OnChain\",\"0.1000999\",\"BTC\",\"5000.0\",\"500.0\"", paidresult.Content);
+                    Assert.Contains($",\"USD\",\"\",\"Some ``, description\",\"new (paidPartial)\"", paidresult.Content);
                 });
-
-                /* 
-ReceivedDate,StoreId,OrderId,InvoiceId,CreatedDate,ExpirationDate,MonitoringDate,PaymentId,CryptoCode,Destination,PaymentType,PaymentDue,PaymentPaid,PaymentOverpaid,ConversionRate,FiatPrice,FiatCurrency,ItemCode,ItemDesc,Status
-"11/30/2018 10:28:42 AM","7AagXzWdWhLLR3Zar25YLiw2uHAJDzVT4oXGKC9bBCis","orderId","GxtJsWbgxxAXXoCurqyeK6","11/30/2018 10:28:40 AM","11/30/2018 10:43:40 AM","11/30/2018 11:43:40 AM","ec0341537f565d213bc64caa352fbbf9e0deb31cab1f91bccf89db0dd1604457-0","BTC","mqWghCp9RVw8fNgQMLjawyKStxpGfWBk1L","OnChain","0.10020000 BTC","0.10009990 BTC","0.00000000 BTC","5000.0","500.0","USD","","Some ``, description","new"
-                */
             }
         }
 

BTCPayServer.Tests/docker-compose.yml

@@ -19,10 +19,10 @@ services:
       TESTS_MYSQL: User ID=root;Host=mysql;Port=3306;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
-      TEST_MERCHANTLIGHTNINGD: "type=clightning;server=/etc/merchant_lightningd_datadir/lightning-rpc"
-      TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=/etc/customer_lightningd_datadir/lightning-rpc"
-      TEST_MERCHANTCHARGE: "type=charge;server=https://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true"
-      TEST_MERCHANTLND: "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true"
+      TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc"
+      TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc"
+      TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify"
+      TEST_MERCHANTLND: "https://lnd:lnd@merchant_lnd:8080/"
       TESTS_INCONTAINER: "true"
     expose:
       - "80"
@@ -36,7 +36,7 @@ services:
 
   # The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
   dev: 
-    image: nicolasdorier/docker-bitcoin:0.17.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -53,7 +53,7 @@ services:
       - merchant_lnd
 
   devlnd: 
-    image: nicolasdorier/docker-bitcoin:0.17.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -94,7 +94,7 @@ services:
       - litecoind
 
   bitcoind:
-    image: nicolasdorier/docker-bitcoin:0.17.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -118,7 +118,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:v0.6.2-3-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
@@ -164,7 +164,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:v0.6.2-3-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"
@@ -188,7 +188,7 @@ services:
       - bitcoind
 
   litecoind:
-    image: nicolasdorier/docker-litecoin:0.15.1
+    image: nicolasdorier/docker-litecoin:0.16.3
     environment:
       BITCOIN_EXTRA_ARGS: |
         rpcuser=ceiwHEbqWI83

BTCPayServer.Tests/docker-entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+dotnet test --filter Fast=Fast --no-build
+dotnet test --filter Integration=Integration --no-build

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.31</Version>
+		<Version>1.0.3.32</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.3" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.4" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="Hangfire" Version="1.6.20" />

BTCPayServer/Controllers/AppsPublicController.cs

@@ -40,25 +40,26 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-            var currency = _AppsHelper.GetCurrencyData(settings.Currency, false);
-            double step = currency == null ? 1 : Math.Pow(10, -(currency.Divisibility));
 
-            var numberFormatInfo = _AppsHelper.Currencies.GetNumberFormatInfo(currency.Code) ?? _AppsHelper.Currencies.GetNumberFormatInfo("USD");
+            var numberFormatInfo = _AppsHelper.Currencies.GetNumberFormatInfo(settings.Currency) ?? _AppsHelper.Currencies.GetNumberFormatInfo("USD");
+            double step = Math.Pow(10, -(numberFormatInfo.CurrencyDecimalDigits));
+
             return View(new ViewPointOfSaleViewModel()
             {
                 Title = settings.Title,
                 Step = step.ToString(CultureInfo.InvariantCulture),
                 EnableShoppingCart = settings.EnableShoppingCart,
                 ShowCustomAmount = settings.ShowCustomAmount,
-                CurrencyCode = currency.Code,
-                CurrencySymbol = currency.Symbol,
+                CurrencyCode = settings.Currency,
+                CurrencySymbol = numberFormatInfo.CurrencySymbol,
                 CurrencyInfo = new ViewPointOfSaleViewModel.CurrencyInfoData()
                 {
-                    CurrencySymbol = string.IsNullOrEmpty(currency.Symbol) ? currency.Code : currency.Symbol,
-                    Divisibility = currency.Divisibility,
+                    CurrencySymbol = string.IsNullOrEmpty(numberFormatInfo.CurrencySymbol) ? settings.Currency : numberFormatInfo.CurrencySymbol,
+                    Divisibility = numberFormatInfo.CurrencyDecimalDigits,
                     DecimalSeparator = numberFormatInfo.CurrencyDecimalSeparator,
                     ThousandSeparator = numberFormatInfo.NumberGroupSeparator,
-                    Prefixed = new[] { 0, 2 }.Contains(numberFormatInfo.CurrencyPositivePattern)
+                    Prefixed = new[] { 0, 2 }.Contains(numberFormatInfo.CurrencyPositivePattern),
+                    SymbolSpace = new[] { 2, 3 }.Contains(numberFormatInfo.CurrencyPositivePattern)
                 },
                 Items = _AppsHelper.Parse(settings.Template, settings.Currency),
                 ButtonText = settings.ButtonText,

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -103,7 +103,7 @@ namespace BTCPayServer.Controllers
                     {
                         var m = new InvoiceDetailsModel.Payment();
                         m.Crypto = payment.GetPaymentMethodId().CryptoCode;
-                        m.DepositAddress = onChainPaymentData.Output.ScriptPubKey.GetDestinationAddress(paymentNetwork.NBitcoinNetwork);
+                        m.DepositAddress = onChainPaymentData.GetDestination(paymentNetwork);
 
                         int confirmationCount = 0;
                         if ((onChainPaymentData.ConfirmationCount < paymentNetwork.MaxTrackedConfirmation && payment.Accounted)
@@ -484,7 +484,7 @@ namespace BTCPayServer.Controllers
         [BitpayAPIConstraint(false)]
         public async Task<IActionResult> Export(string format, string searchTerm = null)
         {
-            var model = new InvoiceExport();
+            var model = new InvoiceExport(_NetworkProvider);
 
             var invoices = await ListInvoicesProcess(searchTerm, 0, int.MaxValue);
             var res = model.Process(invoices, format);

BTCPayServer/Controllers/Macaroons.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Controllers
+{
+    public class Macaroons
+    {
+        public class Macaroon
+        {
+            public Macaroon(byte[] bytes)
+            {
+                Bytes = bytes;
+                Hex = NBitcoin.DataEncoders.Encoders.Hex.EncodeData(bytes);
+            }
+
+            public string Hex { get; set; }
+            public byte[] Bytes { get; set; }
+        }
+        public static async Task<Macaroons> GetFromDirectoryAsync(string directoryPath)
+        {
+            if (directoryPath == null)
+                throw new ArgumentNullException(nameof(directoryPath));
+            Macaroons macaroons = new Macaroons();
+            if (!Directory.Exists(directoryPath))
+                return macaroons;
+            foreach(var file in Directory.GetFiles(directoryPath, "*.macaroon"))
+            {
+                try
+                {
+                    switch (Path.GetFileName(file))
+                    {
+                        case "admin.macaroon":
+                            macaroons.AdminMacaroon = new Macaroon(await File.ReadAllBytesAsync(file));
+                            break;
+                        case "readonly.macaroon":
+                            macaroons.ReadonlyMacaroon = new Macaroon(await File.ReadAllBytesAsync(file));
+                            break;
+                        case "invoice.macaroon":
+                            macaroons.InvoiceMacaroon = new Macaroon(await File.ReadAllBytesAsync(file));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                catch { }
+            }
+            return macaroons;
+        }
+        public Macaroon ReadonlyMacaroon { get; set; }
+
+        public Macaroon InvoiceMacaroon { get; set; }
+        public Macaroon AdminMacaroon { get; set; }
+    }
+}

BTCPayServer/Controllers/ServerController.cs

@@ -504,7 +504,7 @@ namespace BTCPayServer.Controllers
         }
 
         [Route("server/services/lnd/{cryptoCode}/{index}")]
-        public IActionResult LndServices(string cryptoCode, int index, uint? nonce)
+        public async Task<IActionResult> LndServices(string cryptoCode, int index, uint? nonce)
         {
             if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
             {
@@ -520,6 +520,7 @@ namespace BTCPayServer.Controllers
                 model.Host = $"{external.BaseUri.DnsSafeHost}:{external.BaseUri.Port}";
                 model.SSL = external.BaseUri.Scheme == "https";
                 model.ConnectionType = "GRPC";
+                model.GRPCSSLCipherSuites = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256";
             }
             else if(external.ConnectionType == LightningConnectionType.LndREST)
             {
@@ -535,10 +536,10 @@ namespace BTCPayServer.Controllers
             {
                 model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
             }
-            if (external.RestrictedMacaroon != null)
-            {
-                model.RestrictedMacaroon = Encoders.Hex.EncodeData(external.RestrictedMacaroon);
-            }
+            var macaroons = external.MacaroonDirectoryPath == null ? null : await Macaroons.GetFromDirectoryAsync(external.MacaroonDirectoryPath);
+            model.AdminMacaroon = macaroons?.AdminMacaroon?.Hex;
+            model.InvoiceMacaroon = macaroons?.InvoiceMacaroon?.Hex;
+            model.ReadonlyMacaroon = macaroons?.ReadonlyMacaroon?.Hex;
 
             if (nonce != null)
             {
@@ -571,38 +572,40 @@ namespace BTCPayServer.Controllers
 
         [Route("server/services/lnd/{cryptoCode}/{index}")]
         [HttpPost]
-        public IActionResult LndServicesPost(string cryptoCode, int index)
+        public async Task<IActionResult> LndServicesPost(string cryptoCode, int index)
         {
             var external = GetExternalLndConnectionString(cryptoCode, index);
             if (external == null)
                 return NotFound();
             LightningConfigurations confs = new LightningConfigurations();
+            var macaroons = external.MacaroonDirectoryPath == null ? null : await Macaroons.GetFromDirectoryAsync(external.MacaroonDirectoryPath);
             if (external.ConnectionType == LightningConnectionType.LndGRPC)
             {
-                LightningConfiguration conf = new LightningConfiguration();
-                conf.Type = "grpc";
-                conf.ChainType = _Options.NetworkType.ToString();
-                conf.CryptoCode = cryptoCode;
-                conf.Host = external.BaseUri.DnsSafeHost;
-                conf.Port = external.BaseUri.Port;
-                conf.SSL = external.BaseUri.Scheme == "https";
-                conf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
-                conf.RestrictedMacaroon = external.RestrictedMacaroon == null ? null : Encoders.Hex.EncodeData(external.RestrictedMacaroon);
-                conf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
-                confs.Configurations.Add(conf);
+                LightningConfiguration grpcConf = new LightningConfiguration();
+                grpcConf.Type = "grpc";
+                grpcConf.Host = external.BaseUri.DnsSafeHost;
+                grpcConf.Port = external.BaseUri.Port;
+                grpcConf.SSL = external.BaseUri.Scheme == "https";
+                confs.Configurations.Add(grpcConf);
             }
             else if (external.ConnectionType == LightningConnectionType.LndREST)
             {
                 var restconf = new LNDRestConfiguration();
                 restconf.Type = "lnd-rest";
-                restconf.ChainType = _Options.NetworkType.ToString();
-                restconf.CryptoCode = cryptoCode;
                 restconf.Uri = external.BaseUri.AbsoluteUri;
-                restconf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
-                restconf.RestrictedMacaroon = external.RestrictedMacaroon == null ? null : Encoders.Hex.EncodeData(external.RestrictedMacaroon);
-                restconf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
                 confs.Configurations.Add(restconf);
             }
+            else
+                throw new NotSupportedException(external.ConnectionType.ToString());
+            var commonConf = (LNDConfiguration)confs.Configurations[confs.Configurations.Count - 1];
+            commonConf.ChainType = _Options.NetworkType.ToString();
+            commonConf.CryptoCode = cryptoCode;
+            commonConf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
+            commonConf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
+            commonConf.AdminMacaroon = macaroons?.AdminMacaroon?.Hex;
+            commonConf.ReadonlyMacaroon = macaroons?.ReadonlyMacaroon?.Hex;
+            commonConf.InvoiceMacaroon = macaroons?.InvoiceMacaroon?.Hex;
+
             var nonce = RandomUtils.GetUInt32();
             var configKey = GetConfigKey("lnd", cryptoCode, index, nonce);
             _LnConfigProvider.KeepConfig(configKey, confs);
@@ -628,18 +631,6 @@ namespace BTCPayServer.Controllers
                     return null;
                 }
             }
-            if (connectionString.RestrictedMacaroonFilePath != null)
-            {
-                try
-                {
-                    connectionString.RestrictedMacaroon = System.IO.File.ReadAllBytes(connectionString.RestrictedMacaroonFilePath);
-                }
-                catch
-                {
-                    Logs.Configuration.LogWarning($"{cryptoCode}: The restrictedmacaroon file path of the external LND grpc config was not found ({connectionString.RestrictedMacaroonFilePath})");
-                }
-                connectionString.RestrictedMacaroonFilePath = null;
-            }
             return connectionString;
         }
 

BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs

@@ -28,7 +28,8 @@ namespace BTCPayServer.Models.AppViewModels
             public string CurrencySymbol { get; set; }
             public string ThousandSeparator { get; set; }
             public string DecimalSeparator { get; set; }
-            public int Divisibility { get; internal set; }
+            public int Divisibility { get; set; }
+            public bool SymbolSpace { get; set; }
         }
 
         public CurrencyInfoData CurrencyInfo { get; set; }

BTCPayServer/Models/ServerViewModels/LndGrpcServicesViewModel.cs

@@ -11,8 +11,12 @@ namespace BTCPayServer.Models.ServerViewModels
         public string Host { get; set; }
         public bool SSL { get; set; }
         public string Macaroon { get; set; }
-        public string RestrictedMacaroon { get; set; }
+        public string AdminMacaroon { get; set; }
+        public string ReadonlyMacaroon { get; set; }
+        public string InvoiceMacaroon { get; set; }
         public string CertificateThumbprint { get; set; }
+        [Display(Name = "GRPC SSL Cipher suite (GRPC_SSL_CIPHER_SUITES)")]
+        public string GRPCSSLCipherSuites { get; set; }
         public string QRCode { get; set; }
         public string QRCodeLink { get; set; }
         [Display(Name = "REST Uri")]

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs

@@ -78,5 +78,15 @@ namespace BTCPayServer.Payments.Bitcoin
             }
             return false;
         }
+
+        public BitcoinAddress GetDestination(BTCPayNetwork network)
+        {
+            return Output.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork);
+        }
+
+        string CryptoPaymentData.GetDestination(BTCPayNetwork network)
+        {
+            return GetDestination(network).ToString();
+        }
     }
 }

BTCPayServer/Payments/Lightning/LightningLikePaymentData.cs

@@ -16,6 +16,12 @@ namespace BTCPayServer.Payments.Lightning
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string BOLT11 { get; set; }
+
+        public string GetDestination(BTCPayNetwork network)
+        {
+            return GetPaymentId();
+        }
+
         public string GetPaymentId()
         {
             return BOLT11;

BTCPayServer/Services/Invoices/Export/InvoiceExport.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Payments.Bitcoin;
@@ -10,6 +11,12 @@ namespace BTCPayServer.Services.Invoices.Export
 {
     public class InvoiceExport
     {
+        public BTCPayNetworkProvider Networks { get; }
+
+        public InvoiceExport(BTCPayNetworkProvider networks)
+        {
+            Networks = networks;
+        }
         public string Process(InvoiceEntity[] invoices, string fileFormat)
         {
             var csvInvoices = new List<ExportInvoiceHolder>();
@@ -55,9 +62,7 @@ namespace BTCPayServer.Services.Invoices.Export
                 var cryptoCode = payment.GetPaymentMethodId().CryptoCode;
                 var pdata = payment.GetCryptoPaymentData();
 
-                var pmethod = invoice.GetPaymentMethod(payment.GetPaymentMethodId(), null);
-                var accounting = pmethod.Calculate();
-                var details = pmethod.GetPaymentMethodDetails();
+                var pmethod = invoice.GetPaymentMethod(payment.GetPaymentMethodId(), Networks);
 
                 var target = new ExportInvoiceHolder
                 {
@@ -65,25 +70,24 @@ namespace BTCPayServer.Services.Invoices.Export
                     PaymentId = pdata.GetPaymentId(),
                     CryptoCode = cryptoCode,
                     ConversionRate = pmethod.Rate,
-                    PaymentType = details.GetPaymentType() == Payments.PaymentTypes.BTCLike ? "OnChain" : "OffChain",
-                    Destination = details.GetPaymentDestination(),
-                    PaymentDue = $"{accounting.MinimumTotalDue} {cryptoCode}",
-                    PaymentPaid = $"{accounting.CryptoPaid} {cryptoCode}",
-                    PaymentOverpaid = $"{accounting.OverpaidHelper} {cryptoCode}",
-
+                    PaymentType = payment.GetPaymentMethodId().PaymentType == Payments.PaymentTypes.BTCLike ? "OnChain" : "OffChain",
+                    Destination = payment.GetCryptoPaymentData().GetDestination(Networks.GetNetwork(cryptoCode)),
+                    Paid = pdata.GetValue().ToString(CultureInfo.InvariantCulture),
                     OrderId = invoice.OrderId,
                     StoreId = invoice.StoreId,
                     InvoiceId = invoice.Id,
-                    CreatedDate = invoice.InvoiceTime.UtcDateTime,
-                    ExpirationDate = invoice.ExpirationTime.UtcDateTime,
-                    MonitoringDate = invoice.MonitoringExpiration.UtcDateTime,
+                    InvoiceCreatedDate = invoice.InvoiceTime.UtcDateTime,
+                    InvoiceExpirationDate = invoice.ExpirationTime.UtcDateTime,
+                    InvoiceMonitoringDate = invoice.MonitoringExpiration.UtcDateTime,
 #pragma warning disable CS0618 // Type or member is obsolete
-                    Status = invoice.StatusString,
+                    InvoiceFullStatus = invoice.GetInvoiceState().ToString(),
+                    InvoiceStatus = invoice.StatusString,
+                    InvoiceExceptionStatus = invoice.ExceptionStatusString,
 #pragma warning restore CS0618 // Type or member is obsolete
-                    ItemCode = invoice.ProductInformation?.ItemCode,
-                    ItemDesc = invoice.ProductInformation?.ItemDesc,
-                    FiatPrice = invoice.ProductInformation?.Price ?? 0,
-                    FiatCurrency = invoice.ProductInformation?.Currency,
+                    InvoiceItemCode = invoice.ProductInformation.ItemCode,
+                    InvoiceItemDesc = invoice.ProductInformation.ItemDesc,
+                    InvoicePrice = invoice.ProductInformation.Price,
+                    InvoiceCurrency = invoice.ProductInformation.Currency,
                 };
 
                 exportList.Add(target);
@@ -101,23 +105,23 @@ namespace BTCPayServer.Services.Invoices.Export
         public string StoreId { get; set; }
         public string OrderId { get; set; }
         public string InvoiceId { get; set; }
-        public DateTime CreatedDate { get; set; }
-        public DateTime ExpirationDate { get; set; }
-        public DateTime MonitoringDate { get; set; }
+        public DateTime InvoiceCreatedDate { get; set; }
+        public DateTime InvoiceExpirationDate { get; set; }
+        public DateTime InvoiceMonitoringDate { get; set; }
 
         public string PaymentId { get; set; }
-        public string CryptoCode { get; set; }
         public string Destination { get; set; }
         public string PaymentType { get; set; }
-        public string PaymentDue { get; set; }
-        public string PaymentPaid { get; set; }
-        public string PaymentOverpaid { get; set; }
+        public string Paid { get; set; }
+        public string CryptoCode { get; set; }
         public decimal ConversionRate { get; set; }
 
-        public decimal FiatPrice { get; set; }
-        public string FiatCurrency { get; set; }
-        public string ItemCode { get; set; }
-        public string ItemDesc { get; set; }
-        public string Status { get; set; }
+        public decimal InvoicePrice { get; set; }
+        public string InvoiceCurrency { get; set; }
+        public string InvoiceItemCode { get; set; }
+        public string InvoiceItemDesc { get; set; }
+        public string InvoiceFullStatus { get; set; }
+        public string InvoiceStatus { get; set; }
+        public string InvoiceExceptionStatus { get; set; }
     }
 }

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -982,5 +982,6 @@ namespace BTCPayServer.Services.Invoices
         bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy, BTCPayNetwork network);
 
         PaymentTypes GetPaymentType();
+        string GetDestination(BTCPayNetwork network);
     }
 }

BTCPayServer/Services/LightningConfigurationProvider.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using NBitcoin;
+using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Services
 {
@@ -27,9 +28,9 @@ namespace BTCPayServer.Services
 
         private void CleanExpired()
         {
-            foreach(var item in _Map)
+            foreach (var item in _Map)
             {
-                if(item.Value.expiration < DateTimeOffset.UtcNow)
+                if (item.Value.expiration < DateTimeOffset.UtcNow)
                 {
                     _Map.TryRemove(item.Key, out var unused);
                 }
@@ -41,26 +42,29 @@ namespace BTCPayServer.Services
     {
         public List<object> Configurations { get; set; } = new List<object>();
     }
-    public class LightningConfiguration
+
+    public class LNDConfiguration
     {
         public string ChainType { get; set; }
         public string Type { get; set; }
         public string CryptoCode { get; set; }
+        public string CertificateThumbprint { get; set; }
+        public string Macaroon { get; set; }
+        public string AdminMacaroon { get; set; }
+        public string ReadonlyMacaroon { get; set; }
+        public string InvoiceMacaroon { get; set; }
+    }
+    public class LightningConfiguration : LNDConfiguration
+    {
         public string Host { get; set; }
         public int Port { get; set; }
         public bool SSL { get; set; }
-        public string CertificateThumbprint { get; set; }
-        public string Macaroon { get; set; }
-        public string RestrictedMacaroon { get; set; }
     }
-    public class LNDRestConfiguration
+    public class LNDRestConfiguration : LNDConfiguration
     {
         public string ChainType { get; set; }
         public string Type { get; set; }
         public string CryptoCode { get; set; }
         public string Uri { get; set; }
-        public string Macaroon { get; set; }
-        public string CertificateThumbprint { get; set; }
-        public string RestrictedMacaroon { get; set; }
     }
 }

BTCPayServer/Views/Account/ResetPassword.cshtml

@@ -3,33 +3,39 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"]</h2>
-<h4>Reset your password.</h4>
-<hr />
-<div class="row">
-    <div class="col-md-4">
-        <form method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
-            <input asp-for="Code" type="hidden" />
-            <div class="form-group">
-                <label asp-for="Email"></label>
-                <input asp-for="Email" class="form-control" />
-                <span asp-validation-for="Email" class="text-danger"></span>
+<section>
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-12 text-center">
+                <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
             </div>
-            <div class="form-group">
-                <label asp-for="Password"></label>
-                <input asp-for="Password" class="form-control" />
-                <span asp-validation-for="Password" class="text-danger"></span>
+        </div>
+        <div class="row">
+            <div class="col-md-4">
+                <form method="post">
+                    <div asp-validation-summary="All" class="text-danger"></div>
+                    <input asp-for="Code" type="hidden" />
+                    <div class="form-group">
+                        <label asp-for="Email"></label>
+                        <input asp-for="Email" class="form-control" />
+                        <span asp-validation-for="Email" class="text-danger"></span>
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="Password"></label>
+                        <input asp-for="Password" class="form-control" />
+                        <span asp-validation-for="Password" class="text-danger"></span>
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="ConfirmPassword"></label>
+                        <input asp-for="ConfirmPassword" class="form-control" />
+                        <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Reset</button>
+                </form>
             </div>
-            <div class="form-group">
-                <label asp-for="ConfirmPassword"></label>
-                <input asp-for="ConfirmPassword" class="form-control" />
-                <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
-            </div>
-            <button type="submit" class="btn btn-primary">Reset</button>
-        </form>
+        </div>
     </div>
-</div>
+</section>
 
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")

BTCPayServer/Views/Account/ResetPasswordConfirmation.cshtml

@@ -3,6 +3,12 @@
 }
 
 <h2>@ViewData["Title"]</h2>
-<p>
-    Your password has been reset. Please <a asp-action="Login">click here to log in</a>.
-</p>
+<section>
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-12 text-center">
+                Your password has been reset. Please <a asp-action="Login">click here to log in</a>.
+            </div>
+        </div>
+    </div>
+</section>

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -3,6 +3,26 @@
     ViewData["Title"] = "Update Point of Sale";
 }
 <section>
+    <div class="modal" id="product-modal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Product management</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <p>Modal body text goes here.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="js-product-save btn btn-primary">Save Changes</button>
+            </div>
+            </div>
+        </div>
+    </div>
+
     <div class="container">
         <div class="row">
             <div class="col-lg-12 text-center">
@@ -58,9 +78,17 @@
                         <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <label class="control-label">Products</label>*
+                        <div class="mb-3">
+                            <a class="js-product-add btn btn-secondary" href="#" data-toggle="modal" data-target="#product-modal"><i class="fa fa-plus fa-fw"></i> Add Product</a>
+                        </div>
+                        <div class="js-products bg-light row p-3">
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label asp-for="Template" class="control-label"></label>*
-                        <textarea asp-for="Template" rows="20" cols="40" class="form-control"></textarea>
+                        <textarea asp-for="Template" rows="10" cols="40" class="js-product-template form-control"></textarea>
                         <span asp-validation-for="Template" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -101,5 +129,56 @@
     <link rel="stylesheet" href="~/vendor/highlightjs/default.min.css">
     <script src="~/vendor/highlightjs/highlight.min.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
+    <script id="template-product-item" type="text/template">
+        <div class="col-sm-4 col-md-3 mb-3">
+            <div class="card">
+                {image}
+                <div class="card-body">
+                    <h6 class="card-title">{title}</h6>
+                    <a href="#" class="js-product-edit btn btn-primary" data-toggle="modal" data-target="#product-modal">Edit</a>
+                    <a href="#" class="js-product-remove btn btn-danger"><i class="fa fa-trash"></i></a>
+                </div>
+            </div>
+        </div>
+    </script>
+
+    <script id="template-product-content" type="text/template">
+    <div class="mb-3">
+        <input class="js-product-id" type="hidden" name="id" value="{id}">
+        <input class="js-product-index" type="hidden" name="index" value="{index}">
+        <div class="form-row">
+            <div class="col-sm-6">
+                <label>Title</label>*
+                <input type="text" class="js-product-title form-control mb-2" value="{title}" autofocus />
+            </div>
+            <div class="col-sm-3">
+                <label>Price</label>*
+                <input type="text" class="js-product-price form-control mb-2" value="{price}" />
+            </div>
+            <div class="col-sm-3">
+                <label>Custom price</label>
+                <select class="js-product-custom form-control">
+                    {custom}
+                </select>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col">
+                <label>Image</label>
+                <input type="text" class="js-product-image form-control mb-2" value="{image}" />
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col">
+                <label>Description</label>
+                <textarea rows="3" cols="40" class="js-product-description form-control mb-2">{description}</textarea>
+            </div>
+        </div>
+    </div>
+    </script>
+
+    <script src="~/products/js/products.js"></script>
+    <script src="~/products/js/products.jquery.js"></script>
 }
 

BTCPayServer/Views/Home/Home.cshtml

@@ -9,8 +9,8 @@
         <div class="header-content-inner text-white">
             <h1>Welcome to BTCPay Server</h1>
             <hr />
-            <p>BTCPay Server is a free and open source server for merchants wanting to accept Bitcoin for their business. The API is compatible with Bitpay service to allow seamless migration.</p>
-            <a style="background-color: #fff;color: #222;display:inline-block;text-align: center;white-space: nowrap;vertical-align: middle;user-select: none;line-height: 1.25;font-size: 1rem;text-decoration:none;font-weight: 700;    text-transform: uppercase;border: none;border-radius: 300px;padding: 15px 30px;" href="https://github.com/btcpayserver/btcpayserver-doc">Getting started</a>
+            <p>BTCPay Server is a free and open source server for merchants wanting to accept Bitcoin for their business.</p>
+            <a style="background-color: #fff;color: #222;display:inline-block;text-align: center;white-space: nowrap;vertical-align: middle;user-select: none;line-height: 1.25;font-size: 1rem;text-decoration:none;font-weight: 700;    text-transform: uppercase;border: none;border-radius: 300px;padding: 15px 30px;" href="https://docs.btcpayserver.org">Getting started</a>
         </div>
     </div>
 </header>

BTCPayServer/Views/Server/LndServices.cshtml

@@ -86,12 +86,33 @@
                         <input asp-for="Macaroon" readonly class="form-control" />
                     </div>
                 }
-                @if (Model.RestrictedMacaroon != null)
+                @if (Model.AdminMacaroon != null)
                 {
-                    @*<div class="form-group">
-                        <label asp-for="RestrictedMacaroon"></label>
-                        <input asp-for="RestrictedMacaroon" readonly class="form-control" />
-                    </div>*@
+                    <div class="form-group">
+                        <label asp-for="AdminMacaroon"></label>
+                        <input asp-for="AdminMacaroon" readonly class="form-control" />
+                    </div>
+                }
+                @if (Model.InvoiceMacaroon != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="InvoiceMacaroon"></label>
+                        <input asp-for="InvoiceMacaroon" readonly class="form-control" />
+                    </div>
+                }
+                @if (Model.ReadonlyMacaroon != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="ReadonlyMacaroon"></label>
+                        <input asp-for="ReadonlyMacaroon" readonly class="form-control" />
+                    </div>
+                }
+                @if (Model.GRPCSSLCipherSuites != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="GRPCSSLCipherSuites"></label>
+                        <input asp-for="GRPCSSLCipherSuites" readonly class="form-control" />
+                    </div>
                 }
                 @if (Model.CertificateThumbprint != null)
                 {

BTCPayServer/wwwroot/cart/js/cart.js

@@ -249,9 +249,15 @@ Cart.prototype.formatCurrency = function(amount, currency, symbol) {
 
     if (srvModel.currencyInfo.prefixed) {
         prefix = srvModel.currencyInfo.currencySymbol;
+        if (srvModel.currencyInfo.symbolSpace) {
+            prefix = prefix + ' ';
+        }
     }
     else {
         postfix = srvModel.currencyInfo.currencySymbol;
+        if (srvModel.currencyInfo.symbolSpace) {
+            postfix = ' ' + postfix;
+        }
     }
     thousandsSep = srvModel.currencyInfo.thousandSeparator;
     decimalSep = srvModel.currencyInfo.decimalSeparator;

BTCPayServer/wwwroot/locales/es-ES.json

@@ -22,12 +22,12 @@
   "Amount": "Cantidad",
   "Address": "Dirección",
   "Copied": "Copiado",
-  "ConversionTab_BodyTop": "Puedes pagar {{btcDue}} {{cryptoCode}} usando Altcoins que este comercio no soporta directamente.",
+  "ConversionTab_BodyTop": "Puedes pagar {{btcDue}} {{cryptoCode}} usando altcoins que este comercio no soporta directamente.",
   "ConversionTab_BodyDesc": "Este servicio es provisto por terceros. Ten en cuenta que no tenemos control sobre cómo estos terceros envían los fondos. La factura solo se marcará como pagada una vez se reciban los fondos en la cadena de bloques de {{cryptoCode}} .",
   "ConversionTab_CalculateAmount_Error": "Reintentar",
   "ConversionTab_LoadCurrencies_Error": "Reintentar",
   "ConversionTab_Lightning": "No hay proveedores de conversión disponibles para los pagos de Lightning Network.",
-  "ConversionTab_CurrencyList_Select_Option": "Por favor selecciona el tipo de moneda que de desea cambiar",
+  "ConversionTab_CurrencyList_Select_Option": "Selecciona la moneda a convertir",
   "Invoice expiring soon...": "La factura expira pronto...",
   "Invoice expired": "La factura expiró",
   "What happened?": "¿Qué sucedió?",

BTCPayServer/wwwroot/products/js/products.jquery.js

@@ -0,0 +1,69 @@
+$(document).ready(function(){
+    var products = new Products(),
+        delay = null;
+
+    $('.js-product-template').on('input', function(){
+        products.loadFromTemplate();
+
+        clearTimeout(delay);
+
+        // Delay rebuilding DOM for performance reasons
+        delay = setTimeout(function(){
+            products.showAll();
+        }, 1000);
+    });
+
+    $('.js-products').on('click', '.js-product-remove', function(event){
+        event.preventDefault();
+        
+        var id = $(this).closest('.card').parent().index();
+
+        products.removeItem(id);
+    });
+
+    $('.js-products').on('click', '.js-product-edit', function(event){
+        event.preventDefault();
+        
+        var id = $(this).closest('.card').parent().index();
+
+        products.itemContent(id);
+    });
+
+    $('.js-product-save').click(function(event){
+        event.preventDefault();
+
+        var index = $('.js-product-index').val(),
+            description = $('.js-product-description').val(),
+            image = $('.js-product-image').val(),
+            custom = $('.js-product-custom').val();
+            obj = {
+                id: products.escape($('.js-product-id').val()),
+                price: products.escape($('.js-product-price').val()),
+                title: products.escape($('.js-product-title').val()),
+            };
+
+        // Only continue if price and title is provided
+        if (obj.price && obj.title) {
+            if (description) {
+                obj.description = products.escape(description);
+            }
+            if (image) {
+                obj.image = products.escape(image);
+            }
+            if (custom == 'true') {
+                obj.custom = products.escape(custom);
+            }
+
+            // Create an id from the title for a new product
+            if (!Boolean(index)) {
+                obj.id = products.escape(obj.title.toLowerCase() + ':');
+            }
+    
+            products.saveItem(obj, index);
+        }
+    });
+
+    $('.js-product-add').click(function(){
+        products.itemContent();
+    });
+});

BTCPayServer/wwwroot/products/js/products.js

@@ -0,0 +1,186 @@
+function Products() {
+    this.products = [];
+
+    // Get products from template
+    this.loadFromTemplate();
+
+    // Show products in the DOM
+    this.showAll();
+}
+
+Products.prototype.loadFromTemplate = function() {
+    var template = $('.js-product-template').val().trim(),
+        lines = template.split("\n\n");
+
+    this.products = [];
+
+    // Split products from the template
+    for (var kl in lines) {
+        var line = lines[kl],
+            product = line.split("\n"),
+            id, price, title, description, image = null,
+            custom;
+
+        for (var kp in product) {
+            var productProperty = product[kp].trim();
+
+            if (kp == 0) {
+                id = productProperty;
+            }
+
+            if (productProperty.indexOf('price:') !== -1) {
+                price = parseFloat(productProperty.replace('price:', '').trim());
+            }
+            if (productProperty.indexOf('title:') !== -1) {
+                title = productProperty.replace('title:', '').trim();
+            }
+            if (productProperty.indexOf('description:') !== -1) {
+                description = productProperty.replace('description:', '').trim();
+            }
+            if (productProperty.indexOf('image:') !== -1) {
+                image = productProperty.replace('image:', '').trim();
+            }
+            if (productProperty.indexOf('custom:') !== -1) {
+                custom = productProperty.replace('custom:', '').trim();
+            }
+        }
+
+        if (price != null || title != null) {
+            // Add product to the list
+            this.products.push({
+                'id': id,
+                'title': title,
+                'price': price,
+                'image': image || null,
+                'description': description || null,
+                'custom': Boolean(custom)
+            });
+        }
+        
+    }
+}
+
+Products.prototype.saveTemplate = function() {
+    var template = '';
+
+    // Construct template from the product list
+    for (var key in this.products) {
+        var product = this.products[key],
+            id = product.id,
+            title = product.title,
+            price = product.price,
+            image = product.image
+            description = product.description,
+            custom = product.custom;
+
+        template += id + '\n' +
+        '  price: ' + price + '\n' +
+        '  title: ' + title + '\n';
+
+        if (description) {
+            template += '  description: ' + description + '\n';
+        }
+        if (image) {
+            template += '  image: ' + image + '\n';
+        }
+        if (custom) {
+            template += '  custom: true\n';
+        }
+        template += '\n';
+    }
+
+    $('.js-product-template').val(template);
+}
+
+Products.prototype.showAll = function() {
+    var list = [];
+
+    for (var key in this.products) {
+        var product = this.products[key],
+            image = product.image;
+
+        list.push(this.template($('#template-product-item'), {
+            'title': this.escape(product.title),
+            'image': image ? '<img class="card-img-top" src="' + this.escape(image) + '" alt="Card image cap">' : ''
+        }));
+    }
+
+    $('.js-products').html(list);
+}
+
+// Load the template
+Products.prototype.template = function($template, obj) {
+    var template = $template.text();
+
+    for (var key in obj) {
+        var re = new RegExp('{' + key + '}', 'mg');
+        template = template.replace(re, obj[key]);
+    }
+
+    return template;
+}
+
+Products.prototype.saveItem = function(obj, index) {
+    // Edit product
+    if (index) {
+        this.products[index] = obj;
+    } else { // Add new product
+        this.products.push(obj);
+    }
+
+    this.saveTemplate();
+    this.showAll();
+    this.modalEmpty();
+}
+
+Products.prototype.removeItem = function(index) {
+    if (this.products.length == 1) {
+        this.products = [];
+        $('.js-products').html('No products.');
+    } else {
+        this.products.splice(index, 1);
+        $('.js-products').find('.card').parent().eq(index).remove();
+    }
+
+    this.saveTemplate();
+}
+
+Products.prototype.itemContent = function(index) {
+    var product = null,
+        custom = false;
+
+    // Existing product
+    if (!isNaN(index)) {
+        product = this.products[index];
+        custom = product.custom;
+    }
+
+    var template = this.template($('#template-product-content'), {
+        'id': product != null ? this.escape(product.id) : '',
+        'index': isNaN(index) ? '' : this.escape(index),
+        'price': product != null ? this.escape(product.price) : '',
+        'title': product != null ? this.escape(product.title) : '',
+        'description': product != null ? this.escape(product.description) : '',
+        'image': product != null ? this.escape(product.image) : '',
+        'custom': '<option value="true"' + (custom ? ' selected' : '') + '>Yes</option><option value="false"' + (!custom ? ' selected' : '') + '>No</option>'
+    });
+
+    $('#product-modal').find('.modal-body').html(template);
+}
+
+Products.prototype.modalEmpty = function() {
+    var $modal = $('#product-modal');
+
+    $modal.modal('hide');
+    $modal.find('.modal-body').empty();
+}
+
+Products.prototype.escape = function(input) {
+    return ('' + input) /* Forces the conversion to string. */
+        .replace(/&/g, '&amp;') /* This MUST be the 1st replacement. */
+        .replace(/'/g, '&apos;') /* The 4 other predefined entities, required. */
+        .replace(/"/g, '&quot;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+    ;
+}