bump

Ref: #549, #550

BTCPayServer.Tests/CrowdfundTests.cs

@@ -5,10 +5,8 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
-using BTCPayServer.Crowdfund;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
-using BTCPayServer.Hubs;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Models.StoreViewModels;
@@ -25,6 +23,7 @@ using NBitcoin;
 using NBitpayClient;
 using Xunit;
 using Xunit.Abstractions;
+using static BTCPayServer.Tests.UnitTest1;
 
 namespace BTCPayServer.Tests
 {
@@ -185,7 +184,8 @@ namespace BTCPayServer.Tests
                 Assert.IsType<RedirectToActionResult>(apps.CreateApp(vm).Result);
                 var appId = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps().Result).Model)
                     .Apps[0].Id;
-                
+
+                Logs.Tester.LogInformation("We create an invoice with a hardcap");
                 var crowdfundViewModel = Assert.IsType<UpdateCrowdfundViewModel>(Assert
                     .IsType<ViewResult>(apps.UpdateCrowdfund(appId).Result).Model);
                 crowdfundViewModel.Enabled = true;
@@ -193,6 +193,7 @@ namespace BTCPayServer.Tests
                 crowdfundViewModel.TargetAmount = 100;
                 crowdfundViewModel.TargetCurrency = "BTC";
                 crowdfundViewModel.UseAllStoreInvoices = true;
+                crowdfundViewModel.EnforceTargetAmount = true;
                 Assert.IsType<RedirectToActionResult>(apps.UpdateCrowdfund(appId, crowdfundViewModel).Result);
                 
                 var anonAppPubsController = tester.PayTester.GetController<AppsPublicController>();
@@ -209,16 +210,16 @@ namespace BTCPayServer.Tests
                 Assert.Equal(0m, model.Info.CurrentAmount );
                 Assert.Equal(0m, model.Info.CurrentPendingAmount);
                 Assert.Equal(0m, model.Info.ProgressPercentage);
-                
-                
-                
+
+
+                Logs.Tester.LogInformation("Unpaid invoices should show as pending contribution because it is hardcap");
+                Logs.Tester.LogInformation("Because UseAllStoreInvoices is true, we can manually create an invoice and it should show as contribution");
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Buyer = new Buyer() { email = "test@fwf.com" },
                     Price = 1m,
                     Currency = "BTC",
                     PosData = "posData",
-                    OrderId = $"{CrowdfundHubStreamer.CrowdfundInvoiceOrderIdPrefix}{appId}",
                     ItemDesc = "Some description",
                     TransactionSpeed = "high",
                     FullNotifications = true
@@ -228,19 +229,69 @@ namespace BTCPayServer.Tests
                 model = Assert.IsType<ViewCrowdfundViewModel>(Assert
                     .IsType<ViewResult>(publicApps.ViewCrowdfund(appId, String.Empty).Result).Model);
                 
-                var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, tester.ExplorerNode.Network);
-               
-                
-                
-                tester.ExplorerNode.SendToAddress(invoiceAddress,invoice.BtcDue);
-                Assert.Equal(0m ,model.Info.CurrentAmount );
+                Assert.Equal(0m ,model.Info.CurrentAmount);
                 Assert.Equal(1m, model.Info.CurrentPendingAmount);
-                Assert.Equal( 0m, model.Info.ProgressPercentage);
+                Assert.Equal(0m, model.Info.ProgressPercentage);
                 Assert.Equal(1m, model.Info.PendingProgressPercentage);
 
-                
-    
-               
+                Logs.Tester.LogInformation("Let's check current amount change once payment is confirmed");
+                var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, tester.ExplorerNode.Network);
+                tester.ExplorerNode.SendToAddress(invoiceAddress, invoice.BtcDue);
+                tester.ExplorerNode.Generate(1); // By default invoice confirmed at 1 block
+                TestUtils.Eventually(() =>
+                {
+                    model = Assert.IsType<ViewCrowdfundViewModel>(Assert
+                    .IsType<ViewResult>(publicApps.ViewCrowdfund(appId, String.Empty).Result).Model);
+                    Assert.Equal(1m, model.Info.CurrentAmount);
+                    Assert.Equal(0m, model.Info.CurrentPendingAmount);
+                });
+
+                Logs.Tester.LogInformation("Because UseAllStoreInvoices is true, let's make sure the invoice is tagged");
+                var invoiceEntity = tester.PayTester.InvoiceRepository.GetInvoice(invoice.Id).GetAwaiter().GetResult();
+                Assert.True(invoiceEntity.Version >= InvoiceEntity.InternalTagSupport_Version);
+                Assert.Contains(AppService.GetAppInternalTag(appId), invoiceEntity.InternalTags);
+
+                crowdfundViewModel.UseAllStoreInvoices = false;
+                Assert.IsType<RedirectToActionResult>(apps.UpdateCrowdfund(appId, crowdfundViewModel).Result);
+
+                Logs.Tester.LogInformation("Because UseAllStoreInvoices is false, let's make sure the invoice is not tagged");
+                invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Buyer = new Buyer() { email = "test@fwf.com" },
+                    Price = 1m,
+                    Currency = "BTC",
+                    PosData = "posData",
+                    ItemDesc = "Some description",
+                    TransactionSpeed = "high",
+                    FullNotifications = true
+                }, Facade.Merchant);
+                invoiceEntity = tester.PayTester.InvoiceRepository.GetInvoice(invoice.Id).GetAwaiter().GetResult();
+                Assert.DoesNotContain(AppService.GetAppInternalTag(appId), invoiceEntity.InternalTags);
+
+                Logs.Tester.LogInformation("After turning setting a softcap, let's check that only actual payments are counted");
+                crowdfundViewModel.EnforceTargetAmount = false;
+                crowdfundViewModel.UseAllStoreInvoices = true;
+                Assert.IsType<RedirectToActionResult>(apps.UpdateCrowdfund(appId, crowdfundViewModel).Result);
+                invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Buyer = new Buyer() { email = "test@fwf.com" },
+                    Price = 1m,
+                    Currency = "BTC",
+                    PosData = "posData",
+                    ItemDesc = "Some description",
+                    TransactionSpeed = "high",
+                    FullNotifications = true
+                }, Facade.Merchant);
+                Assert.Equal(0m, model.Info.CurrentPendingAmount);
+                invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, tester.ExplorerNode.Network);
+                tester.ExplorerNode.SendToAddress(invoiceAddress, Money.Coins(0.5m));
+                tester.ExplorerNode.SendToAddress(invoiceAddress, Money.Coins(0.2m));
+                TestUtils.Eventually(() =>
+                {
+                    model = Assert.IsType<ViewCrowdfundViewModel>(Assert
+                    .IsType<ViewResult>(publicApps.ViewCrowdfund(appId, String.Empty).Result).Model);
+                    Assert.Equal(0.7m, model.Info.CurrentPendingAmount);
+                });
             }
 
             

BTCPayServer.Tests/UnitTest1.cs

@@ -859,6 +859,44 @@ namespace BTCPayServer.Tests
             Assert.Equal(f1.ToString(), f2.ToString());
         }
 
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CheckCORSSetOnBitpayAPI()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                foreach(var req in new[] 
+                {
+                    "invoices/",
+                    "invoices",
+                    "rates",
+                    "tokens"
+                }.Select(async path =>
+                {
+                    using (HttpClient client = new HttpClient())
+                    {
+                        HttpRequestMessage message = new HttpRequestMessage(HttpMethod.Options, tester.PayTester.ServerUri.AbsoluteUri + path);
+                        message.Headers.Add("Access-Control-Request-Headers", "test");
+                        var response = await client.SendAsync(message);
+                        response.EnsureSuccessStatusCode();
+                        Assert.True(response.Headers.TryGetValues("Access-Control-Allow-Origin", out var val));
+                        Assert.Equal("*", val.FirstOrDefault());
+                        Assert.True(response.Headers.TryGetValues("Access-Control-Allow-Headers", out val));
+                        Assert.Equal("test", val.FirstOrDefault());
+                    }
+                }).ToList())
+                {
+                    await req;
+                }
+                HttpClient client2 = new HttpClient();
+                HttpRequestMessage message2 = new HttpRequestMessage(HttpMethod.Options, tester.PayTester.ServerUri.AbsoluteUri + "rates");
+                var response2 = await client2.SendAsync(message2);
+                Assert.True(response2.Headers.TryGetValues("Access-Control-Allow-Origin", out var val2));
+                Assert.Equal("*", val2.FirstOrDefault());
+            }
+        }
+
         [Fact]
         [Trait("Integration", "Integration")]
         public void TestAccessBitpayAPI()
@@ -1260,6 +1298,25 @@ namespace BTCPayServer.Tests
                 Assert.True(invoice.SupportedTransactionCurrencies["LTC"].Enabled);
                 Assert.True(invoice.PaymentSubtotals.ContainsKey("LTC"));
                 Assert.True(invoice.PaymentTotals.ContainsKey("LTC"));
+
+
+                // Check if we can disable LTC
+                invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true,
+                    SupportedTransactionCurrencies = new Dictionary<string, InvoiceSupportedTransactionCurrency>()
+                    {
+                        { "BTC", new InvoiceSupportedTransactionCurrency() { Enabled = true } }
+                    }
+                }, Facade.Merchant);
+
+                Assert.Single(invoice.CryptoInfo.Where(c => c.CryptoCode == "BTC"));
+                Assert.Empty(invoice.CryptoInfo.Where(c => c.CryptoCode == "LTC"));
             }
         }
 
@@ -1629,18 +1686,16 @@ donation:
         public void PosDataParser_ParsesCorrectly()
         {
             var testCases =
-                new List<(string input, Dictionary<string, string> expectedOutput)>()
+                new List<(string input, Dictionary<string, object> expectedOutput)>()
                 {
-                    { (null, new Dictionary<string, string>())},
-                    {("", new Dictionary<string, string>())},
-                    {("{}", new Dictionary<string, string>())},
-                    {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                    {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                    {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                    {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                    {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                    {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                    { (null, new Dictionary<string, object>())},
+                    {("", new Dictionary<string, object>())},
+                    {("{}", new Dictionary<string, object>())},
+                    {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                    {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                    {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                    {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                    {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                 };
 
             testCases.ForEach(tuple =>
@@ -1663,18 +1718,16 @@ donation:
                 var controller = tester.PayTester.GetController<InvoiceController>(null);
 
                 var testCases =
-                    new List<(string input, Dictionary<string, string> expectedOutput)>()
+                    new List<(string input, Dictionary<string, object> expectedOutput)>()
                     {
-                        { (null, new Dictionary<string, string>())},
-                        {("", new Dictionary<string, string>())},
-                        {("{}", new Dictionary<string, string>())},
-                        {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                        {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                        {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                        {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                        {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                        {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                        { (null, new Dictionary<string, object>())},
+                        {("", new Dictionary<string, object>())},
+                        {("{}", new Dictionary<string, object>())},
+                        {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                        {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                        {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                        {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                        {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                     };
 
                 var tasks = new List<Task>();
@@ -1988,6 +2041,7 @@ donation:
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Price = 5000.0m,
+                    TaxIncluded = 1000.0m,
                     Currency = "USD",
                     PosData = "posData",
                     OrderId = "orderId",
@@ -2017,6 +2071,8 @@ donation:
                 });
 
                 invoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+                Assert.Equal(1000.0m, invoice.TaxIncluded);
+                Assert.Equal(5000.0m, invoice.Price);
                 Assert.Equal(Money.Coins(0), invoice.BtcPaid);
                 Assert.Equal("new", invoice.Status);
                 Assert.False((bool)((JValue)invoice.ExceptionStatus).Value);
@@ -2139,19 +2195,20 @@ donation:
             }
         }
 
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public void CheckQuadrigacxRateProvider()
-        {
-            var quadri = new QuadrigacxRateProvider();
-            var rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
-            Assert.NotEmpty(rates);
-            Assert.NotEqual(0.0m, rates.First().BidAsk.Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_CAD")).Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_USD")).Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_CAD")).Bid);
-            Assert.Null(rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_USD")));
-        }
+        //[Fact]
+        //[Trait("Integration", "Integration")]
+        // 29 january, the exchange is down
+        //public void CheckQuadrigacxRateProvider()
+        //{
+        //    var quadri = new QuadrigacxRateProvider();
+        //    var rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
+        //    Assert.NotEmpty(rates);
+        //    Assert.NotEqual(0.0m, rates.First().BidAsk.Bid);
+        //    Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_CAD")).Bid);
+        //    Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_USD")).Bid);
+        //    Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_CAD")).Bid);
+        //    Assert.Null(rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_USD")));
+        //}
 
         [Fact]
         [Trait("Integration", "Integration")]
@@ -2165,6 +2222,9 @@ donation:
                 .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync(), Fetcher: (BackgroundFetcherRateProvider)p.Value))
                 .ToList())
             {
+                Logs.Tester.LogInformation($"Testing {result.ExpectedName}");
+                if (result.ExpectedName == "quadrigacx")
+                    continue; // 29 january, the exchange is down
                 result.Fetcher.InvalidateCache();
                 var exchangeRates = result.ResultAsync.Result;
                 result.Fetcher.InvalidateCache();
@@ -2313,6 +2373,42 @@ donation:
             Assert.Throws<InvalidOperationException>(() => fetch.GetRatesAsync().GetAwaiter().GetResult());
         }
 
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void CheckParseStatusMessageModel()
+        {
+            var legacyStatus = "Error: some bad shit happened";
+            var parsed = new StatusMessageModel(legacyStatus);
+            Assert.Equal(legacyStatus, parsed.Message);
+            Assert.Equal(StatusMessageModel.StatusSeverity.Error, parsed.Severity);
+
+            var legacyStatus2 = "Some normal shit happened";
+            parsed = new StatusMessageModel(legacyStatus2);
+            Assert.Equal(legacyStatus2, parsed.Message);
+            Assert.Equal(StatusMessageModel.StatusSeverity.Success, parsed.Severity);
+
+            var newStatus = new StatusMessageModel()
+            {
+                Html = "<a href='xxx'>something new</a>",
+                Severity = StatusMessageModel.StatusSeverity.Info
+            };
+            parsed = new StatusMessageModel(newStatus.ToString());
+            Assert.Null(parsed.Message);
+            Assert.Equal(newStatus.Html, parsed.Html);
+            Assert.Equal(StatusMessageModel.StatusSeverity.Info, parsed.Severity);
+
+            var newStatus2 = new StatusMessageModel()
+            {
+                Message = "something new",
+                Severity = StatusMessageModel.StatusSeverity.Success
+            };
+            parsed = new StatusMessageModel(newStatus2.ToString());
+            Assert.Null(parsed.Html);
+            Assert.Equal(newStatus2.Message, parsed.Message);
+            Assert.Equal(StatusMessageModel.StatusSeverity.Success, parsed.Severity);
+
+        }
+
         private static bool IsMapped(Invoice invoice, ApplicationDbContext ctx)
         {
             var h = BitcoinAddress.Create(invoice.BitcoinAddress, Network.RegTest).ScriptPubKey.Hash.ToString();

BTCPayServer.Tests/docker-compose.yml

@@ -222,7 +222,7 @@ services:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.5.1-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -252,7 +252,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.5.1-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitBitcoinplus()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("XBC");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Bitcoinplus",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoinplus",
+                DefaultRateRules = new[] 
+                {
+                                "XBC_X = XBC_BTC * BTC_X",
+                                "XBC_BTC = cryptopia(XBC_BTC)"
+                },
+                CryptoImagePath = "imlegacy/bitcoinplus.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("65'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -52,11 +52,13 @@ namespace BTCPayServer
             InitBitcoinGold();
             InitMonacoin();
             InitDash();
-            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            //InitPolis();
             InitFeathercoin();
             InitGroestlcoin();
             InitViacoin();
+
+            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
+            //InitPolis();
+            //InitBitcoinplus();
             //InitUfo();
         }
 

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.45</Version>
+		<Version>1.0.3.60</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.4" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.9" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
@@ -45,8 +45,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="4.1.1.77" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.78" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.31" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
     <PackageReference Include="NBXplorer.Client" Version="2.0.0.3" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
@@ -139,7 +139,7 @@
     <Content Update="Views\Server\LightningChargeServices.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
-    <Content Update="Views\Server\SparkServices.cshtml">
+    <Content Update="Views\Server\LightningWalletServices.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
     <Content Update="Views\Server\SSHService.cshtml">

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -144,15 +144,30 @@ namespace BTCPayServer.Configuration
                 externalLnd<ExternalLndGrpc>($"{net.CryptoCode}.external.lnd.grpc", "lnd-grpc");
                 externalLnd<ExternalLndRest>($"{net.CryptoCode}.external.lnd.rest", "lnd-rest");
 
-                var spark = conf.GetOrDefault<string>($"{net.CryptoCode}.external.spark", string.Empty);
-                if (spark.Length != 0)
                 {
-                    if (!SparkConnectionString.TryParse(spark, out var connectionString))
+                    var spark = conf.GetOrDefault<string>($"{net.CryptoCode}.external.spark", string.Empty);
+                    if (spark.Length != 0)
                     {
-                        throw new ConfigException($"Invalid setting {net.CryptoCode}.external.spark, " + Environment.NewLine +
-                            $"Valid example: 'server=https://btcpay.example.com/spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie'");
+                        if (!SparkConnectionString.TryParse(spark, out var connectionString))
+                        {
+                            throw new ConfigException($"Invalid setting {net.CryptoCode}.external.spark, " + Environment.NewLine +
+                                $"Valid example: 'server=https://btcpay.example.com/spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie'");
+                        }
+                        ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalSpark(connectionString));
+                    }
+                }
+
+                {
+                    var rtl = conf.GetOrDefault<string>($"{net.CryptoCode}.external.rtl", string.Empty);
+                    if (rtl.Length != 0)
+                    {
+                        if (!SparkConnectionString.TryParse(rtl, out var connectionString))
+                        {
+                            throw new ConfigException($"Invalid setting {net.CryptoCode}.external.rtl, " + Environment.NewLine +
+                                $"Valid example: 'server=https://btcpay.example.com/rtl/btc/;cookiefile=/etc/clightning_bitcoin_rtl/.cookie'");
+                        }
+                        ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalRTL(connectionString));
                     }
-                    ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalSpark(connectionString));
                 }
 
                 var charge = conf.GetOrDefault<string>($"{net.CryptoCode}.external.charge", string.Empty);

BTCPayServer/Configuration/External/ExternalRTL.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Configuration.External
+{
+    public class ExternalRTL : ExternalService, IAccessKeyService
+    {
+        public SparkConnectionString ConnectionString { get; }
+
+        public ExternalRTL(SparkConnectionString connectionString)
+        {
+            if (connectionString == null)
+                throw new ArgumentNullException(nameof(connectionString));
+            ConnectionString = connectionString;
+        }
+    }
+}

BTCPayServer/Configuration/External/ExternalSpark.cs

@@ -5,7 +5,11 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Configuration.External
 {
-    public class ExternalSpark : ExternalService
+    public interface IAccessKeyService
+    {
+        SparkConnectionString ConnectionString { get; }
+    }
+    public class ExternalSpark : ExternalService, IAccessKeyService
     {
         public SparkConnectionString ConnectionString { get; }
 

BTCPayServer/Controllers/AccessTokenController.cs

@@ -2,6 +2,7 @@
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using NBitcoin.DataEncoders;
 using NBitpayClient;
@@ -13,7 +14,7 @@ using System.Threading.Tasks;
 namespace BTCPayServer.Controllers
 {
     [Authorize(AuthenticationSchemes = Security.Policies.BitpayAuthentication)]
-    [BitpayAPIConstraint(true)]
+    [BitpayAPIConstraint()]
     public class AccessTokenController : Controller
     {
         TokenRepository _TokenRepository;

BTCPayServer/Controllers/AppsController.Crowdfund.cs

@@ -10,42 +10,15 @@ namespace BTCPayServer.Controllers
 {
     public partial class AppsController
     {
-        public class CrowdfundAppUpdated
+        public class AppUpdated
         {
             public string AppId { get; set; }
-            public CrowdfundSettings Settings { get; set; }
+            public object Settings { get; set; }
             public string StoreId { get; set; }
-        }
-        
-        public class CrowdfundSettings
-        {
-            public string Title { get; set; }
-            public string Description { get; set; }
-            public bool Enabled { get; set; } = false;
-        
-            public DateTime? StartDate { get; set; }
-            public DateTime? EndDate { get; set; }
-        
-            public string TargetCurrency { get; set; }
-            public decimal? TargetAmount { get; set; }
-        
-            public bool EnforceTargetAmount { get; set; }
-            public string CustomCSSLink { get; set; }
-            public string MainImageUrl { get; set; }
-            public string NotificationUrl { get; set; }
-            public string Tagline { get; set; }
-            public string EmbeddedCSS { get; set; }
-            public string PerksTemplate { get; set; }
-            public bool DisqusEnabled { get; set; }= false;
-            public bool SoundsEnabled { get; set; }= true;
-            public string DisqusShortname { get; set; }
-            public bool AnimationsEnabled { get; set; } = true;
-            public bool UseInvoiceAmount { get; set; } = true;
-            public int ResetEveryAmount { get; set; } = 1;
-            public CrowdfundResetEvery ResetEvery { get; set; } = CrowdfundResetEvery.Never;
-            public bool UseAllStoreInvoices { get; set; }
-            public bool DisplayPerksRanking { get; set; }
-            public bool SortPerksByPopularity { get; set; }
+            public override string ToString()
+            {
+                return String.Empty;
+            }
         }
         
         
@@ -77,11 +50,11 @@ namespace BTCPayServer.Controllers
                 SoundsEnabled = settings.SoundsEnabled,
                 DisqusShortname = settings.DisqusShortname,
                 AnimationsEnabled = settings.AnimationsEnabled,
-                UseInvoiceAmount = settings.UseInvoiceAmount,
                 ResetEveryAmount = settings.ResetEveryAmount,
                 ResetEvery = Enum.GetName(typeof(CrowdfundResetEvery), settings.ResetEvery),
-                UseAllStoreInvoices = settings.UseAllStoreInvoices,
+                UseAllStoreInvoices = app.TagAllInvoices,
                 AppId = appId,
+                SearchTerm = app.TagAllInvoices ? $"storeid:{app.StoreDataId}" : $"orderid:{AppService.GetCrowdfundOrderId(appId)}",
                 DisplayPerksRanking = settings.DisplayPerksRanking,
                 SortPerksByPopularity = settings.SortPerksByPopularity
             };
@@ -91,12 +64,12 @@ namespace BTCPayServer.Controllers
         [Route("{appId}/settings/crowdfund")]
         public async Task<IActionResult> UpdateCrowdfund(string appId, UpdateCrowdfundViewModel vm)
         {
-            if (!string.IsNullOrEmpty( vm.TargetCurrency) && _AppsHelper.GetCurrencyData(vm.TargetCurrency, false) == null)
+            if (!string.IsNullOrEmpty( vm.TargetCurrency) && _currencies.GetCurrencyData(vm.TargetCurrency, false) == null)
                 ModelState.AddModelError(nameof(vm.TargetCurrency), "Invalid currency");
           
             try
             {
-                _AppsHelper.Parse(vm.PerksTemplate, vm.TargetCurrency).ToString();
+                _AppService.Parse(vm.PerksTemplate, vm.TargetCurrency).ToString();
             }
             catch
             {
@@ -135,7 +108,7 @@ namespace BTCPayServer.Controllers
                 EnforceTargetAmount = vm.EnforceTargetAmount,
                 StartDate = vm.StartDate,
                 TargetCurrency = vm.TargetCurrency,
-                Description = _AppsHelper.Sanitize( vm.Description),
+                Description = _htmlSanitizer.Sanitize( vm.Description),
                 EndDate = vm.EndDate,
                 TargetAmount = vm.TargetAmount,
                 CustomCSSLink = vm.CustomCSSLink,
@@ -150,15 +123,15 @@ namespace BTCPayServer.Controllers
                 AnimationsEnabled = vm.AnimationsEnabled,
                 ResetEveryAmount = vm.ResetEveryAmount,
                 ResetEvery = Enum.Parse<CrowdfundResetEvery>(vm.ResetEvery),
-                UseInvoiceAmount = vm.UseInvoiceAmount,
-                UseAllStoreInvoices = vm.UseAllStoreInvoices,
                 DisplayPerksRanking = vm.DisplayPerksRanking,
                 SortPerksByPopularity = vm.SortPerksByPopularity
             };
-            
+
+            app.TagAllInvoices = vm.UseAllStoreInvoices;
             app.SetSettings(newSettings);
             await UpdateAppSettings(app);
-            _EventAggregator.Publish(new CrowdfundAppUpdated()
+
+            _EventAggregator.Publish(new AppUpdated()
             {
                 AppId = appId,
                 StoreId = app.StoreDataId,

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,
@@ -115,7 +116,7 @@ namespace BTCPayServer.Controllers
                 }
                 try
                 {
-                    var items = _AppsHelper.Parse(settings.Template, settings.Currency);
+                    var items = _AppService.Parse(settings.Template, settings.Currency);
                     var builder = new StringBuilder();
                     builder.AppendLine($"<form method=\"POST\" action=\"{encoder.Encode(appUrl)}\">");
                     builder.AppendLine($"  <input type=\"hidden\" name=\"email\" value=\"customer@example.com\" />");
@@ -137,11 +138,11 @@ namespace BTCPayServer.Controllers
         [Route("{appId}/settings/pos")]
         public async Task<IActionResult> UpdatePointOfSale(string appId, UpdatePointOfSaleViewModel vm)
         {
-            if (_AppsHelper.GetCurrencyData(vm.Currency, false) == null)
+            if (_currencies.GetCurrencyData(vm.Currency, false) == null)
                 ModelState.AddModelError(nameof(vm.Currency), "Invalid currency");
             try
             {
-                _AppsHelper.Parse(vm.Template, vm.Currency);
+                _AppService.Parse(vm.Template, vm.Currency);
             }
             catch
             {
@@ -179,6 +180,7 @@ namespace BTCPayServer.Controllers
                 ctx.Apps.Add(app);
                 ctx.Entry<AppData>(app).State = EntityState.Modified;
                 ctx.Entry<AppData>(app).Property(a => a.Settings).IsModified = true;
+                ctx.Entry<AppData>(app).Property(a => a.TagAllInvoices).IsModified = true;
                 await ctx.SaveChangesAsync();
             }
         }

BTCPayServer/Controllers/AppsController.cs

@@ -7,6 +7,8 @@ using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Apps;
+using BTCPayServer.Services.Rates;
+using Ganss.XSS;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -26,20 +28,26 @@ namespace BTCPayServer.Controllers
             ApplicationDbContextFactory contextFactory,
             EventAggregator eventAggregator,
             BTCPayNetworkProvider networkProvider,
-            AppsHelper appsHelper)
+            CurrencyNameTable currencies,
+            HtmlSanitizer htmlSanitizer,
+            AppService AppService)
         {
             _UserManager = userManager;
             _ContextFactory = contextFactory;
             _EventAggregator = eventAggregator;
             _NetworkProvider = networkProvider;
-            _AppsHelper = appsHelper;
+            _currencies = currencies;
+            _htmlSanitizer = htmlSanitizer;
+            _AppService = AppService;
         }
 
         private UserManager<ApplicationUser> _UserManager;
         private ApplicationDbContextFactory _ContextFactory;
         private readonly EventAggregator _EventAggregator;
         private BTCPayNetworkProvider _NetworkProvider;
-        private AppsHelper _AppsHelper;
+        private readonly CurrencyNameTable _currencies;
+        private readonly HtmlSanitizer _htmlSanitizer;
+        private AppService _AppService;
 
         [TempData]
         public string StatusMessage { get; set; }
@@ -47,7 +55,7 @@ namespace BTCPayServer.Controllers
 
         public async Task<IActionResult> ListApps()
         {
-            var apps = await _AppsHelper.GetAllApps(GetUserId());
+            var apps = await _AppService.GetAllApps(GetUserId());
             return View(new ListAppsViewModel()
             {
                 Apps = apps
@@ -61,7 +69,7 @@ namespace BTCPayServer.Controllers
             var appData = await GetOwnedApp(appId);
             if (appData == null)
                 return NotFound();
-            if (await _AppsHelper.DeleteApp(appData))
+            if (await _AppService.DeleteApp(appData))
                 StatusMessage = "App removed successfully";
             return RedirectToAction(nameof(ListApps));
         }
@@ -70,10 +78,15 @@ namespace BTCPayServer.Controllers
         [Route("create")]
         public async Task<IActionResult> CreateApp()
         {
-            var stores = await _AppsHelper.GetOwnedStores(GetUserId());
+            var stores = await _AppService.GetOwnedStores(GetUserId());
             if (stores.Length == 0)
             {
-                StatusMessage = "Error: You must have created at least one store";
+                StatusMessage = new StatusMessageModel()
+                {
+                    Html =
+                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                    Severity = StatusMessageModel.StatusSeverity.Error
+                }.ToString();
                 return RedirectToAction(nameof(ListApps));
             }
             var vm = new CreateAppViewModel();
@@ -85,10 +98,15 @@ namespace BTCPayServer.Controllers
         [Route("create")]
         public async Task<IActionResult> CreateApp(CreateAppViewModel vm)
         {
-            var stores = await _AppsHelper.GetOwnedStores(GetUserId());
+            var stores = await _AppService.GetOwnedStores(GetUserId());
             if (stores.Length == 0)
             {
-                StatusMessage = "Error: You must own at least one store";
+                StatusMessage = new StatusMessageModel()
+                {
+                    Html =
+                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                    Severity = StatusMessageModel.StatusSeverity.Error
+                }.ToString();
                 return RedirectToAction(nameof(ListApps));
             }
             var selectedStore = vm.SelectedStore;
@@ -150,7 +168,7 @@ namespace BTCPayServer.Controllers
 
         private Task<AppData> GetOwnedApp(string appId, AppType? type = null)
         {
-            return _AppsHelper.GetAppDataIfOwner(GetUserId(), appId, type);
+            return _AppService.GetAppDataIfOwner(GetUserId(), appId, type);
         }
 
         

BTCPayServer/Controllers/AppsPublicController.cs

@@ -6,19 +6,17 @@ using System.IO;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using BTCPayServer.Crowdfund;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
-using BTCPayServer.Hubs;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Payments;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using Ganss.XSS;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
@@ -32,32 +30,30 @@ namespace BTCPayServer.Controllers
 {
     public class AppsPublicController : Controller
     {
-        public AppsPublicController(AppsHelper appsHelper, 
-            InvoiceController invoiceController, 
-            CrowdfundHubStreamer crowdfundHubStreamer, UserManager<ApplicationUser> userManager)
+        public AppsPublicController(AppService AppService, 
+            InvoiceController invoiceController,
+            UserManager<ApplicationUser> userManager)
         {
-            _AppsHelper = appsHelper;
+            _AppService = AppService;
             _InvoiceController = invoiceController;
-            _CrowdfundHubStreamer = crowdfundHubStreamer;
             _UserManager = userManager;
         }
 
-        private AppsHelper _AppsHelper;
+        private AppService _AppService;
         private InvoiceController _InvoiceController;
-        private readonly CrowdfundHubStreamer _CrowdfundHubStreamer;
         private readonly UserManager<ApplicationUser> _UserManager;
 
         [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);
+            var app = await _AppService.GetApp(appId, AppType.PointOfSale);
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
 
-            var numberFormatInfo = _AppsHelper.Currencies.GetNumberFormatInfo(settings.Currency) ?? _AppsHelper.Currencies.GetNumberFormatInfo("USD");
+            var numberFormatInfo = _AppService.Currencies.GetNumberFormatInfo(settings.Currency) ?? _AppService.Currencies.GetNumberFormatInfo("USD");
             double step = Math.Pow(10, -(numberFormatInfo.CurrencyDecimalDigits));
 
             return View(new ViewPointOfSaleViewModel()
@@ -77,7 +73,7 @@ namespace BTCPayServer.Controllers
                     Prefixed = new[] { 0, 2 }.Contains(numberFormatInfo.CurrencyPositivePattern),
                     SymbolSpace = new[] { 2, 3 }.Contains(numberFormatInfo.CurrencyPositivePattern)
                 },
-                Items = _AppsHelper.Parse(settings.Template, settings.Currency),
+                Items = _AppService.Parse(settings.Template, settings.Currency),
                 ButtonText = settings.ButtonText,
                 CustomButtonText = settings.CustomButtonText,
                 CustomTipText = settings.CustomTipText,
@@ -90,17 +86,17 @@ namespace BTCPayServer.Controllers
         
         [HttpGet]
         [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(null)]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
         
         {
-            var app = await _AppsHelper.GetApp(appId, AppType.Crowdfund, true);
+            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
             
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<CrowdfundSettings>();
             
-            var isAdmin = await _AppsHelper.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
+            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
             
             var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency );
             if (!hasEnoughSettingsToLoad)
@@ -110,55 +106,55 @@ namespace BTCPayServer.Controllers
 
                 return NotFound("A Target Currency must be set for this app in order to be loadable.");
             }
-            if (settings.Enabled) return View(await _CrowdfundHubStreamer.GetCrowdfundInfo(appId));
+            if (settings.Enabled) return View(await _AppService.GetAppInfo(appId));
             if(!isAdmin)
                 return NotFound();
 
-            return View(await _CrowdfundHubStreamer.GetCrowdfundInfo(appId));
+            return View(await _AppService.GetAppInfo(appId));
         }
 
         [HttpPost]
         [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(null)]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request)
         {
-            var app = await _AppsHelper.GetApp(appId, AppType.Crowdfund, true);
-            
+            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
+
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<CrowdfundSettings>();
-            
-           
-            var isAdmin = await _AppsHelper.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
- 
+
+
+            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
+
             if (!settings.Enabled)
             {
-                if(!isAdmin)
+                if (!isAdmin)
                     return NotFound("Crowdfund is not currently active");
             }
 
-            var info = await _CrowdfundHubStreamer.GetCrowdfundInfo(appId);
-            
-            if(!isAdmin && 
-               
-               ((settings.StartDate.HasValue && DateTime.Now  < settings.StartDate) || 
-                (settings.EndDate.HasValue && DateTime.Now  > settings.EndDate) || 
-                (settings.EnforceTargetAmount && 
-                    (info.Info.PendingProgressPercentage.GetValueOrDefault(0) + 
-                     info.Info.ProgressPercentage.GetValueOrDefault(0)) >= 100)))
+            var info = (ViewCrowdfundViewModel)await _AppService.GetAppInfo(appId);
+
+            if (!isAdmin &&
+                ((settings.StartDate.HasValue && DateTime.Now < settings.StartDate) ||
+                 (settings.EndDate.HasValue && DateTime.Now > settings.EndDate) ||
+                 (settings.EnforceTargetAmount &&
+                  (info.Info.PendingProgressPercentage.GetValueOrDefault(0) +
+                   info.Info.ProgressPercentage.GetValueOrDefault(0)) >= 100)))
             {
                 return NotFound("Crowdfund is not currently active");
             }
 
-            var store = await _AppsHelper.GetStore(app);
-            var title =  settings.Title;
+            var store = await _AppService.GetStore(app);
+            var title = settings.Title;
             var price = request.Amount;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(request.ChoiceKey))
             {
-                var choices = _AppsHelper.Parse(settings.PerksTemplate, settings.TargetCurrency);
-                var choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
+                var choices = _AppService.Parse(settings.PerksTemplate, settings.TargetCurrency);
+                choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
                 if (choice == null)
                     return NotFound("Incorrect option provided");
                 title = choice.Title;
@@ -168,41 +164,46 @@ namespace BTCPayServer.Controllers
             }
 
             if (!isAdmin && (settings.EnforceTargetAmount && info.TargetAmount.HasValue && price >
-                (info.TargetAmount - (info.Info.CurrentAmount + info.Info.CurrentPendingAmount))))
+                             (info.TargetAmount - (info.Info.CurrentAmount + info.Info.CurrentPendingAmount))))
             {
                 return NotFound("Contribution Amount is more than is currently allowed.");
             }
-            
+
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
-            var invoice = await _InvoiceController.CreateInvoiceCore(new Invoice()
+            try
             {
-                OrderId = $"{CrowdfundHubStreamer.CrowdfundInvoiceOrderIdPrefix}{appId}",
-                Currency = settings.TargetCurrency,
-                ItemCode = request.ChoiceKey ?? string.Empty,
-                ItemDesc = title,
-                BuyerEmail = request.Email,
-                Price = price,
-                NotificationURL = settings.NotificationUrl,
-                FullNotifications = true,
-                ExtendedNotifications = true,
-                RedirectURL = request.RedirectUrl ?? Request.GetDisplayUrl(),
-                
-                
-            }, store, HttpContext.Request.GetAbsoluteRoot());
-            if (request.RedirectToCheckout)
-            {
-                return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
-                    new {invoiceId = invoice.Data.Id});
+                var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
+                {
+                    Currency = settings.TargetCurrency,
+                    ItemCode = request.ChoiceKey ?? string.Empty,
+                    ItemDesc = title,
+                    BuyerEmail = request.Email,
+                    Price = price,
+                    NotificationURL = settings.NotificationUrl,
+                    FullNotifications = true,
+                    ExtendedNotifications = true,
+                    RedirectURL = request.RedirectUrl ?? Request.GetDisplayUrl()
+                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string> { AppService.GetAppInternalTag(appId) });
+                if (request.RedirectToCheckout)
+                {
+                    return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
+                        new {invoiceId = invoice.Data.Id});
+                }
+                else
+                {
+                    return Ok(invoice.Data.Id);
+                }
             }
-            else
+            catch (BitpayHttpException e)
             {
-                return Ok(invoice.Data.Id);
+                return BadRequest(e.Message);
             }
+            
         }
-        
 
         [HttpPost]
         [Route("/apps/{appId}/pos")]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ViewPointOfSale(string appId,
@@ -211,9 +212,10 @@ namespace BTCPayServer.Controllers
                                                         string orderId,
                                                         string notificationUrl,
                                                         string redirectUrl,
-                                                        string choiceKey)
+                                                        string choiceKey,
+                                                        string posData = null)
         {
-            var app = await _AppsHelper.GetApp(appId, AppType.PointOfSale);
+            var app = await _AppService.GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
             {
                 return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
@@ -227,10 +229,11 @@ namespace BTCPayServer.Controllers
             }
             string title = null;
             var price = 0.0m;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(choiceKey))
             {
-                var choices = _AppsHelper.Parse(settings.Template, settings.Currency);
-                var choice = choices.FirstOrDefault(c => c.Id == choiceKey);
+                var choices = _AppService.Parse(settings.Template, settings.Currency);
+                choice = choices.FirstOrDefault(c => c.Id == choiceKey);
                 if (choice == null)
                     return NotFound();
                 title = choice.Title;
@@ -245,11 +248,11 @@ namespace BTCPayServer.Controllers
                 price = amount;
                 title = settings.Title;
             }
-            var store = await _AppsHelper.GetStore(app);
+            var store = await _AppService.GetStore(app);
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
-            var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
+            var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
             {
-                ItemCode = choiceKey ?? string.Empty,
+                ItemCode = choice?.Id,
                 ItemDesc = title,
                 Currency = settings.Currency,
                 Price = price,
@@ -258,6 +261,7 @@ namespace BTCPayServer.Controllers
                 NotificationURL = notificationUrl,
                 RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }
@@ -268,218 +272,4 @@ namespace BTCPayServer.Controllers
             return _UserManager.GetUserId(User);
         }
     }
-
-    public class AppsHelper
-    {
-        ApplicationDbContextFactory _ContextFactory;
-        CurrencyNameTable _Currencies;
-        private HtmlSanitizer _HtmlSanitizer;
-        public CurrencyNameTable Currencies => _Currencies;
-        public AppsHelper(ApplicationDbContextFactory contextFactory, CurrencyNameTable currencies)
-        {
-            _ContextFactory = contextFactory;
-            _Currencies = currencies;
-            ConfigureSanitizer();
-        }
-        
-        private void ConfigureSanitizer()
-        {
-            
-            _HtmlSanitizer = new HtmlSanitizer();
-
-
-            _HtmlSanitizer.RemovingAtRule += (sender, args) =>
-            {
-                Debug.WriteLine("");
-                
-            };
-            _HtmlSanitizer.RemovingTag += (sender, args) =>
-            {
-                Debug.WriteLine("");
-                if (args.Tag.TagName.Equals("img", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    if (!args.Tag.ClassList.Contains("img-fluid"))
-                    {
-                        args.Tag.ClassList.Add("img-fluid");
-                    }
-
-                    args.Cancel = true;
-                }
-            };
-            
-            _HtmlSanitizer.RemovingAttribute += (sender, args) =>
-            {
-                if (args.Tag.TagName.Equals("img",StringComparison.InvariantCultureIgnoreCase) &&  
-                    args.Attribute.Name.Equals( "src", StringComparison.InvariantCultureIgnoreCase) && 
-                    args.Reason == RemoveReason.NotAllowedUrlValue)
-                {
-                    args.Cancel = true;
-                }
-                Debug.WriteLine("");
-                
-            };
-            _HtmlSanitizer.RemovingStyle += (sender, args) => { args.Cancel = true; };
-            _HtmlSanitizer.AllowedAttributes.Add("class");
-            _HtmlSanitizer.AllowedTags.Add("iframe");
-            _HtmlSanitizer.AllowedTags.Remove("img");
-            _HtmlSanitizer.AllowedAttributes.Add("webkitallowfullscreen");
-            _HtmlSanitizer.AllowedAttributes.Add("allowfullscreen");
-        }
-
-        public string Sanitize(string raw)
-        {
-            return _HtmlSanitizer.Sanitize(raw);
-        }
-        
-        public async Task<StoreData[]> GetOwnedStores(string userId)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                return await ctx.UserStore
-                    .Where(us => us.ApplicationUserId == userId && us.Role == StoreRoles.Owner)
-                    .Select(u => u.StoreData)
-                    .ToArrayAsync();
-            }
-        }
-
-        public async Task<bool> DeleteApp(AppData appData)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                ctx.Apps.Add(appData);
-                ctx.Entry<AppData>(appData).State = EntityState.Deleted;
-                return await ctx.SaveChangesAsync() == 1;
-            }
-        }
-
-        public async Task<ListAppsViewModel.ListAppViewModel[]> GetAllApps(string userId, bool allowNoUser = false)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                return await ctx.UserStore
-                    .Where(us => (allowNoUser && string.IsNullOrEmpty(userId)  ) || us.ApplicationUserId == userId)
-                    .Join(ctx.Apps, us => us.StoreDataId, app => app.StoreDataId,
-                        (us, app) =>
-                            new ListAppsViewModel.ListAppViewModel()
-                            {
-                                IsOwner = us.Role == StoreRoles.Owner,
-                                StoreId = us.StoreDataId,
-                                StoreName = us.StoreData.StoreName,
-                                AppName = app.Name,
-                                AppType = app.AppType,
-                                Id = app.Id
-                            })
-                    .ToArrayAsync();
-            }
-        }
-
-
-        public async Task<AppData> GetApp(string appId, AppType appType, bool includeStore = false)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                var query = ctx.Apps
-                    .Where(us => us.Id == appId &&
-                                 us.AppType == appType.ToString());
-
-                if (includeStore)
-                {
-                    query = query.Include(data => data.StoreData);
-                }
-                return await query.FirstOrDefaultAsync();
-            }
-        }
-
-        public async Task<StoreData> GetStore(AppData app)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                return await ctx.Stores.FirstOrDefaultAsync(s => s.Id == app.StoreDataId);
-            }
-        }
-
-
-        public ViewPointOfSaleViewModel.Item[] Parse(string template, string currency)
-        {
-            if (string.IsNullOrWhiteSpace(template))
-                return Array.Empty<ViewPointOfSaleViewModel.Item>();
-            var input = new StringReader(template);
-            YamlStream stream = new YamlStream();
-            stream.Load(input);
-            var root = (YamlMappingNode)stream.Documents[0].RootNode;
-            return root
-                .Children
-                .Select(kv => new PosHolder { Key = (kv.Key as YamlScalarNode)?.Value, Value = kv.Value as YamlMappingNode })
-                .Where(kv => kv.Value != null)
-                .Select(c => new ViewPointOfSaleViewModel.Item()
-                {
-                    Description = Sanitize(c.GetDetailString("description")),
-                    Id = c.Key,
-                    Image = Sanitize(c.GetDetailString("image")),
-                    Title = Sanitize(c.GetDetailString("title") ?? c.Key),
-                    Price = c.GetDetail("price")
-                             .Select(cc => new ViewPointOfSaleViewModel.Item.ItemPrice()
-                             {
-                                 Value = decimal.Parse(cc.Value.Value, CultureInfo.InvariantCulture),
-                                 Formatted = FormatCurrency(cc.Value.Value, currency)
-                             }).Single(),
-                    Custom = c.GetDetailString("custom") == "true"
-                })
-                .ToArray();
-        }
-
-        private class PosHolder
-        {
-            public string Key { get; set; }
-            public YamlMappingNode Value { get; set; }
-
-            public IEnumerable<PosScalar> GetDetail(string field)
-            {
-                var res = Value.Children
-                                 .Where(kv => kv.Value != null)
-                                 .Select(kv => new PosScalar { Key = (kv.Key as YamlScalarNode)?.Value, Value = kv.Value as YamlScalarNode })
-                                 .Where(cc => cc.Key == field);
-                return res;
-            }
-
-            public string GetDetailString(string field)
-            {
-                
-                return GetDetail(field).FirstOrDefault()?.Value?.Value;
-            }
-        }
-        private class PosScalar
-        {
-            public string Key { get; set; }
-            public YamlScalarNode Value { get; set; }
-        }
-
-        public string FormatCurrency(string price, string currency)
-        {
-            return decimal.Parse(price, CultureInfo.InvariantCulture).ToString("C", _Currencies.GetCurrencyProvider(currency));
-        }
-
-        public CurrencyData GetCurrencyData(string currency, bool useFallback)
-        {
-            return _Currencies.GetCurrencyData(currency, useFallback);
-        }
-        public async Task<AppData> GetAppDataIfOwner(string userId, string appId, AppType? type = null)
-        {
-            if (userId == null || appId == null)
-                return null;
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                var app = await ctx.UserStore
-                                .Where(us => us.ApplicationUserId == userId && us.Role == StoreRoles.Owner)
-                                .SelectMany(us => us.StoreData.Apps.Where(a => a.Id == appId))
-                   .FirstOrDefaultAsync();
-                if (app == null)
-                    return null;
-                if (type != null && type.Value.ToString() != app.AppType)
-                    return null;
-                return app;
-            }
-        }
-        
-    }
 }

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -12,7 +12,6 @@ using NBitpayClient;
 
 namespace BTCPayServer.Controllers
 {
-    [EnableCors("BitpayAPI")]
     [BitpayAPIConstraint]
     [Authorize(Policies.CanCreateInvoice.Key, AuthenticationSchemes = Policies.BitpayAuthentication)]
     public class InvoiceControllerAPI : Controller
@@ -33,8 +32,10 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [Route("invoices")]
         [MediaTypeConstraint("application/json")]
-        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] Invoice invoice)
+        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] CreateInvoiceRequest invoice)
         {
+            if (invoice == null)
+                throw new BitpayHttpException(400, "Invalid invoice");
             return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot());
         }
 

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Services.Invoices.Export;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore.Internal;
 using NBitcoin;
 using NBitpayClient;
 using NBXplorer;
@@ -64,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,
@@ -80,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)
@@ -188,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();
 
@@ -211,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)
@@ -244,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);
@@ -278,7 +277,6 @@ namespace BTCPayServer.Controllers
                 PaymentMethodName = GetDisplayName(paymentMethodId, network),
                 CryptoImage = GetImage(paymentMethodId, network),
                 IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
-                ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
                 OrderId = invoice.OrderId,
                 InvoiceId = invoice.Id,
                 DefaultLang = storeBlob.DefaultLang ?? "en",
@@ -369,9 +367,12 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Route("i/{invoiceId}/status")]
         [Route("i/{invoiceId}/{paymentMethodId}/status")]
+        [Route("invoice/{invoiceId}/status")]
+        [Route("invoice/{invoiceId}/{paymentMethodId}/status")]
+        [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);
@@ -379,6 +380,10 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("i/{invoiceId}/status/ws")]
+        [Route("i/{invoiceId}/{paymentMethodId}/status/ws")]
+        [Route("invoice/{invoiceId}/status/ws")]
+        [Route("invoice/{invoiceId}/{paymentMethodId}/status")]
+        [Route("invoice/status/ws")]
         public async Task<IActionResult> GetStatusWebSocket(string invoiceId)
         {
             if (!HttpContext.WebSockets.IsWebSocketRequest)
@@ -424,6 +429,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("i/{invoiceId}/UpdateCustomer")]
+        [Route("invoice/UpdateCustomer")]
         public async Task<IActionResult> UpdateCustomer(string invoiceId, [FromBody]UpdateCustomerModel data)
         {
             if (!ModelState.IsValid)
@@ -452,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();
@@ -463,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()
                 });
@@ -571,7 +578,7 @@ namespace BTCPayServer.Controllers
 
             try
             {
-                var result = await CreateInvoiceCore(new Invoice()
+                var result = await CreateInvoiceCore(new CreateInvoiceRequest()
                 {
                     Price = model.Amount.Value,
                     Currency = model.Currency,
@@ -653,13 +660,13 @@ namespace BTCPayServer.Controllers
             if (newState == "invalid")
             {
                 await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
-                _EventAggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1008, InvoiceEvent.MarkedInvalid));
+                _EventAggregator.Publish(new InvoiceEvent(invoice, 1008, InvoiceEvent.MarkedInvalid));
                 StatusMessage = "Invoice marked invalid";
             }
             else if(newState == "complete")
             {
                 await _InvoiceRepository.UpdatePaidInvoiceToComplete(invoiceId);
-                _EventAggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 2008, InvoiceEvent.MarkedCompleted));
+                _EventAggregator.Publish(new InvoiceEvent(invoice, 2008, InvoiceEvent.MarkedCompleted));
                 StatusMessage = "Invoice marked complete";
             }
             return RedirectToAction(nameof(ListInvoices));
@@ -679,9 +686,9 @@ namespace BTCPayServer.Controllers
 
         public class PosDataParser
         {
-            public static Dictionary<string, string> ParsePosData(string posData)
+            public static Dictionary<string, object> ParsePosData(string posData)
             {
-                var result = new Dictionary<string,string>();
+                var result = new Dictionary<string,object>();
                 if (string.IsNullOrEmpty(posData))
                 {
                     return result;
@@ -689,7 +696,6 @@ namespace BTCPayServer.Controllers
             
                 try
                 {
-                
                     var jObject =JObject.Parse(posData);
                     foreach (var item in jObject)
                     {
@@ -697,7 +703,14 @@ namespace BTCPayServer.Controllers
                         switch (item.Value.Type)
                         {
                             case JTokenType.Array:
-                                result.Add(item.Key, string.Join(',', item.Value.AsEnumerable()));
+                                var items = item.Value.AsEnumerable().ToList();
+                                for (var i = 0; i < items.Count(); i++)
+                                {
+                                    result.Add($"{item.Key}[{i}]", ParsePosData(items[i].ToString()));
+                                }
+                                break;
+                            case JTokenType.Object:
+                                result.Add(item.Key, ParsePosData(item.Value.ToString()));
                                 break;
                             default:
                                 result.Add(item.Key, item.Value.ToString());

BTCPayServer/Controllers/InvoiceController.cs

@@ -11,6 +11,7 @@ using BTCPayServer.Models;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
+using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
@@ -61,7 +62,7 @@ namespace BTCPayServer.Controllers
         }
 
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null)
         {
             if (!store.HasClaim(Policies.CanCreateInvoice.Key))
                 throw new UnauthorizedAccessException();
@@ -71,10 +72,9 @@ namespace BTCPayServer.Controllers
             {
                 InvoiceTime = DateTimeOffset.UtcNow
             };
+
+            var getAppsTaggingStore = _InvoiceRepository.GetAppsTaggingStore(store.Id);
             var storeBlob = store.GetStoreBlob();
-            Uri notificationUri = Uri.IsWellFormedUriString(invoice.NotificationURL, UriKind.Absolute) ? new Uri(invoice.NotificationURL, UriKind.Absolute) : null;
-            if (notificationUri == null || (notificationUri.Scheme != "http" && notificationUri.Scheme != "https")) //TODO: Filer non routable addresses ?
-                notificationUri = null;
             EmailAddressAttribute emailValidator = new EmailAddressAttribute();
             entity.ExpirationTime = entity.InvoiceTime.AddMinutes(storeBlob.InvoiceExpiration);
             entity.MonitoringExpiration = entity.ExpirationTime + TimeSpan.FromMinutes(storeBlob.MonitoringExpiration);
@@ -82,10 +82,17 @@ namespace BTCPayServer.Controllers
             entity.ServerUrl = serverUrl;
             entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
             entity.ExtendedNotifications = invoice.ExtendedNotifications;
-            entity.NotificationURL = notificationUri?.AbsoluteUri;
+            if (invoice.NotificationURL != null &&
+                Uri.TryCreate(invoice.NotificationURL, UriKind.Absolute, out var notificationUri) &&
+                (notificationUri.Scheme == "http" || notificationUri.Scheme == "https"))
+            {
+                entity.NotificationURL = notificationUri.AbsoluteUri;
+            }
             entity.NotificationEmail = invoice.NotificationEmail;
-            entity.BuyerInformation = Map<Invoice, BuyerInformation>(invoice);
+            entity.BuyerInformation = Map<CreateInvoiceRequest, BuyerInformation>(invoice);
             entity.PaymentTolerance = storeBlob.PaymentTolerance;
+            if (additionalTags != null)
+                entity.InternalTags.AddRange(additionalTags);
             //Another way of passing buyer info to support
             FillBuyerInfo(invoice.Buyer, entity.BuyerInformation);
             if (entity?.BuyerInformation?.BuyerEmail != null)
@@ -95,13 +102,19 @@ namespace BTCPayServer.Controllers
                 entity.RefundMail = entity.BuyerInformation.BuyerEmail;
             }
 
+            var taxIncluded = invoice.TaxIncluded.HasValue ? invoice.TaxIncluded.Value : 0m;
+            
             var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(invoice.Currency, false);
             if (currencyInfo != null)
             {
                 invoice.Price = Math.Round(invoice.Price, currencyInfo.CurrencyDecimalDigits);
+                invoice.TaxIncluded = Math.Round(taxIncluded, currencyInfo.CurrencyDecimalDigits);
             }
             invoice.Price = Math.Max(0.0m, invoice.Price);
-            entity.ProductInformation = Map<Invoice, ProductInformation>(invoice);
+            invoice.TaxIncluded = Math.Max(0.0m, taxIncluded);
+            invoice.TaxIncluded = Math.Min(taxIncluded, invoice.Price);
+
+            entity.ProductInformation = Map<CreateInvoiceRequest, ProductInformation>(invoice);
 
 
             entity.RedirectURL = invoice.RedirectURL ?? store.StoreWebsite;
@@ -114,6 +127,17 @@ namespace BTCPayServer.Controllers
             HashSet<CurrencyPair> currencyPairsToFetch = new HashSet<CurrencyPair>();
             var rules = storeBlob.GetRateRules(_NetworkProvider);
             var excludeFilter = storeBlob.GetExcludedPaymentMethods(); // Here we can compose filters from other origin with PaymentFilter.Any()
+
+            if (invoice.SupportedTransactionCurrencies != null && invoice.SupportedTransactionCurrencies.Count != 0)
+            {
+                var supportedTransactionCurrencies = invoice.SupportedTransactionCurrencies
+                                                            .Where(c => c.Value.Enabled)
+                                                            .Select(c => PaymentMethodId.TryParse(c.Key, out var p) ? p : null)
+                                                            .ToHashSet();
+                excludeFilter = PaymentFilter.Or(excludeFilter, 
+                                                 PaymentFilter.Where(p => !supportedTransactionCurrencies.Contains(p)));
+            }
+
             foreach (var network in store.GetSupportedPaymentMethods(_NetworkProvider)
                                                 .Where(s => !excludeFilter.Match(s.PaymentId))
                                                 .Select(c => _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode))
@@ -166,9 +190,15 @@ namespace BTCPayServer.Controllers
             entity.SetSupportedPaymentMethods(supported);
             entity.SetPaymentMethods(paymentMethods);
             entity.PosData = invoice.PosData;
+
+            foreach (var app in await getAppsTaggingStore)
+            {
+                entity.InternalTags.Add(AppService.GetAppInternalTag(app.Id));
+            }
+
             entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, logs, _NetworkProvider);
             await fetchingAll;
-            _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, InvoiceEvent.Created));
+            _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, InvoiceEvent.Created));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }

BTCPayServer/Controllers/PublicController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Filters;
+using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Cors;
@@ -45,7 +46,7 @@ namespace BTCPayServer.Controllers
             if (!ModelState.IsValid)
                 return View();
 
-            var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
+            var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
             {
                 Price = model.Price,
                 Currency = model.Currency,

BTCPayServer/Controllers/PublicLightningNodeInfoController.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
+using BTCPayServer.Filters;
 using BTCPayServer.Lightning;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
@@ -30,6 +31,7 @@ namespace BTCPayServer.Controllers
         }
         
         [HttpGet]
+        [XFrameOptions(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ShowLightningNodeInfo(string storeId, string cryptoCode)
         {
             var store = await _StoreRepository.FindStore(storeId);

BTCPayServer/Controllers/RateController.cs

@@ -12,11 +12,13 @@ using BTCPayServer.Rating;
 using Newtonsoft.Json;
 using Microsoft.AspNetCore.Authorization;
 using BTCPayServer.Authentication;
+using Microsoft.AspNetCore.Cors;
 
 namespace BTCPayServer.Controllers
 {
     [Authorize(AuthenticationSchemes = Security.Policies.BitpayAuthentication)]
     [AllowAnonymous]
+    [EnableCors(CorsPolicies.All)]
     public class RateController : Controller
     {
         RateFetcher _RateProviderFactory;
@@ -139,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/ServerController.cs

@@ -27,6 +27,7 @@ using Renci.SshNet;
 using BTCPayServer.Logging;
 using BTCPayServer.Lightning;
 using BTCPayServer.Configuration.External;
+using System.Runtime.CompilerServices;
 
 namespace BTCPayServer.Controllers
 {
@@ -170,7 +171,7 @@ namespace BTCPayServer.Controllers
                 vm.DNSDomain = null;
             return View(vm);
         }
-        
+
         [Route("server/maintenance")]
         [HttpPost]
         public async Task<IActionResult> Maintenance(MaintenanceViewModel vm, string command)
@@ -208,8 +209,8 @@ namespace BTCPayServer.Controllers
                     {
                         builder.Scheme = this.Request.Scheme;
                         builder.Host = vm.DNSDomain;
-                        var addresses1 = Dns.GetHostAddressesAsync(this.Request.Host.Host);
-                        var addresses2 = Dns.GetHostAddressesAsync(vm.DNSDomain);
+                        var addresses1 = GetAddressAsync(this.Request.Host.Host);
+                        var addresses2 = GetAddressAsync(vm.DNSDomain);
                         await Task.WhenAll(addresses1, addresses2);
 
                         var addressesSet = addresses1.GetAwaiter().GetResult().Select(c => c.ToString()).ToHashSet();
@@ -253,6 +254,13 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(Maintenance));
         }
 
+        private Task<IPAddress[]> GetAddressAsync(string domainOrIP)
+        {
+            if (IPAddress.TryParse(domainOrIP, out var ip))
+                return Task.FromResult(new[] { ip });
+            return Dns.GetHostAddressesAsync(domainOrIP);
+        }
+
         public static string RunId = Encoders.Hex.EncodeData(NBitcoin.RandomUtils.GetBytes(32));
         [HttpGet]
         [Route("runid")]
@@ -345,22 +353,27 @@ namespace BTCPayServer.Controllers
             var user = await _UserManager.FindByIdAsync(userId);
             if (user == null)
                 return NotFound();
-            var roles = await _UserManager.GetRolesAsync(user);
-            var isAdmin = IsAdmin(roles);
-            bool updated = false;
 
-            if (isAdmin != viewModel.IsAdmin)
+            viewModel.StatusMessage = "";
+
+            var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+            if (!viewModel.IsAdmin && admins.Count == 1)
+            {
+                viewModel.StatusMessage = "This is the only Admin, so their role can't be removed until another Admin is added.";
+                return View(viewModel); // return
+            }
+
+            var roles = await _UserManager.GetRolesAsync(user);
+            if (viewModel.IsAdmin != IsAdmin(roles))
             {
                 if (viewModel.IsAdmin)
                     await _UserManager.AddToRoleAsync(user, Roles.ServerAdmin);
                 else
                     await _UserManager.RemoveFromRoleAsync(user, Roles.ServerAdmin);
-                updated = true;
-            }
-            if (updated)
-            {
+
                 viewModel.StatusMessage = "User successfully updated";
             }
+
             return View(viewModel);
         }
 
@@ -371,12 +384,29 @@ namespace BTCPayServer.Controllers
             var user = userId == null ? null : await _UserManager.FindByIdAsync(userId);
             if (user == null)
                 return NotFound();
-            return View("Confirm", new ConfirmModel()
+
+            var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+            if (admins.Count == 1)
             {
-                Title = "Delete user " + user.Email,
-                Description = "This user will be permanently deleted",
-                Action = "Delete"
-            });
+                // return
+                return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
+                    "This is the last Admin, so it can't be removed"));
+            }
+
+
+            var roles = await _UserManager.GetRolesAsync(user);
+            if (IsAdmin(roles))
+            {
+                return View("Confirm", new ConfirmModel("Delete Admin " + user.Email,
+                    "Are you sure you want to delete this Admin and delete all accounts, users and data associated with the server account?",
+                    "Delete"));
+            }
+            else
+            {
+                return View("Confirm", new ConfirmModel("Delete user " + user.Email,
+                                    "This user will be permanently deleted",
+                                    "Delete"));
+            }
         }
 
         [Route("server/users/{userId}/delete")]
@@ -445,7 +475,17 @@ namespace BTCPayServer.Controllers
                     {
                         Crypto = cryptoCode,
                         Type = "Spark server",
-                        Action = nameof(SparkServices),
+                        Action = nameof(SparkService),
+                        Index = i++,
+                    });
+                }
+                foreach (var rtlService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalRTL>(cryptoCode))
+                {
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
+                    {
+                        Crypto = cryptoCode,
+                        Type = "Ride the lightning server",
+                        Action = nameof(RTLService),
                         Index = i++,
                     });
                 }
@@ -460,7 +500,7 @@ namespace BTCPayServer.Controllers
                     });
                 }
             }
-            foreach(var externalService in _Options.ExternalServices)
+            foreach (var externalService in _Options.ExternalServices)
             {
                 result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
@@ -468,7 +508,7 @@ namespace BTCPayServer.Controllers
                     Link = this.Request.GetRelativePathOrAbsolute(externalService.Value)
                 });
             }
-            if(_Options.SSHSettings != null)
+            if (_Options.SSHSettings != null)
             {
                 result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
@@ -519,21 +559,31 @@ namespace BTCPayServer.Controllers
         }
 
         [Route("server/services/spark/{cryptoCode}/{index}")]
-        public async Task<IActionResult> SparkServices(string cryptoCode, int index, bool showQR = false)
+        public async Task<IActionResult> SparkService(string cryptoCode, int index, bool showQR = false)
+        {
+            return await LightningWalletServicesCore<ExternalSpark>(cryptoCode, showQR, "Spark Wallet");
+        }
+        [Route("server/services/rtl/{cryptoCode}/{index}")]
+        public async Task<IActionResult> RTLService(string cryptoCode, int index, bool showQR = false)
+        {
+            return await LightningWalletServicesCore<ExternalRTL>(cryptoCode, showQR, "Ride the Lightning Wallet");
+        }
+        private async Task<IActionResult> LightningWalletServicesCore<T>(string cryptoCode, bool showQR, string walletName) where T : ExternalService, IAccessKeyService
         {
             if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
             {
                 StatusMessage = $"Error: {cryptoCode} is not fully synched";
                 return RedirectToAction(nameof(Services));
             }
-            var spark = _Options.ExternalServicesByCryptoCode.GetServices<ExternalSpark>(cryptoCode).Select(c => c.ConnectionString).FirstOrDefault();
-            if(spark == null)
+            var spark = _Options.ExternalServicesByCryptoCode.GetServices<T>(cryptoCode).Select(c => c.ConnectionString).FirstOrDefault();
+            if (spark == null)
             {
                 return NotFound();
             }
 
-            SparkServicesViewModel vm = new SparkServicesViewModel();
+            LightningWalletServices vm = new LightningWalletServices();
             vm.ShowQR = showQR;
+            vm.WalletName = walletName;
             try
             {
                 var cookie = (spark.CookeFile == "fake"
@@ -541,15 +591,15 @@ namespace BTCPayServer.Controllers
                             : await System.IO.File.ReadAllTextAsync(spark.CookeFile)).Split(':');
                 if (cookie.Length >= 3)
                 {
-                    vm.SparkLink = $"{spark.Server.AbsoluteUri}?access-key={cookie[2]}";
+                    vm.ServiceLink = $"{spark.Server.AbsoluteUri}?access-key={cookie[2]}";
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 StatusMessage = $"Error: {ex.Message}";
                 return RedirectToAction(nameof(Services));
             }
-            return View(vm);
+            return View("LightningWalletServices", vm);
         }
 
         [Route("server/services/lnd/{cryptoCode}/{index}")]
@@ -571,7 +621,7 @@ namespace BTCPayServer.Controllers
                 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)
+            else if (external.ConnectionType == LightningConnectionType.LndREST)
             {
                 model.Uri = external.BaseUri.AbsoluteUri;
                 model.ConnectionType = "REST";
@@ -785,7 +835,8 @@ namespace BTCPayServer.Controllers
                     .ToList();
                 vm.LogFileOffset = offset;
 
-                if (string.IsNullOrEmpty(file)) return View("Logs", vm);
+                if (string.IsNullOrEmpty(file))
+                    return View("Logs", vm);
                 vm.Log = "";
                 var path = Path.Combine(di.FullName, file);
                 try

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/Crowdfund/CrowdfundHubStreamer.cs

@@ -1,371 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-using BTCPayServer.Data;
-using BTCPayServer.Events;
-using BTCPayServer.Hubs;
-using BTCPayServer.Models.AppViewModels;
-using BTCPayServer.Payments;
-using BTCPayServer.Rating;
-using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Invoices;
-using BTCPayServer.Services.Rates;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
-using NBitcoin;
-
-namespace BTCPayServer.Crowdfund
-{
-    public class CrowdfundHubStreamer: IDisposable
-    {
-        public const string CrowdfundInvoiceOrderIdPrefix = "crowdfund-app_";
-        private readonly EventAggregator _EventAggregator;
-        private readonly IHubContext<CrowdfundHub> _HubContext;
-        private readonly IMemoryCache _MemoryCache;
-        private readonly AppsHelper _AppsHelper;
-        private readonly RateFetcher _RateFetcher;
-        private readonly BTCPayNetworkProvider _BtcPayNetworkProvider;
-        private readonly InvoiceRepository _InvoiceRepository;
-        private readonly ILogger<CrowdfundHubStreamer> _Logger;
-
-        private readonly ConcurrentDictionary<string,(string appId, bool useAllStoreInvoices,bool useInvoiceAmount)> _QuickAppInvoiceLookup = 
-            new ConcurrentDictionary<string, (string appId, bool useAllStoreInvoices, bool useInvoiceAmount)>();
-
-        private List<IEventAggregatorSubscription> _Subscriptions;
-
-        public CrowdfundHubStreamer(EventAggregator eventAggregator, 
-            IHubContext<CrowdfundHub> hubContext, 
-            IMemoryCache memoryCache,
-            AppsHelper appsHelper, 
-            RateFetcher rateFetcher,
-            BTCPayNetworkProvider btcPayNetworkProvider,
-            InvoiceRepository invoiceRepository,
-            ILogger<CrowdfundHubStreamer> logger)
-        {
-            _EventAggregator = eventAggregator;
-            _HubContext = hubContext;
-            _MemoryCache = memoryCache;
-            _AppsHelper = appsHelper;
-            _RateFetcher = rateFetcher;
-            _BtcPayNetworkProvider = btcPayNetworkProvider;
-            _InvoiceRepository = invoiceRepository;
-            _Logger = logger;
-#pragma warning disable 4014
-            InitLookup();
-#pragma warning restore 4014
-            SubscribeToEvents();
-        }
-
-        private async Task InitLookup()
-        {
-          var apps =  await _AppsHelper.GetAllApps(null, true);
-          apps = apps.Where(model => Enum.Parse<AppType>(model.AppType) == AppType.Crowdfund).ToArray();
-          var tasks = new List<Task>();
-          tasks.AddRange(apps.Select(app => Task.Run(async () =>
-          {
-              var fullApp = await _AppsHelper.GetApp(app.Id, AppType.Crowdfund, false);
-              var settings = fullApp.GetSettings<AppsController.CrowdfundSettings>();
-              UpdateLookup(app.Id, app.StoreId, settings);
-          })));
-          await Task.WhenAll(tasks);
-        }
-
-        private void UpdateLookup(string appId, string storeId, AppsController.CrowdfundSettings settings)
-        {
-            _QuickAppInvoiceLookup.AddOrReplace(storeId,
-                (
-                    appId: appId,
-                    useAllStoreInvoices: settings?.UseAllStoreInvoices ?? false,
-                    useInvoiceAmount: settings?.UseInvoiceAmount ?? false
-                ));
-        }
-
-        public Task<ViewCrowdfundViewModel> GetCrowdfundInfo(string appId)
-        {
-            return _MemoryCache.GetOrCreateAsync(GetCacheKey(appId), async entry =>
-            {           
-                _Logger.LogInformation($"GetCrowdfundInfo {appId}");
-                var app = await _AppsHelper.GetApp(appId, AppType.Crowdfund, true);
-                var result = await GetInfo(app);
-                entry.SetValue(result);
-                
-                TimeSpan? expire = null;
-
-                if (result.StartDate.HasValue && result.StartDate < DateTime.Now)
-                {
-                    expire = result.StartDate.Value.Subtract(DateTime.Now);
-                }
-                else if (result.EndDate.HasValue && result.EndDate > DateTime.Now)
-                {
-                    expire = result.EndDate.Value.Subtract(DateTime.Now);
-                }
-                if(!expire.HasValue || expire?.TotalMinutes > 5 ||  expire?.TotalMilliseconds <= 0)
-                {
-                    expire = TimeSpan.FromMinutes(5);
-                }
-
-                entry.AbsoluteExpirationRelativeToNow = expire;
-                return result;
-            });
-        }
-
-        private void SubscribeToEvents()
-        {
-            _Subscriptions = new List<IEventAggregatorSubscription>()
-            {
-                _EventAggregator.Subscribe<InvoiceEvent>(OnInvoiceEvent),
-                _EventAggregator.Subscribe<AppsController.CrowdfundAppUpdated>(updated =>
-                {
-                    UpdateLookup(updated.AppId, updated.StoreId, updated.Settings);
-                    InvalidateCacheForApp(updated.AppId);
-                })
-            };
-        }
-
-        private string GetCacheKey(string appId)
-        {
-            return $"{CrowdfundInvoiceOrderIdPrefix}:{appId}";
-        }
-
-        private void OnInvoiceEvent(InvoiceEvent invoiceEvent)
-        {
-            if (!_QuickAppInvoiceLookup.TryGetValue(invoiceEvent.Invoice.StoreId, out var quickLookup) ||
-                (!quickLookup.useAllStoreInvoices && 
-                 !string.IsNullOrEmpty(invoiceEvent.Invoice.OrderId) &&
-                !invoiceEvent.Invoice.OrderId.Equals($"{CrowdfundInvoiceOrderIdPrefix}{quickLookup.appId}", StringComparison.InvariantCulture)
-                ))
-            {
-                return;
-            }
-            
-            switch (invoiceEvent.Name)
-            {
-                case InvoiceEvent.ReceivedPayment:
-                    var data = invoiceEvent.Payment.GetCryptoPaymentData();
-                    _HubContext.Clients.Group(quickLookup.appId).SendCoreAsync(CrowdfundHub.PaymentReceived, new object[]
-                    {
-                        data.GetValue(), 
-                        invoiceEvent.Payment.GetCryptoCode(), 
-                        Enum.GetName(typeof(PaymentTypes), 
-                            invoiceEvent.Payment.GetPaymentMethodId().PaymentType)
-                    } );
-                    _Logger.LogInformation($"App {quickLookup.appId}: Received Payment");
-                    InvalidateCacheForApp(quickLookup.appId);
-                    break;
-                case InvoiceEvent.Created:
-                case InvoiceEvent.MarkedInvalid:
-                case InvoiceEvent.MarkedCompleted:
-                    if (quickLookup.useInvoiceAmount)
-                    {
-                        InvalidateCacheForApp(quickLookup.appId);
-                    }
-                    break;
-                case InvoiceEvent.Completed:
-                    InvalidateCacheForApp(quickLookup.appId);
-                    break;
-            }
-        }
-
-        private void InvalidateCacheForApp(string appId)
-        {
-            _Logger.LogInformation($"App {appId} cache invalidated");
-            _MemoryCache.Remove(GetCacheKey(appId));
-
-            GetCrowdfundInfo(appId).ContinueWith(task =>
-            {
-                _HubContext.Clients.Group(appId).SendCoreAsync(CrowdfundHub.InfoUpdated, new object[]{ task.Result} );
-            }, TaskScheduler.Current);
-            
-        }
-        
-        private async Task<decimal> GetCurrentContributionAmount(Dictionary<string, decimal> stats, string primaryCurrency, RateRules rateRules)
-        {
-            decimal result = 0;
-
-            var ratesTask = _RateFetcher .FetchRates(
-                stats.Keys
-                    .Select((x) => new CurrencyPair( primaryCurrency, PaymentMethodId.Parse(x).CryptoCode))
-                    .Distinct()
-                    .ToHashSet(), 
-                rateRules);
-
-            var finalTasks = new List<Task>();
-            foreach (var rateTask in ratesTask)
-            {
-                finalTasks.Add(Task.Run(async () =>
-                {
-                    var tResult = await rateTask.Value;
-                    var rate = tResult.BidAsk?.Bid;
-                    if (rate == null) return;
-
-                    foreach (var stat in stats)
-                    {
-                        if (string.Equals(PaymentMethodId.Parse(stat.Key).CryptoCode, rateTask.Key.Right,
-                            StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            result += (1m / rate.Value) *  stat.Value;
-                        }
-                    }
-                }));
-            }
-
-            await Task.WhenAll(finalTasks);
-
-            return result;
-        }
-        
-        private static Dictionary<string, decimal> GetCurrentContributionAmountStats(InvoiceEntity[] invoices, bool usePaymentData = true)
-        {
-            if(usePaymentData){
-            var payments = invoices.SelectMany(entity => entity.GetPayments());
-
-            var groupedByMethod = payments.GroupBy(entity => entity.GetPaymentMethodId());
-
-            return groupedByMethod.ToDictionary(entities => entities.Key.ToString(),
-                entities => entities.Sum(entity => entity.GetCryptoPaymentData().GetValue()));
-            }
-            else
-            {
-                return invoices
-                    .GroupBy(entity => entity.ProductInformation.Currency)
-                    .ToDictionary(
-                        entities => entities.Key,
-                        entities => entities.Sum(entity => entity.ProductInformation.Price));
-            }
-        }
-        private async Task<ViewCrowdfundViewModel> GetInfo(AppData appData, string statusMessage= null)
-        {
-            var settings = appData.GetSettings<AppsController.CrowdfundSettings>();
-
-            var resetEvery = settings.StartDate.HasValue? settings.ResetEvery : CrowdfundResetEvery.Never;
-            DateTime? lastResetDate = null;
-            DateTime? nextResetDate = null;
-            if (resetEvery != CrowdfundResetEvery.Never)
-            {
-                lastResetDate = settings.StartDate.Value;
-                
-                nextResetDate = lastResetDate.Value;
-                while (DateTime.Now >= nextResetDate)
-                {
-                    lastResetDate = nextResetDate;
-                    switch (resetEvery)
-                    {
-                        case CrowdfundResetEvery.Hour:
-                            nextResetDate = lastResetDate.Value.AddHours(settings.ResetEveryAmount);
-                            break;
-                        case CrowdfundResetEvery.Day:
-                            nextResetDate = lastResetDate.Value.AddDays(settings.ResetEveryAmount);
-                            break;
-                        case CrowdfundResetEvery.Month:
-
-                            nextResetDate = lastResetDate.Value.AddMonths(settings.ResetEveryAmount);
-                            break;
-                        case CrowdfundResetEvery.Year:
-                            nextResetDate = lastResetDate.Value.AddYears(settings.ResetEveryAmount);
-                            break;
-                    }
-                }
-            }
-            
-            var invoices = await GetInvoicesForApp(settings.UseAllStoreInvoices? null : appData.Id, lastResetDate);
-            var completeInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete).ToArray();
-            var pendingInvoices = invoices.Where(entity => entity.Status != InvoiceStatus.Complete).ToArray();
-            
-            var rateRules = appData.StoreData.GetStoreBlob().GetRateRules(_BtcPayNetworkProvider);
-            
-            var pendingPaymentStats = GetCurrentContributionAmountStats(pendingInvoices, !settings.UseInvoiceAmount);
-            var paymentStats = GetCurrentContributionAmountStats(completeInvoices, !settings.UseInvoiceAmount); 
-            
-            var currentAmount = await GetCurrentContributionAmount(
-                paymentStats,
-                settings.TargetCurrency, rateRules); 
-            var currentPendingAmount =  await GetCurrentContributionAmount(
-                pendingPaymentStats,
-                settings.TargetCurrency, rateRules);
-
-            
-            
-            
-            var perkCount = invoices
-                .Where(entity => !string.IsNullOrEmpty( entity.ProductInformation.ItemCode))
-                .GroupBy(entity => entity.ProductInformation.ItemCode)
-                .ToDictionary(entities => entities.Key, entities => entities.Count());
-
-            var perks = _AppsHelper.Parse(settings.PerksTemplate, settings.TargetCurrency);
-            if (settings.SortPerksByPopularity)
-            {
-                var  ordered = perkCount.OrderByDescending(pair => pair.Value);
-                var newPerksOrder = ordered
-                    .Select(keyValuePair => perks.SingleOrDefault(item => item.Id == keyValuePair.Key))
-                    .Where(matchingPerk => matchingPerk != null)
-                    .ToList();
-                var remainingPerks = perks.Where(item => !newPerksOrder.Contains(item));
-                newPerksOrder.AddRange(remainingPerks);
-                perks = newPerksOrder.ToArray();
-            }    
-            return new ViewCrowdfundViewModel()
-            {
-                Title = settings.Title,
-                Tagline = settings.Tagline,
-                Description = settings.Description,
-                CustomCSSLink = settings.CustomCSSLink,
-                MainImageUrl = settings.MainImageUrl,
-                EmbeddedCSS = settings.EmbeddedCSS,
-                StoreId = appData.StoreDataId,
-                AppId = appData.Id,
-                StartDate = settings.StartDate?.ToUniversalTime(), 
-                EndDate = settings.EndDate?.ToUniversalTime(),
-                TargetAmount = settings.TargetAmount,
-                TargetCurrency = settings.TargetCurrency,
-                EnforceTargetAmount = settings.EnforceTargetAmount,
-                StatusMessage = statusMessage,
-                Perks = perks,
-                DisqusEnabled = settings.DisqusEnabled,
-                SoundsEnabled = settings.SoundsEnabled,
-                DisqusShortname = settings.DisqusShortname,
-                AnimationsEnabled = settings.AnimationsEnabled,
-                ResetEveryAmount = settings.ResetEveryAmount,
-                DisplayPerksRanking = settings.DisplayPerksRanking,
-                PerkCount = perkCount,
-                ResetEvery = Enum.GetName(typeof(CrowdfundResetEvery),settings.ResetEvery),
-                CurrencyData = _AppsHelper.GetCurrencyData(settings.TargetCurrency, true),
-                Info = new ViewCrowdfundViewModel.CrowdfundInfo()
-                {
-                    TotalContributors = invoices.Length,
-                    CurrentPendingAmount = currentPendingAmount,
-                    CurrentAmount = currentAmount,
-                    ProgressPercentage =   (currentAmount/ settings.TargetAmount) * 100,
-                    PendingProgressPercentage =  ( currentPendingAmount/ settings.TargetAmount) * 100,
-                    LastUpdated = DateTime.Now,
-                    PaymentStats = paymentStats,
-                    PendingPaymentStats = pendingPaymentStats,
-                    LastResetDate = lastResetDate,
-                    NextResetDate = nextResetDate
-                }
-            };
-        }
-
-        private async Task<InvoiceEntity[]> GetInvoicesForApp(string appId, DateTime? startDate = null)
-        {
-            return await  _InvoiceRepository.GetInvoices(new InvoiceQuery()
-            {
-                OrderId = appId == null? null : new []{$"{CrowdfundInvoiceOrderIdPrefix}{appId}"},
-                Status = new string[]{
-                    InvoiceState.ToString(InvoiceStatus.New),
-                    InvoiceState.ToString(InvoiceStatus.Paid), 
-                    InvoiceState.ToString(InvoiceStatus.Confirmed), 
-                    InvoiceState.ToString(InvoiceStatus.Complete)},
-                StartDate = startDate
-            });
-        }
-
-        public void Dispose()
-        {
-            _Subscriptions.ForEach(subscription => subscription.Dispose());
-        }
-    }
-}

BTCPayServer/Data/AppData.cs

@@ -23,6 +23,7 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+        public bool TagAllInvoices { get; set; }
         public string Settings { get; set; }
 
         public T GetSettings<T>() where T : class, new()

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/Events/InvoiceEvent.cs

@@ -20,14 +20,14 @@ namespace BTCPayServer.Events
         public const string Confirmed= "invoice_confirmed";
         public const string Completed= "invoice_completed";
         
-        public InvoiceEvent(Models.InvoiceResponse invoice, int code, string name)
+        public InvoiceEvent(InvoiceEntity invoice, int code, string name)
         {
             Invoice = invoice;
             EventCode = code;
             Name = name;
         }
 
-        public Models.InvoiceResponse Invoice { get; set; }
+        public InvoiceEntity Invoice { get; set; }
         public int EventCode { get; set; }
         public string Name { get; set; }
 

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/HostedServices/EventHostedServiceBase.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Hosting;
+
+namespace BTCPayServer.HostedServices
+{
+    public class EventHostedServiceBase : IHostedService
+    {
+        private readonly EventAggregator _EventAggregator;
+
+        private List<IEventAggregatorSubscription> _Subscriptions;
+        private CancellationTokenSource _Cts;
+
+        public EventHostedServiceBase(EventAggregator eventAggregator)
+        {
+            _EventAggregator = eventAggregator;
+        }
+
+        Channel<object> _Events = Channel.CreateUnbounded<object>();
+        public async Task ProcessEvents(CancellationToken cancellationToken)
+        {
+            while (await _Events.Reader.WaitToReadAsync(cancellationToken))
+            {
+                if (_Events.Reader.TryRead(out var evt))
+                {
+                    try
+                    {
+                        await ProcessEvent(evt, cancellationToken);
+                    }
+                    catch when (cancellationToken.IsCancellationRequested)
+                    {
+                        throw;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logs.PayServer.LogWarning(ex, $"Unhandled exception in {this.GetType().Name}");
+                    }
+                }
+            }
+        }
+
+        protected virtual Task ProcessEvent(object evt, CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
+
+
+        protected virtual void SubscibeToEvents()
+        {
+
+        }
+
+        protected void Subscribe<T>()
+        {
+            _Subscriptions.Add(_EventAggregator.Subscribe<T>(e => _Events.Writer.TryWrite(e)));
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _Subscriptions = new List<IEventAggregatorSubscription>();
+            SubscibeToEvents();
+            _Cts = new CancellationTokenSource();
+            _ProcessingEvents = ProcessEvents(_Cts.Token);
+            return Task.CompletedTask;
+        }
+        Task _ProcessingEvents = Task.CompletedTask;
+
+        public async Task StopAsync(CancellationToken cancellationToken)
+        {
+            _Subscriptions?.ForEach(subscription => subscription.Dispose());
+            _Cts?.Cancel();
+            try
+            {
+                await _ProcessingEvents;
+            }
+            catch (OperationCanceledException)
+            { }
+        }
+    }
+}

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -33,13 +33,10 @@ namespace BTCPayServer.HostedServices
                 get; set;
             }
 
-            public InvoiceEntity Invoice
+            public InvoicePaymentNotificationEventWrapper Notification
             {
                 get; set;
             }
-
-            public int? EventCode { get; set; }
-            public string Message { get; set; }
         }
 
         IBackgroundJobClient _JobClient;
@@ -63,22 +60,70 @@ namespace BTCPayServer.HostedServices
             _EmailSenderFactory = emailSenderFactory;
         }
 
-        void Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
+        void Notify(InvoiceEntity invoice, InvoiceEvent invoiceEvent, bool extendedNotification)
         {
+            var dto = invoice.EntityToDTO(_NetworkProvider);
+            var notification = new InvoicePaymentNotificationEventWrapper()
+            {
+                Data = new InvoicePaymentNotification()
+                {
+                    Id = dto.Id,
+                    Currency = dto.Currency,
+                    CurrentTime = dto.CurrentTime,
+                    ExceptionStatus = dto.ExceptionStatus,
+                    ExpirationTime = dto.ExpirationTime,
+                    InvoiceTime = dto.InvoiceTime,
+                    PosData = dto.PosData,
+                    Price = dto.Price,
+                    Status = dto.Status,
+                    BuyerFields = invoice.RefundMail == null ? null : new Newtonsoft.Json.Linq.JObject() { new JProperty("buyerEmail", invoice.RefundMail) },
+                    PaymentSubtotals = dto.PaymentSubtotals,
+                    PaymentTotals = dto.PaymentTotals,
+                    AmountPaid = dto.AmountPaid,
+                    ExchangeRates = dto.ExchangeRates,
+                },
+                Event = new InvoicePaymentNotificationEvent()
+                {
+                    Code = invoiceEvent.EventCode,
+                    Name = invoiceEvent.Name
+                },
+                ExtendedNotification = extendedNotification,
+                NotificationURL = invoice.NotificationURL
+            };
+
+            // For lightning network payments, paid, confirmed and completed come all at once.
+            // So despite the event is "paid" or "confirmed" the Status of the invoice is technically complete
+            // This confuse loggers who think their endpoint get duplicated events
+            // So here, we just override the status expressed by the notification
+            if (invoiceEvent.Name == InvoiceEvent.Confirmed)
+            {
+                notification.Data.Status = InvoiceState.ToString(InvoiceStatus.Confirmed);
+            }
+            if (invoiceEvent.Name == InvoiceEvent.PaidInFull)
+            {
+                notification.Data.Status = InvoiceState.ToString(InvoiceStatus.Paid);
+            }
+            //////////////////
+
+            // We keep backward compatibility with bitpay by passing BTC info to the notification
+            // we don't pass other info, as it is a bad idea to use IPN data for logic processing (can be faked)
+            var btcCryptoInfo = dto.CryptoInfo.FirstOrDefault(c => c.GetpaymentMethodId() == new PaymentMethodId("BTC", Payments.PaymentTypes.BTCLike));
+            if (btcCryptoInfo != null)
+            {
+#pragma warning disable CS0618
+                notification.Data.Rate = dto.Rate;
+                notification.Data.Url = dto.Url;
+                notification.Data.BTCDue = dto.BTCDue;
+                notification.Data.BTCPaid = dto.BTCPaid;
+                notification.Data.BTCPrice = dto.BTCPrice;
+#pragma warning restore CS0618
+            }
+
             CancellationTokenSource cts = new CancellationTokenSource(10000);
 
             if (!String.IsNullOrEmpty(invoice.NotificationEmail))
             {
-                // just extracting most important data for email body, merchant should query API back for full invoice based on Invoice.Id
-                var ipn = new
-                {
-                    invoice.Id,
-                    invoice.Status,
-                    invoice.StoreId
-                };
-                // TODO: Consider adding info on ItemDesc and payment info (amount)
-                
-                var emailBody = NBitcoin.JsonConverters.Serializer.ToString(ipn);
+                var emailBody = NBitcoin.JsonConverters.Serializer.ToString(notification);
 
                 _EmailSenderFactory.GetEmailSender(invoice.StoreId).SendEmail(
                     invoice.NotificationEmail,
@@ -86,9 +131,9 @@ namespace BTCPayServer.HostedServices
                     emailBody);
 
             }
-            if (string.IsNullOrEmpty(invoice.NotificationURL))
+            if (string.IsNullOrEmpty(invoice.NotificationURL) || !Uri.IsWellFormedUriString(invoice.NotificationURL, UriKind.Absolute))
                 return;
-            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice, EventCode = eventCode, Message = name });
+            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Notification = notification });
             if (!string.IsNullOrEmpty(invoice.NotificationURL))
                 _JobClient.Schedule(() => NotifyHttp(invoiceStr), TimeSpan.Zero);
         }
@@ -97,30 +142,23 @@ namespace BTCPayServer.HostedServices
         {
             var job = NBitcoin.JsonConverters.Serializer.ToObject<ScheduledJob>(invoiceData);
             bool reschedule = false;
+            var aggregatorEvent = new InvoiceIPNEvent(job.Notification.Data.Id, job.Notification.Event.Code, job.Notification.Event.Name);
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
-                HttpResponseMessage response = await SendNotification(job.Invoice, job.EventCode, job.Message, cts.Token);
+                HttpResponseMessage response = await SendNotification(job.Notification, cts.Token);
                 reschedule = !response.IsSuccessStatusCode;
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
-                {
-                    Error = reschedule ? $"Unexpected return code: {(int)response.StatusCode}" : null
-                });
+                aggregatorEvent.Error = reschedule ? $"Unexpected return code: {(int)response.StatusCode}" : null;
+                _EventAggregator.Publish<InvoiceIPNEvent>(aggregatorEvent);
             }
             catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
-                {
-                    Error = "Timeout"
-                });
+                aggregatorEvent.Error = "Timeout";
+                _EventAggregator.Publish<InvoiceIPNEvent>(aggregatorEvent);
                 reschedule = true;
             }
             catch (Exception ex)
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
-                {
-                    Error = ex.Message
-                });
                 reschedule = true;
 
                 List<string> messages = new List<string>();
@@ -131,10 +169,8 @@ namespace BTCPayServer.HostedServices
                 }
                 string message = String.Join(',', messages.ToArray());
 
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
-                {
-                    Error = $"Unexpected error: {message}"
-                });
+                aggregatorEvent.Error = $"Unexpected error: {message}";
+                _EventAggregator.Publish<InvoiceIPNEvent>(aggregatorEvent);
             }
             finally { cts?.Dispose(); }
 
@@ -160,64 +196,35 @@ namespace BTCPayServer.HostedServices
             public InvoicePaymentNotificationEvent Event { get; set; }
             [JsonProperty("data")]
             public InvoicePaymentNotification Data { get; set; }
+            [JsonProperty("extendedNotification")]
+            public bool ExtendedNotification { get; set; }
+            [JsonProperty(PropertyName = "notificationURL")]
+            public string NotificationURL { get; set; }
         }
 
         Encoding UTF8 = new UTF8Encoding(false);
-        private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, int? eventCode, string name, CancellationToken cancellation)
+        private async Task<HttpResponseMessage> SendNotification(InvoicePaymentNotificationEventWrapper notification, CancellationToken cancellation)
         {
             var request = new HttpRequestMessage();
             request.Method = HttpMethod.Post;
 
-            var dto = invoice.EntityToDTO(_NetworkProvider);
-            InvoicePaymentNotification notification = new InvoicePaymentNotification()
-            {
-                Id = dto.Id,
-                Currency = dto.Currency,
-                CurrentTime = dto.CurrentTime,
-                ExceptionStatus = dto.ExceptionStatus,
-                ExpirationTime = dto.ExpirationTime,
-                InvoiceTime = dto.InvoiceTime,
-                PosData = dto.PosData,
-                Price = dto.Price,
-                Status = dto.Status,
-                BuyerFields = invoice.RefundMail == null ? null : new Newtonsoft.Json.Linq.JObject() { new JProperty("buyerEmail", invoice.RefundMail) },
-                PaymentSubtotals = dto.PaymentSubtotals,
-                PaymentTotals = dto.PaymentTotals,
-                AmountPaid = dto.AmountPaid,
-                ExchangeRates = dto.ExchangeRates,
+            var notificationString = NBitcoin.JsonConverters.Serializer.ToString(notification);
+            var jobj = JObject.Parse(notificationString);
 
-            };
-
-            // We keep backward compatibility with bitpay by passing BTC info to the notification
-            // we don't pass other info, as it is a bad idea to use IPN data for logic processing (can be faked)
-            var btcCryptoInfo = dto.CryptoInfo.FirstOrDefault(c => c.GetpaymentMethodId() == new PaymentMethodId("BTC", Payments.PaymentTypes.BTCLike));
-            if (btcCryptoInfo != null)
+            if (notification.ExtendedNotification)
             {
-#pragma warning disable CS0618
-                notification.Rate = dto.Rate;
-                notification.Url = dto.Url;
-                notification.BTCDue = dto.BTCDue;
-                notification.BTCPaid = dto.BTCPaid;
-                notification.BTCPrice = dto.BTCPrice;
-#pragma warning restore CS0618
-            }
-
-            string notificationString = null;
-            if (eventCode.HasValue)
-            {
-                var wrapper = new InvoicePaymentNotificationEventWrapper();
-                wrapper.Data = notification;
-                wrapper.Event = new InvoicePaymentNotificationEvent() { Code = eventCode.Value, Name = name };
-                notificationString = JsonConvert.SerializeObject(wrapper);
+                jobj.Remove("extendedNotification");
+                jobj.Remove("notificationURL");
+                notificationString = jobj.ToString();
             }
             else
             {
-                notificationString = JsonConvert.SerializeObject(notification);
+                notificationString = jobj["data"].ToString();
             }
 
-            request.RequestUri = new Uri(invoice.NotificationURL, UriKind.Absolute);
+            request.RequestUri = new Uri(notification.NotificationURL, UriKind.Absolute);
             request.Content = new StringContent(notificationString, UTF8, "application/json");
-            var response = await Enqueue(invoice.Id, async () => await _Client.SendAsync(request, cancellation));
+            var response = await Enqueue(notification.Data.Id, async () => await _Client.SendAsync(request, cancellation));
             return response;
         }
 
@@ -306,17 +313,17 @@ namespace BTCPayServer.HostedServices
                        e.Name == InvoiceEvent.Completed ||
                        e.Name == InvoiceEvent.ExpiredPaidPartial
                      )
-                        Notify(invoice);
+                        Notify(invoice, e, false);
                 }
 
-                if (e.Name == "invoice_confirmed")
+                if (e.Name == InvoiceEvent.Confirmed)
                 {
-                    Notify(invoice);
+                    Notify(invoice, e, false);
                 }
 
                 if (invoice.ExtendedNotifications)
                 {
-                    Notify(invoice, e.EventCode, e.Name);
+                    Notify(invoice, e, true);
                 }
             }));
 

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -65,10 +65,10 @@ namespace BTCPayServer.HostedServices
                 context.MarkDirty();
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
 
-                context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1004, InvoiceEvent.Expired));
                 invoice.Status = InvoiceStatus.Expired;
-                if(invoice.ExceptionStatus == InvoiceExceptionStatus.PaidPartial)
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 2000, InvoiceEvent.ExpiredPaidPartial));
+                context.Events.Add(new InvoiceEvent(invoice, 1004, InvoiceEvent.Expired));
+                if (invoice.ExceptionStatus == InvoiceExceptionStatus.PaidPartial)
+                    context.Events.Add(new InvoiceEvent(invoice, 2000, InvoiceEvent.ExpiredPaidPartial));
             }
 
             var payments = invoice.GetPayments().Where(p => p.Accounted).ToArray();
@@ -83,7 +83,7 @@ namespace BTCPayServer.HostedServices
                 {
                     if (invoice.Status == InvoiceStatus.New)
                     {
-                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1003, InvoiceEvent.PaidInFull));
+                        context.Events.Add(new InvoiceEvent(invoice, 1003, InvoiceEvent.PaidInFull));
                         invoice.Status = InvoiceStatus.Paid;
                         invoice.ExceptionStatus = accounting.Paid > accounting.TotalDue ? InvoiceExceptionStatus.PaidOver : InvoiceExceptionStatus.None;
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
@@ -92,7 +92,7 @@ namespace BTCPayServer.HostedServices
                     else if (invoice.Status == InvoiceStatus.Expired && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidLate)
                     {
                         invoice.ExceptionStatus = InvoiceExceptionStatus.PaidLate;
-                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1009, InvoiceEvent.PaidAfterExpiration));
+                        context.Events.Add(new InvoiceEvent(invoice, 1009, InvoiceEvent.PaidAfterExpiration));
                         context.MarkDirty();
                     }
                 }
@@ -138,15 +138,15 @@ namespace BTCPayServer.HostedServices
                    (confirmedAccounting.Paid < accounting.MinimumTotalDue))
                 {
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1013, InvoiceEvent.FailedToConfirm));
+                    context.Events.Add(new InvoiceEvent(invoice, 1013, InvoiceEvent.FailedToConfirm));
                     invoice.Status = InvoiceStatus.Invalid;
                     context.MarkDirty();
                 }
                 else if (confirmedAccounting.Paid >= accounting.MinimumTotalDue)
                 {
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1005, InvoiceEvent.Confirmed));
                     invoice.Status = InvoiceStatus.Confirmed;
+                    context.Events.Add(new InvoiceEvent(invoice, 1005, InvoiceEvent.Confirmed));
                     context.MarkDirty();
                 }
             }
@@ -156,7 +156,7 @@ namespace BTCPayServer.HostedServices
                 var completedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentCompleted(p, network));
                 if (completedAccounting.Paid >= accounting.MinimumTotalDue)
                 {
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1006, InvoiceEvent.Completed));
+                    context.Events.Add(new InvoiceEvent(invoice, 1006, InvoiceEvent.Completed));
                     invoice.Status = InvoiceStatus.Complete;
                     context.MarkDirty();
                 }

BTCPayServer/HostedServices/MigratorHostedService.cs

@@ -65,6 +65,12 @@ namespace BTCPayServer.HostedServices
                     settings.ConvertNetworkFeeProperty = true;
                     await _Settings.UpdateSetting(settings);
                 }
+                if (!settings.ConvertCrowdfundOldSettings)
+                {
+                    await ConvertCrowdfundOldSettings();
+                    settings.ConvertCrowdfundOldSettings = true;
+                    await _Settings.UpdateSetting(settings);
+                }
             }
             catch (Exception ex)
             {
@@ -73,6 +79,24 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        private async Task ConvertCrowdfundOldSettings()
+        {
+            using (var ctx = _DBContextFactory.CreateContext())
+            {
+                foreach (var app in ctx.Apps.Where(a => a.AppType == "Crowdfund"))
+                {
+                    var settings = app.GetSettings<Services.Apps.CrowdfundSettings>();
+#pragma warning disable CS0618 // Type or member is obsolete
+                    if (settings.UseAllStoreInvoices)
+#pragma warning restore CS0618 // Type or member is obsolete
+                    {
+                        app.TagAllInvoices = true;
+                    }
+                }
+                await ctx.SaveChangesAsync();
+            }
+        }
+
         private async Task ConvertNetworkFeeProperty()
         {
             using (var ctx = _DBContextFactory.CreateContext())

BTCPayServer/HostedServices/RatesHostedService.cs

@@ -65,9 +65,8 @@ namespace BTCPayServer.HostedServices
 
         async Task RefreshCoinAverageSupportedExchanges()
         {
-            var tickers = await new CoinAverageRateProvider() { Authenticator = _coinAverageSettings }.GetExchangeTickersAsync();
             var exchanges = new CoinAverageExchanges();
-            foreach (var item in tickers
+            foreach (var item in (await new CoinAverageRateProvider() { Authenticator = _coinAverageSettings }.GetExchangeTickersAsync())
                 .Exchanges
                 .Select(c => new CoinAverageExchange(c.Name, c.DisplayName)))
             {

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -38,8 +38,6 @@ using BTCPayServer.Logging;
 using BTCPayServer.HostedServices;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
-using BTCPayServer.Crowdfund;
-using BTCPayServer.Hubs;
 using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Security;
@@ -47,6 +45,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NBXplorer.DerivationStrategy;
 using NicolasDorier.RateLimits;
 using Npgsql;
+using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Hosting
 {
@@ -76,7 +75,6 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<TokenRepository>();
             services.TryAddSingleton<EventAggregator>();
             services.TryAddSingleton<CoinAverageSettings>();
-            services.TryAddSingleton<CrowdfundHubStreamer>();
             services.TryAddSingleton<ApplicationDbContextFactory>(o => 
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
@@ -107,7 +105,46 @@ namespace BTCPayServer.Hosting
                 return opts.NetworkProvider;
             });
 
-            services.TryAddSingleton<AppsHelper>();
+            services.TryAddSingleton<AppService>();
+            services.TryAddSingleton<Ganss.XSS.HtmlSanitizer>(o =>
+            {
+
+                var htmlSanitizer = new Ganss.XSS.HtmlSanitizer();
+
+
+                htmlSanitizer.RemovingAtRule += (sender, args) =>
+                {
+                };
+                htmlSanitizer.RemovingTag += (sender, args) =>
+                {
+                    if (args.Tag.TagName.Equals("img", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        if (!args.Tag.ClassList.Contains("img-fluid"))
+                        {
+                            args.Tag.ClassList.Add("img-fluid");
+                        }
+
+                        args.Cancel = true;
+                    }
+                };
+
+                htmlSanitizer.RemovingAttribute += (sender, args) =>
+                {
+                    if (args.Tag.TagName.Equals("img", StringComparison.InvariantCultureIgnoreCase) &&
+                        args.Attribute.Name.Equals("src", StringComparison.InvariantCultureIgnoreCase) &&
+                        args.Reason == Ganss.XSS.RemoveReason.NotAllowedUrlValue)
+                    {
+                        args.Cancel = true;
+                    }
+                };
+                htmlSanitizer.RemovingStyle += (sender, args) => { args.Cancel = true; };
+                htmlSanitizer.AllowedAttributes.Add("class");
+                htmlSanitizer.AllowedTags.Add("iframe");
+                htmlSanitizer.AllowedTags.Remove("img");
+                htmlSanitizer.AllowedAttributes.Add("webkitallowfullscreen");
+                htmlSanitizer.AllowedAttributes.Add("allowfullscreen");
+                return htmlSanitizer;
+            });
 
             services.TryAddSingleton<LightningConfigurationProvider>();
             services.TryAddSingleton<LanguageService>();
@@ -146,6 +183,8 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, InvoiceWatcher>();
             services.AddSingleton<IHostedService, RatesHostedService>();
             services.AddSingleton<IHostedService, BackgroundJobSchedulerHostedService>();
+            services.AddSingleton<IHostedService, AppHubStreamer>();
+
             services.AddSingleton<IBackgroundJobClient, BackgroundJobClient>();
             services.AddTransient<IConfigureOptions<MvcOptions>, BTCPayClaimsFilter>();
 

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -38,9 +38,20 @@ namespace BTCPayServer.Hosting
             {
                 var bitpayAuth = GetBitpayAuth(httpContext, out bool isBitpayAuth);
                 var isBitpayAPI = IsBitpayAPI(httpContext, isBitpayAuth);
+                if (isBitpayAPI && httpContext.Request.Method == "OPTIONS")
+                {
+                    httpContext.Response.StatusCode = 200;
+                    httpContext.Response.SetHeader("Access-Control-Allow-Origin", "*");
+                    if (httpContext.Request.Headers.ContainsKey("Access-Control-Request-Headers"))
+                    {
+                        httpContext.Response.SetHeader("Access-Control-Allow-Headers", httpContext.Request.Headers["Access-Control-Request-Headers"].FirstOrDefault());
+                    }
+                    return; // We bypass MVC completely
+                }
                 httpContext.SetIsBitpayAPI(isBitpayAPI);
                 if (isBitpayAPI)
                 {
+                    httpContext.Response.SetHeader("Access-Control-Allow-Origin", "*");
                     httpContext.SetBitpayAuth(bitpayAuth);
                 }
                 await _Next(httpContext);
@@ -81,32 +92,34 @@ namespace BTCPayServer.Hosting
 
             var isJson = (httpContext.Request.ContentType ?? string.Empty).StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
             var path = httpContext.Request.Path.Value;
+            var method = httpContext.Request.Method;
+            var isCors = method == "OPTIONS";
+
             if (
-                bitpayAuth &&
+                (isCors || bitpayAuth) &&
               (path == "/invoices" || path == "/invoices/") &&
-              httpContext.Request.Method == "POST" &&
-              isJson)
+              (isCors || (method == "POST" && isJson)))
                 return true;
 
             if (
-                bitpayAuth &&
+                (isCors || bitpayAuth) &&
                  (path == "/invoices" || path == "/invoices/") &&
-              httpContext.Request.Method == "GET")
+                 (isCors || method == "GET"))
                 return true;
 
             if (
-                path.StartsWith("/invoices/", StringComparison.OrdinalIgnoreCase) &&
-                httpContext.Request.Method == "GET" &&
-                (isJson || httpContext.Request.Query.ContainsKey("token")))
+               path.StartsWith("/invoices/", StringComparison.OrdinalIgnoreCase) &&
+               (isCors || method == "GET") &&
+               (isCors || isJson || httpContext.Request.Query.ContainsKey("token")))
                 return true;
 
             if (path.StartsWith("/rates", StringComparison.OrdinalIgnoreCase) &&
-                httpContext.Request.Method == "GET")
+                (isCors || method == "GET"))
                 return true;
 
             if (
                 path.Equals("/tokens", StringComparison.Ordinal) &&
-                (httpContext.Request.Method == "GET" || httpContext.Request.Method == "POST"))
+                (isCors || method == "GET" || method == "POST"))
                 return true;
 
             return false;

BTCPayServer/Hosting/Startup.cs

@@ -34,9 +34,9 @@ using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using System.Net;
-using BTCPayServer.Hubs;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using BTCPayServer.Security;
+using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Hosting
 {
@@ -92,14 +92,6 @@ namespace BTCPayServer.Hosting
                 options.Lockout.MaxFailedAccessAttempts = 5;
                 options.Lockout.AllowedForNewUsers = true;
             });
-            services.AddCors(o =>
-            {
-                o.AddPolicy("BitpayAPI", b =>
-                {
-                    b.AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-                });
-            });
-
             // If the HTTPS certificate path is not set this logic will NOT be used and the default Kestrel binding logic will be.
             string httpsCertificateFilePath = Configuration.GetOrDefault<string>("HttpsCertificateFilePath", null);
             bool useDefaultCertificate = Configuration.GetOrDefault<bool>("HttpsUseDefaultCertificate", false);
@@ -172,7 +164,7 @@ namespace BTCPayServer.Hosting
             app.UseAuthentication();
             app.UseSignalR(route =>
             {
-                route.MapHub<CrowdfundHub>("/apps/crowdfund/hub");
+                route.MapHub<AppHub>("/apps/hub");
             });
             app.UseWebSockets();
             app.UseStatusCodePages();

BTCPayServer/Migrations/20190219032533_AppsTagging.Designer.cs

@@ -0,0 +1,580 @@
+// <auto-generated />
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190219032533_AppsTagging")]
+    partial class AppsTagging
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.8-servicing-32085");
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.Property<string>("Address")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset?>("CreatedTime");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Address");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("AddressInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50);
+
+                    b.Property<string>("StoreId")
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AppType");
+
+                    b.Property<DateTimeOffset>("Created");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Settings");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.Property<bool>("TagAllInvoices");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("Apps");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+                {
+                    b.Property<string>("InvoiceDataId");
+
+                    b.Property<string>("Address");
+
+                    b.Property<DateTimeOffset>("Assigned");
+
+                    b.Property<string>("CryptoCode");
+
+                    b.Property<DateTimeOffset?>("UnAssigned");
+
+                    b.HasKey("InvoiceDataId", "Address");
+
+                    b.ToTable("HistoricalAddressInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<DateTimeOffset>("Created");
+
+                    b.Property<string>("CustomerEmail");
+
+                    b.Property<string>("ExceptionStatus");
+
+                    b.Property<string>("ItemCode");
+
+                    b.Property<string>("OrderId");
+
+                    b.Property<string>("Status");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+                {
+                    b.Property<string>("InvoiceDataId");
+
+                    b.Property<string>("UniqueId");
+
+                    b.Property<string>("Message");
+
+                    b.Property<DateTimeOffset>("Timestamp");
+
+                    b.HasKey("InvoiceDataId", "UniqueId");
+
+                    b.ToTable("InvoiceEvents");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Facade");
+
+                    b.Property<string>("Label");
+
+                    b.Property<DateTimeOffset>("PairingTime");
+
+                    b.Property<string>("SIN");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SIN");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("PairedSINData");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairingCodeData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTimeOffset>("Expiration");
+
+                    b.Property<string>("Facade");
+
+                    b.Property<string>("Label");
+
+                    b.Property<string>("SIN");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.Property<string>("TokenValue");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PairingCodes");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Accounted");
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PendingInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("RefundAddresses");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.SettingData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoreData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DefaultCrypto");
+
+                    b.Property<string>("DerivationStrategies");
+
+                    b.Property<string>("DerivationStrategy");
+
+                    b.Property<int>("SpeedPolicy");
+
+                    b.Property<byte[]>("StoreBlob");
+
+                    b.Property<byte[]>("StoreCertificate");
+
+                    b.Property<string>("StoreName");
+
+                    b.Property<string>("StoreWebsite");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Stores");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+                {
+                    b.Property<string>("ApplicationUserId");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.Property<string>("Role");
+
+                    b.HasKey("ApplicationUserId", "StoreDataId");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("UserStore");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Models.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<bool>("RequiresEmailConfirmation");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("AddressInvoices")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("APIKeys")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("Apps")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("HistoricalAddressInvoices")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("Invoices")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("Events")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("PairedSINs")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("PendingInvoices")
+                        .HasForeignKey("Id")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("RefundAddresses")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser", "ApplicationUser")
+                        .WithMany("UserStores")
+                        .HasForeignKey("ApplicationUserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("UserStores")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

BTCPayServer/Migrations/20190219032533_AppsTagging.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BTCPayServer.Migrations
+{
+    public partial class AppsTagging : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "TagAllInvoices",
+                table: "Apps",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "TagAllInvoices",
+                table: "Apps");
+        }
+    }
+}

BTCPayServer/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -14,7 +14,7 @@ namespace BTCPayServer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.0-rtm-30799");
+                .HasAnnotation("ProductVersion", "2.1.8-servicing-32085");
 
             modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
                 {
@@ -63,6 +63,8 @@ namespace BTCPayServer.Migrations
 
                     b.Property<string>("StoreDataId");
 
+                    b.Property<bool>("TagAllInvoices");
+
                     b.HasKey("Id");
 
                     b.HasIndex("StoreDataId");

BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Models.AppViewModels
 {
@@ -41,7 +42,7 @@ namespace BTCPayServer.Models.AppViewModels
 
         [Required]
         [MaxLength(5)]
-        [Display(Name = "The primary currency used for targets and stats. (e.g. BTC, LTC, USD, etc.)")]
+        [Display(Name = "Primary currency used for targets and stats. (e.g. BTC, LTC, USD, etc.)")]
         public string TargetCurrency { get; set; } = "BTC";
 
         [Display(Name = "Set a Target amount ")]
@@ -68,24 +69,15 @@ namespace BTCPayServer.Models.AppViewModels
         [Display(Name = "Custom CSS Code")]
         public string EmbeddedCSS { get; set; }
 
-        [Display(Name = "Base the contributed goal amount on the invoice amount and not actual payments")]
-        public bool UseInvoiceAmount { get; set; }       
         [Display(Name = "Count all invoices created on the store as part of the crowdfunding goal")]
         public bool UseAllStoreInvoices { get; set; } 
 
         public string AppId { get; set; }
+        public string SearchTerm { get; set; }
+
         [Display(Name = "Sort contribution perks by popularity")]
         public bool SortPerksByPopularity { get; set; }
         [Display(Name = "Display contribution ranking")]
         public bool DisplayPerksRanking { get; set; }
     }
-
-    public enum CrowdfundResetEvery
-    {
-        Never,
-        Hour,
-        Day,
-        Month,
-        Year
-    }
 }

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/AppViewModels/ViewCrowdfundViewModel.cs

@@ -31,7 +31,7 @@ namespace BTCPayServer.Models.AppViewModels
         public string DisqusShortname { get; set; }
         public bool AnimationsEnabled { get; set; }
         public int ResetEveryAmount { get; set; }
-        public string ResetEvery { get; set; }
+        public bool NeverReset { get; set; }
 
         public Dictionary<string, int> PerkCount { get; set; }
 

BTCPayServer/Models/ConfirmModel.cs

@@ -7,6 +7,15 @@ namespace BTCPayServer.Models
 {
     public class ConfirmModel
     {
+        public ConfirmModel() { }
+
+        public ConfirmModel(string title, string desc, string action = null)
+        {
+            Title = title;
+            Description = desc;
+            Action = action;
+        }
+
         public string Title
         {
             get; set;

BTCPayServer/Models/CreateInvoiceRequest.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NBitcoin;
+using NBitcoin.JsonConverters;
+using NBitpayClient;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Models
+{
+    public class CreateInvoiceRequest
+    {
+        [JsonProperty(PropertyName = "buyer")]
+        public Buyer Buyer { get; set; }
+        [JsonProperty(PropertyName = "buyerEmail", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerEmail { get; set; }
+        [JsonProperty(PropertyName = "buyerCountry", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerCountry { get; set; }
+        [JsonProperty(PropertyName = "buyerZip", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerZip { get; set; }
+        [JsonProperty(PropertyName = "buyerState", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerState { get; set; }
+        [JsonProperty(PropertyName = "buyerCity", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerCity { get; set; }
+        [JsonProperty(PropertyName = "buyerAddress2", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerAddress2 { get; set; }
+        [JsonProperty(PropertyName = "buyerAddress1", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerAddress1 { get; set; }
+        [JsonProperty(PropertyName = "buyerName", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerName { get; set; }
+        [JsonProperty(PropertyName = "physical", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool Physical { get; set; }
+        [JsonProperty(PropertyName = "redirectURL", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string RedirectURL { get; set; }
+        [JsonProperty(PropertyName = "notificationURL", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string NotificationURL { get; set; }
+        [JsonProperty(PropertyName = "extendedNotifications", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool ExtendedNotifications { get; set; }
+        [JsonProperty(PropertyName = "fullNotifications", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool FullNotifications { get; set; }
+        [JsonProperty(PropertyName = "transactionSpeed", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string TransactionSpeed { get; set; }
+        [JsonProperty(PropertyName = "buyerPhone", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string BuyerPhone { get; set; }
+        [JsonProperty(PropertyName = "posData", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string PosData { get; set; }
+        [JsonProperty(PropertyName = "itemCode", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string ItemCode { get; set; }
+        [JsonProperty(PropertyName = "itemDesc", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string ItemDesc { get; set; }
+        [JsonProperty(PropertyName = "orderId", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string OrderId { get; set; }
+        [JsonProperty(PropertyName = "currency", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Currency { get; set; }
+        [JsonProperty(PropertyName = "price", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal Price { get; set; }
+        [JsonProperty(PropertyName = "notificationEmail", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string NotificationEmail { get; set; }
+        [JsonConverter(typeof(DateTimeJsonConverter))]
+        [JsonProperty(PropertyName = "expirationTime", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public DateTimeOffset? ExpirationTime { get; set; }
+        [JsonProperty(PropertyName = "status", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Status { get; set; }
+        [JsonProperty(PropertyName = "minerFees", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public Dictionary<string, MinerFeeInfo> MinerFees { get; set; }
+        [JsonProperty(PropertyName = "supportedTransactionCurrencies", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public Dictionary<string, InvoiceSupportedTransactionCurrency> SupportedTransactionCurrencies { get; set; }
+        [JsonProperty(PropertyName = "exchangeRates", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public Dictionary<string, Dictionary<string, decimal>> ExchangeRates { get; set; }
+        [JsonProperty(PropertyName = "refundable", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool Refundable { get; set; }
+        [JsonProperty(PropertyName = "taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal? TaxIncluded { get; set; }
+        [JsonProperty(PropertyName = "nonce", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public long Nonce { get; set; }
+        [JsonProperty(PropertyName = "guid", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Guid { get; set; }
+        [JsonProperty(PropertyName = "token", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Token { get; set; }
+    }
+}

BTCPayServer/Models/InvoiceResponse.cs

@@ -90,6 +90,12 @@ namespace BTCPayServer.Models
             get; set;
         }
 
+        [JsonProperty("taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         //"currency":"USD"
         [JsonProperty("currency")]
         public string Currency

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -105,6 +105,7 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             set;
         }
+        public string TaxIncluded { get; set; }
         public BuyerInformation BuyerInformation
         {
             get;
@@ -143,6 +144,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public DateTimeOffset MonitoringDate { get; internal set; }
         public List<Data.InvoiceEventData> Events { get; internal set; }
         public string NotificationEmail { get; internal set; }
-        public Dictionary<string, string> PosData { get; set; }
+        public Dictionary<string, object> PosData { get; set; }
     }
 }

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -24,7 +24,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool IsModal { get; set; }
         public bool IsLightning { get; set; }
         public string CryptoCode { get; set; }
-        public string ServerUrl { get; set; }
         public string InvoiceId { get; set; }
         public string BtcAddress { get; set; }
         public string BtcDue { get; set; }

BTCPayServer/Models/ServerViewModels/LightningWalletServices.cs

@@ -5,9 +5,10 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Models.ServerViewModels
 {
-    public class SparkServicesViewModel
+    public class LightningWalletServices
     {
-        public string SparkLink { get; set; }
+        public string ServiceLink { get; set; }
         public bool ShowQR { get; set; }
+        public string WalletName { get; internal set; }
     }
 }

BTCPayServer/Models/StatusMessageModel.cs

@@ -0,0 +1,80 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Models
+{
+    public class StatusMessageModel
+    {
+        public StatusMessageModel()
+        {
+        }
+
+        public StatusMessageModel(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+                return;
+            try
+            {
+                if (s.StartsWith("{", StringComparison.InvariantCultureIgnoreCase) &&
+                    s.EndsWith("}", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var model = JObject.Parse(s).ToObject<StatusMessageModel>();
+                    Html = model.Html;
+                    Message = model.Message;
+                    Severity = model.Severity;
+                }
+                else
+                {
+                    ParseNonJsonStatus(s);
+                }
+            }
+            catch (Exception)
+            {
+                ParseNonJsonStatus(s);
+            }
+        }
+
+        public string Message { get; set; }
+        public string Html { get; set; }
+        public StatusSeverity Severity { get; set; }
+
+        public string SeverityCSS
+        {
+            get
+            {
+                switch (Severity)
+                {
+                    case StatusSeverity.Info:
+                        return "info";
+                    case StatusSeverity.Error:
+                        return "danger";
+                    case StatusSeverity.Success:
+                        return "success";
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+        }
+
+        public override string ToString()
+        {
+            return JObject.FromObject(this).ToString(Formatting.None);
+        }
+        
+        private void ParseNonJsonStatus(string s)
+        {
+            Message = s;
+            Severity = s.StartsWith("Error", StringComparison.InvariantCultureIgnoreCase)
+                ? StatusSeverity.Error
+                : StatusSeverity.Success;
+        }
+
+        public enum StatusSeverity
+        {
+            Info,
+            Error,
+            Success
+        }
+    }
+}

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/Payments/Bitcoin/NBXplorerListener.cs

@@ -33,12 +33,10 @@ namespace BTCPayServer.Payments.Bitcoin
         private TaskCompletionSource<bool> _RunningTask;
         private CancellationTokenSource _Cts;
         BTCPayWalletProvider _Wallets;
-        BTCPayNetworkProvider _NetworkProvider;
 
         public NBXplorerListener(ExplorerClientProvider explorerClients,
                                 BTCPayWalletProvider wallets,
                                 InvoiceRepository invoiceRepository,
-                                BTCPayNetworkProvider networkProvider,
                                 EventAggregator aggregator, Microsoft.Extensions.Hosting.IApplicationLifetime lifetime)
         {
             PollInterval = TimeSpan.FromMinutes(1.0);
@@ -47,7 +45,6 @@ namespace BTCPayServer.Payments.Bitcoin
             _ExplorerClients = explorerClients;
             _Aggregator = aggregator;
             _Lifetime = lifetime;
-            _NetworkProvider = networkProvider;
         }
 
         CompositeDisposable leases = new CompositeDisposable();
@@ -373,7 +370,7 @@ namespace BTCPayServer.Payments.Bitcoin
                 invoice.SetPaymentMethod(paymentMethod);
             }
             wallet.InvalidateCache(strategy);
-            _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, InvoiceEvent.ReceivedPayment){Payment = payment});
+            _Aggregator.Publish(new InvoiceEvent(invoice, 1002, InvoiceEvent.ReceivedPayment){Payment = payment});
             return invoice;
         }
         public Task StopAsync(CancellationToken cancellationToken)

BTCPayServer/Payments/IPaymentFilter.cs

@@ -12,6 +12,21 @@ namespace BTCPayServer.Payments
 
     public class PaymentFilter
     {
+        class OrPaymentFilter : IPaymentFilter
+        {
+            private readonly IPaymentFilter _a;
+            private readonly IPaymentFilter _b;
+
+            public OrPaymentFilter(IPaymentFilter a, IPaymentFilter b)
+            {
+                _a = a;
+                _b = b;
+            }
+            public bool Match(PaymentMethodId paymentMethodId)
+            {
+                return _a.Match(paymentMethodId) || _b.Match(paymentMethodId);
+            }
+        }
         class NeverPaymentFilter : IPaymentFilter
         {
 
@@ -54,6 +69,34 @@ namespace BTCPayServer.Payments
                 return paymentMethodId == _paymentMethodId;
             }
         }
+        class PredicateFilter : IPaymentFilter
+        {
+            private Func<PaymentMethodId, bool> predicate;
+
+            public PredicateFilter(Func<PaymentMethodId, bool> predicate)
+            {
+                this.predicate = predicate;
+            }
+
+            public bool Match(PaymentMethodId paymentMethodId)
+            {
+                return this.predicate(paymentMethodId);
+            }
+        }
+        public static IPaymentFilter Where(Func<PaymentMethodId, bool> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException(nameof(predicate));
+            return new PredicateFilter(predicate);
+        }
+        public static IPaymentFilter Or(IPaymentFilter a, IPaymentFilter b)
+        {
+            if (a == null)
+                throw new ArgumentNullException(nameof(a));
+            if (b == null)
+                throw new ArgumentNullException(nameof(b));
+            return new OrPaymentFilter(a, b);
+        }
         public static IPaymentFilter Never()
         {
             return NeverPaymentFilter.Instance;

BTCPayServer/Payments/Lightning/LightningLikePaymentData.cs

@@ -7,6 +7,7 @@ using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.JsonConverters;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Services.Invoices;
+using NBitcoin;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Payments.Lightning
@@ -16,17 +17,21 @@ namespace BTCPayServer.Payments.Lightning
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string BOLT11 { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
+        public uint256 PaymentHash { get; set; }
 
         public string GetDestination(BTCPayNetwork network)
         {
-            return GetPaymentId();
+            return BOLT11;
         }
 
         public decimal NetworkFee { get; set; }
 
+
         public string GetPaymentId()
         {
-            return BOLT11;
+            // Legacy, some old payments don't have the PaymentHash set
+            return PaymentHash?.ToString() ?? BOLT11;
         }
 
         public PaymentTypes GetPaymentType()

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -191,13 +191,14 @@ namespace BTCPayServer.Payments.Lightning
             var payment = await _InvoiceRepository.AddPayment(listenedInvoice.InvoiceId, notification.PaidAt.Value, new LightningLikePaymentData()
             {
                 BOLT11 = notification.BOLT11,
+                PaymentHash = BOLT11PaymentRequest.Parse(notification.BOLT11, network.NBitcoinNetwork).PaymentHash,
                 Amount = notification.Amount
             }, network, accounted: true);
             if (payment != null)
             {
                 var invoice = await _InvoiceRepository.GetInvoice(listenedInvoice.InvoiceId);
                 if (invoice != null)
-                    _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, InvoiceEvent.ReceivedPayment){Payment = payment});
+                    _Aggregator.Publish(new InvoiceEvent(invoice, 1002, InvoiceEvent.ReceivedPayment){Payment = payment});
             }
         }
 

BTCPayServer/Payments/PaymentMethodId.cs

@@ -67,10 +67,37 @@ namespace BTCPayServer.Payments
             return CryptoCode + "_" + PaymentType.ToString();
         }
 
+        public static bool TryParse(string str, out PaymentMethodId paymentMethodId)
+        {
+            paymentMethodId = null;
+            var parts = str.Split('_', StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length == 0 || parts.Length > 2)
+                return false;
+            PaymentTypes type = PaymentTypes.BTCLike;
+            if (parts.Length == 2)
+            {
+                switch (parts[1].ToLowerInvariant())
+                {
+                    case "btclike":
+                    case "onchain":
+                        type = PaymentTypes.BTCLike;
+                        break;
+                    case "lightninglike":
+                    case "offchain":
+                        type = PaymentTypes.LightningLike;
+                        break;
+                    default:
+                        return false;
+                }
+            }
+            paymentMethodId = new PaymentMethodId(parts[0], type);
+            return true;
+        }
         public static PaymentMethodId Parse(string str)
         {
-            var parts = str.Split('_');
-            return new PaymentMethodId(parts[0], parts.Length == 1 ? PaymentTypes.BTCLike : Enum.Parse<PaymentTypes>(parts[1]));
+            if (!TryParse(str, out var result))
+                throw new FormatException("Invalid PaymentMethodId");
+            return result;
         }
     }
 }

BTCPayServer/Services/Apps/AppHub.cs

@@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace BTCPayServer.Hubs
+namespace BTCPayServer.Services.Apps
 {
-    public class CrowdfundHub: Hub
+    public class AppHub: Hub
     {
         public const string InvoiceCreated = "InvoiceCreated";
         public const string PaymentReceived = "PaymentReceived";
@@ -16,7 +16,7 @@ namespace BTCPayServer.Hubs
         public const string InvoiceError = "InvoiceError";
         private readonly AppsPublicController _AppsPublicController;
 
-        public CrowdfundHub(AppsPublicController appsPublicController)
+        public AppHub(AppsPublicController appsPublicController)
         {
             _AppsPublicController = appsPublicController;
         }

BTCPayServer/Services/Apps/AppHubStreamer.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using BTCPayServer.Controllers;
+using BTCPayServer.Data;
+using BTCPayServer.Events;
+using BTCPayServer.HostedServices;
+using BTCPayServer.Logging;
+using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Payments;
+using BTCPayServer.Rating;
+using BTCPayServer.Services.Apps;
+using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Rates;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using NBitcoin;
+
+namespace BTCPayServer.Services.Apps
+{
+    public class AppHubStreamer : EventHostedServiceBase
+    {
+        private readonly AppService _appService;
+        private IHubContext<AppHub> _HubContext;
+
+        public AppHubStreamer(EventAggregator eventAggregator,
+           IHubContext<AppHub> hubContext,
+           AppService appService) : base(eventAggregator)
+        {
+            _appService = appService;
+            _HubContext = hubContext;
+        }
+
+        protected override void SubscibeToEvents()
+        {
+            Subscribe<InvoiceEvent>();
+            Subscribe<AppsController.AppUpdated>();
+        }
+
+        protected override  async Task ProcessEvent(object evt, CancellationToken cancellationToken)
+        {
+            if (evt is InvoiceEvent invoiceEvent)
+            {
+                foreach (var appId in AppService.GetAppInternalTags(invoiceEvent.Invoice.InternalTags))
+                {
+                    if (invoiceEvent.Name == InvoiceEvent.ReceivedPayment)
+                    {
+                        var data = invoiceEvent.Payment.GetCryptoPaymentData();
+                        await _HubContext.Clients.Group(appId).SendCoreAsync(AppHub.PaymentReceived, new object[]
+                            {
+                        data.GetValue(),
+                        invoiceEvent.Payment.GetCryptoCode(),
+                        Enum.GetName(typeof(PaymentTypes),
+                            invoiceEvent.Payment.GetPaymentMethodId().PaymentType)
+                            }, cancellationToken);
+                    }
+                    await InfoUpdated(appId);
+                }
+            }
+            else if (evt is AppsController.AppUpdated app)
+            {
+                await InfoUpdated(app.AppId);
+            }
+        }
+
+        private async Task InfoUpdated(string appId)
+        {
+            var info = await _appService.GetAppInfo(appId);
+            await _HubContext.Clients.Group(appId).SendCoreAsync(AppHub.InfoUpdated, new object[] { info });
+        }
+    }
+}

BTCPayServer/Services/Apps/AppService.cs

@@ -0,0 +1,400 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Filters;
+using BTCPayServer.Models;
+using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Payments;
+using BTCPayServer.Rating;
+using BTCPayServer.Security;
+using BTCPayServer.Services.Apps;
+using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Rates;
+using Ganss.XSS;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using NBitpayClient;
+using YamlDotNet.RepresentationModel;
+using static BTCPayServer.Controllers.AppsController;
+
+namespace BTCPayServer.Services.Apps
+{
+    public class AppService
+    {
+        ApplicationDbContextFactory _ContextFactory;
+        private readonly InvoiceRepository _InvoiceRepository;
+        CurrencyNameTable _Currencies;
+        private readonly RateFetcher _RateFetcher;
+        private readonly HtmlSanitizer _HtmlSanitizer;
+        private readonly BTCPayNetworkProvider _Networks;
+        public CurrencyNameTable Currencies => _Currencies;
+        public AppService(ApplicationDbContextFactory contextFactory,
+                          InvoiceRepository invoiceRepository,
+                          BTCPayNetworkProvider networks,
+                          CurrencyNameTable currencies,
+                          RateFetcher rateFetcher,
+                          HtmlSanitizer htmlSanitizer)
+        {
+            _ContextFactory = contextFactory;
+            _InvoiceRepository = invoiceRepository;
+            _Currencies = currencies;
+            _RateFetcher = rateFetcher;
+            _HtmlSanitizer = htmlSanitizer;
+            _Networks = networks;
+        }
+
+        public async Task<object> GetAppInfo(string appId)
+        {
+            var app = await GetApp(appId, AppType.Crowdfund, true);
+            return await GetInfo(app);
+        }
+        private async Task<ViewCrowdfundViewModel> GetInfo(AppData appData, string statusMessage = null)
+        {
+            var settings = appData.GetSettings<CrowdfundSettings>();
+            var resetEvery = settings.StartDate.HasValue ? settings.ResetEvery : CrowdfundResetEvery.Never;
+            DateTime? lastResetDate = null;
+            DateTime? nextResetDate = null;
+            if (resetEvery != CrowdfundResetEvery.Never)
+            {
+                lastResetDate = settings.StartDate.Value;
+
+                nextResetDate = lastResetDate.Value;
+                while (DateTime.Now >= nextResetDate)
+                {
+                    lastResetDate = nextResetDate;
+                    switch (resetEvery)
+                    {
+                        case CrowdfundResetEvery.Hour:
+                            nextResetDate = lastResetDate.Value.AddHours(settings.ResetEveryAmount);
+                            break;
+                        case CrowdfundResetEvery.Day:
+                            nextResetDate = lastResetDate.Value.AddDays(settings.ResetEveryAmount);
+                            break;
+                        case CrowdfundResetEvery.Month:
+
+                            nextResetDate = lastResetDate.Value.AddMonths(settings.ResetEveryAmount);
+                            break;
+                        case CrowdfundResetEvery.Year:
+                            nextResetDate = lastResetDate.Value.AddYears(settings.ResetEveryAmount);
+                            break;
+                    }
+                }
+            }
+
+            var invoices = await GetInvoicesForApp(appData, lastResetDate);
+            var completeInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed).ToArray();
+            var pendingInvoices = invoices.Where(entity => !(entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed)).ToArray();
+
+            var rateRules = appData.StoreData.GetStoreBlob().GetRateRules(_Networks);
+
+            var pendingPaymentStats = GetCurrentContributionAmountStats(pendingInvoices, !settings.EnforceTargetAmount);
+            var paymentStats = GetCurrentContributionAmountStats(completeInvoices, !settings.EnforceTargetAmount);
+
+            var currentAmount = await GetCurrentContributionAmount(
+                paymentStats,
+                settings.TargetCurrency, rateRules);
+            var currentPendingAmount = await GetCurrentContributionAmount(
+                pendingPaymentStats,
+                settings.TargetCurrency, rateRules);
+
+            var perkCount = invoices
+                .Where(entity => !string.IsNullOrEmpty(entity.ProductInformation.ItemCode))
+                .GroupBy(entity => entity.ProductInformation.ItemCode)
+                .ToDictionary(entities => entities.Key, entities => entities.Count());
+
+            var perks = Parse(settings.PerksTemplate, settings.TargetCurrency);
+            if (settings.SortPerksByPopularity)
+            {
+                var ordered = perkCount.OrderByDescending(pair => pair.Value);
+                var newPerksOrder = ordered
+                    .Select(keyValuePair => perks.SingleOrDefault(item => item.Id == keyValuePair.Key))
+                    .Where(matchingPerk => matchingPerk != null)
+                    .ToList();
+                var remainingPerks = perks.Where(item => !newPerksOrder.Contains(item));
+                newPerksOrder.AddRange(remainingPerks);
+                perks = newPerksOrder.ToArray();
+            }
+            return new ViewCrowdfundViewModel()
+            {
+                Title = settings.Title,
+                Tagline = settings.Tagline,
+                Description = settings.Description,
+                CustomCSSLink = settings.CustomCSSLink,
+                MainImageUrl = settings.MainImageUrl,
+                EmbeddedCSS = settings.EmbeddedCSS,
+                StoreId = appData.StoreDataId,
+                AppId = appData.Id,
+                StartDate = settings.StartDate?.ToUniversalTime(),
+                EndDate = settings.EndDate?.ToUniversalTime(),
+                TargetAmount = settings.TargetAmount,
+                TargetCurrency = settings.TargetCurrency,
+                EnforceTargetAmount = settings.EnforceTargetAmount,
+                StatusMessage = statusMessage,
+                Perks = perks,
+                DisqusEnabled = settings.DisqusEnabled,
+                SoundsEnabled = settings.SoundsEnabled,
+                DisqusShortname = settings.DisqusShortname,
+                AnimationsEnabled = settings.AnimationsEnabled,
+                ResetEveryAmount = settings.ResetEveryAmount,
+                DisplayPerksRanking = settings.DisplayPerksRanking,
+                PerkCount = perkCount,
+                NeverReset = settings.ResetEvery == CrowdfundResetEvery.Never,
+                CurrencyData = _Currencies.GetCurrencyData(settings.TargetCurrency, true),
+                Info = new ViewCrowdfundViewModel.CrowdfundInfo()
+                {
+                    TotalContributors = invoices.Length,
+                    CurrentPendingAmount = currentPendingAmount,
+                    CurrentAmount = currentAmount,
+                    ProgressPercentage = (currentAmount / settings.TargetAmount) * 100,
+                    PendingProgressPercentage = (currentPendingAmount / settings.TargetAmount) * 100,
+                    LastUpdated = DateTime.Now,
+                    PaymentStats = paymentStats,
+                    PendingPaymentStats = pendingPaymentStats,
+                    LastResetDate = lastResetDate,
+                    NextResetDate = nextResetDate
+                }
+            };
+        }
+
+        public static string GetCrowdfundOrderId(string appId) => $"crowdfund-app_{appId}";
+        public static string GetAppInternalTag(string appId) => $"APP#{appId}";
+        public static string[] GetAppInternalTags(IEnumerable<string> tags)
+        {
+            return tags == null ? Array.Empty<string>() : tags
+                                                  .Where(t => t.StartsWith("APP#", StringComparison.InvariantCulture))
+                                                  .Select(t => t.Substring("APP#".Length)).ToArray();
+        }
+        private async Task<InvoiceEntity[]> GetInvoicesForApp(AppData appData, DateTime? startDate = null)
+        {
+            var invoices = await _InvoiceRepository.GetInvoices(new InvoiceQuery()
+            {
+                StoreId = new[] { appData.StoreData.Id },
+                OrderId = appData.TagAllInvoices ? null : new[] { GetCrowdfundOrderId(appData.Id) },
+                Status = new string[]{
+                    InvoiceState.ToString(InvoiceStatus.New),
+                    InvoiceState.ToString(InvoiceStatus.Paid),
+                    InvoiceState.ToString(InvoiceStatus.Confirmed),
+                    InvoiceState.ToString(InvoiceStatus.Complete)},
+                StartDate = startDate
+            });
+
+            // Old invoices may have invoices which were not tagged
+            invoices = invoices.Where(inv => inv.Version < InvoiceEntity.InternalTagSupport_Version ||
+                                             inv.InternalTags.Contains(GetAppInternalTag(appData.Id))).ToArray();
+            return invoices;
+        }
+
+        public async Task<StoreData[]> GetOwnedStores(string userId)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                return await ctx.UserStore
+                    .Where(us => us.ApplicationUserId == userId && us.Role == StoreRoles.Owner)
+                    .Select(u => u.StoreData)
+                    .ToArrayAsync();
+            }
+        }
+
+        public async Task<bool> DeleteApp(AppData appData)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                ctx.Apps.Add(appData);
+                ctx.Entry<AppData>(appData).State = EntityState.Deleted;
+                return await ctx.SaveChangesAsync() == 1;
+            }
+        }
+
+        public async Task<ListAppsViewModel.ListAppViewModel[]> GetAllApps(string userId, bool allowNoUser = false)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                return await ctx.UserStore
+                    .Where(us => (allowNoUser && string.IsNullOrEmpty(userId)) || us.ApplicationUserId == userId)
+                    .Join(ctx.Apps, us => us.StoreDataId, app => app.StoreDataId,
+                        (us, app) =>
+                            new ListAppsViewModel.ListAppViewModel()
+                            {
+                                IsOwner = us.Role == StoreRoles.Owner,
+                                StoreId = us.StoreDataId,
+                                StoreName = us.StoreData.StoreName,
+                                AppName = app.Name,
+                                AppType = app.AppType,
+                                Id = app.Id
+                            })
+                    .ToArrayAsync();
+            }
+        }
+
+
+        public async Task<AppData> GetApp(string appId, AppType appType, bool includeStore = false)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                var query = ctx.Apps
+                    .Where(us => us.Id == appId &&
+                                 us.AppType == appType.ToString());
+
+                if (includeStore)
+                {
+                    query = query.Include(data => data.StoreData);
+                }
+                return await query.FirstOrDefaultAsync();
+            }
+        }
+
+        public async Task<StoreData> GetStore(AppData app)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                return await ctx.Stores.FirstOrDefaultAsync(s => s.Id == app.StoreDataId);
+            }
+        }
+
+
+        public ViewPointOfSaleViewModel.Item[] Parse(string template, string currency)
+        {
+            if (string.IsNullOrWhiteSpace(template))
+                return Array.Empty<ViewPointOfSaleViewModel.Item>();
+            var input = new StringReader(template);
+            YamlStream stream = new YamlStream();
+            stream.Load(input);
+            var root = (YamlMappingNode)stream.Documents[0].RootNode;
+            return root
+                .Children
+                .Select(kv => new PosHolder { Key = (kv.Key as YamlScalarNode)?.Value, Value = kv.Value as YamlMappingNode })
+                .Where(kv => kv.Value != null)
+                .Select(c => new ViewPointOfSaleViewModel.Item()
+                {
+                    Description = _HtmlSanitizer.Sanitize(c.GetDetailString("description")),
+                    Id = c.Key,
+                    Image = _HtmlSanitizer.Sanitize(c.GetDetailString("image")),
+                    Title = _HtmlSanitizer.Sanitize(c.GetDetailString("title") ?? c.Key),
+                    Price = c.GetDetail("price")
+                             .Select(cc => new ViewPointOfSaleViewModel.Item.ItemPrice()
+                             {
+                                 Value = decimal.Parse(cc.Value.Value, CultureInfo.InvariantCulture),
+                                 Formatted = Currencies.FormatCurrency(cc.Value.Value, currency)
+                             }).Single(),
+                    Custom = c.GetDetailString("custom") == "true"
+                })
+                .ToArray();
+        }
+
+        public async Task<decimal> GetCurrentContributionAmount(Dictionary<string, decimal> stats, string primaryCurrency, RateRules rateRules)
+        {
+            var result = new List<decimal>();
+
+            var ratesTask = _RateFetcher.FetchRates(
+                stats.Keys
+                    .Select((x) => new CurrencyPair(primaryCurrency, PaymentMethodId.Parse(x).CryptoCode))
+                    .Distinct()
+                    .ToHashSet(),
+                rateRules).Select(async rateTask =>
+                {
+                    var (key, value) = rateTask;
+                    var tResult = await value;
+                    var rate = tResult.BidAsk?.Bid;
+                    if (rate == null)
+                        return;
+
+                    foreach (var stat in stats)
+                    {
+                        if (string.Equals(PaymentMethodId.Parse(stat.Key).CryptoCode, key.Right,
+                            StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            result.Add((1m / rate.Value) * stat.Value);
+                        }
+                    }
+                });
+
+            await Task.WhenAll(ratesTask);
+
+            return result.Sum();
+        }
+
+        public Dictionary<string, decimal> GetCurrentContributionAmountStats(InvoiceEntity[] invoices, bool softcap)
+        {
+            return invoices
+                .SelectMany(p =>
+                {
+                    // For hardcap, we count newly created invoices as part of the contributions
+                    if (!softcap && p.Status == InvoiceStatus.New)
+                        return new[] { (Key: p.ProductInformation.Currency, Value: p.ProductInformation.Price) };
+
+                    // If the user get a donation via other mean, he can register an invoice manually for such amount
+                    // then mark the invoice as complete
+                    var payments = p.GetPayments();
+                    if (payments.Count == 0 &&
+                        p.ExceptionStatus == InvoiceExceptionStatus.Marked &&
+                        p.Status == InvoiceStatus.Complete)
+                        return new[] { (Key: p.ProductInformation.Currency, Value: p.ProductInformation.Price) };
+
+                    // If an invoice has been marked invalid, remove the contribution
+                    if (p.ExceptionStatus == InvoiceExceptionStatus.Marked &&
+                        p.Status == InvoiceStatus.Invalid)
+                        return new[] { (Key: p.ProductInformation.Currency, Value: 0m) };
+
+                    // Else, we just sum the payments
+                    return payments
+                             .Select(pay => (Key: pay.GetPaymentMethodId().ToString(), Value: pay.GetCryptoPaymentData().GetValue()))
+                             .ToArray();
+                })
+                .GroupBy(p => p.Key)
+                .ToDictionary(p => p.Key, p => p.Select(v => v.Value).Sum());
+        }
+
+        private class PosHolder
+        {
+            public string Key { get; set; }
+            public YamlMappingNode Value { get; set; }
+
+            public IEnumerable<PosScalar> GetDetail(string field)
+            {
+                var res = Value.Children
+                                 .Where(kv => kv.Value != null)
+                                 .Select(kv => new PosScalar { Key = (kv.Key as YamlScalarNode)?.Value, Value = kv.Value as YamlScalarNode })
+                                 .Where(cc => cc.Key == field);
+                return res;
+            }
+
+            public string GetDetailString(string field)
+            {
+
+                return GetDetail(field).FirstOrDefault()?.Value?.Value;
+            }
+        }
+        private class PosScalar
+        {
+            public string Key { get; set; }
+            public YamlScalarNode Value { get; set; }
+        }
+
+        public async Task<AppData> GetAppDataIfOwner(string userId, string appId, AppType? type = null)
+        {
+            if (userId == null || appId == null)
+                return null;
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                var app = await ctx.UserStore
+                                .Where(us => us.ApplicationUserId == userId && us.Role == StoreRoles.Owner)
+                                .SelectMany(us => us.StoreData.Apps.Where(a => a.Id == appId))
+                   .FirstOrDefaultAsync();
+                if (app == null)
+                    return null;
+                if (type != null && type.Value.ToString() != app.AppType)
+                    return null;
+                return app;
+            }
+        }
+    }
+}

BTCPayServer/Services/Apps/CrowdfundSettings.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Apps
+{
+    public class CrowdfundSettings
+    {
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public bool Enabled { get; set; } = false;
+
+        public DateTime? StartDate { get; set; }
+        public DateTime? EndDate { get; set; }
+
+        public string TargetCurrency { get; set; }
+        public decimal? TargetAmount { get; set; }
+
+        public bool EnforceTargetAmount { get; set; }
+        public string CustomCSSLink { get; set; }
+        public string MainImageUrl { get; set; }
+        public string NotificationUrl { get; set; }
+        public string Tagline { get; set; }
+        public string EmbeddedCSS { get; set; }
+        public string PerksTemplate { get; set; }
+        public bool DisqusEnabled { get; set; } = false;
+        public bool SoundsEnabled { get; set; } = true;
+        public string DisqusShortname { get; set; }
+        public bool AnimationsEnabled { get; set; } = true;
+        public int ResetEveryAmount { get; set; } = 1;
+        public CrowdfundResetEvery ResetEvery { get; set; } = CrowdfundResetEvery.Never;
+        [Obsolete("Use AppData.TagAllInvoices instead")]
+        public bool UseAllStoreInvoices { get; set; }
+        public bool DisplayPerksRanking { get; set; }
+        public bool SortPerksByPopularity { get; set; }
+    }
+    public enum CrowdfundResetEvery
+    {
+        Never,
+        Hour,
+        Day,
+        Month,
+        Year
+    }
+}

BTCPayServer/Services/Invoices/Export/InvoiceExport.cs

@@ -102,6 +102,7 @@ namespace BTCPayServer.Services.Invoices.Export
                     InvoiceItemDesc = invoice.ProductInformation.ItemDesc,
                     InvoicePrice = invoice.ProductInformation.Price,
                     InvoiceCurrency = invoice.ProductInformation.Currency,
+                    BuyerEmail = invoice.BuyerInformation?.BuyerEmail
                 };
 
                 exportList.Add(target);
@@ -139,5 +140,6 @@ namespace BTCPayServer.Services.Invoices.Export
         public string InvoiceFullStatus { get; set; }
         public string InvoiceStatus { get; set; }
         public string InvoiceExceptionStatus { get; set; }
+        public string BuyerEmail { get; set; }
     }
 }

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -91,6 +91,12 @@ namespace BTCPayServer.Services.Invoices
             get; set;
         }
 
+        [JsonProperty(PropertyName = "taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         [JsonProperty(PropertyName = "currency")]
         public string Currency
         {
@@ -107,6 +113,8 @@ namespace BTCPayServer.Services.Invoices
     }
     public class InvoiceEntity
     {
+        public const int InternalTagSupport_Version = 1;
+        public int Version { get; set; } = 1;
         public string Id
         {
             get; set;
@@ -158,6 +166,9 @@ namespace BTCPayServer.Services.Invoices
             set;
         }
 
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public HashSet<string> InternalTags { get; set; } = new HashSet<string>();
+        
         [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategy
         {

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -93,6 +93,16 @@ retry:
             }
         }
 
+        public async Task<AppData[]> GetAppsTaggingStore(string storeId)
+        {
+            if (storeId == null)
+                throw new ArgumentNullException(nameof(storeId));
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                return await ctx.Apps.Where(a => a.StoreDataId == storeId && a.TagAllInvoices).ToArrayAsync();
+            }
+        }
+
         public async Task UpdateInvoice(string invoiceId, UpdateCustomerModel data)
         {
             using (var ctx = _ContextFactory.CreateContext())
@@ -178,7 +188,6 @@ retry:
             textSearch.Add(invoice.StoreId);
 
             AddToTextSearch(invoice.Id, textSearch.ToArray());
-
             return invoice;
         }
 

BTCPayServer/Services/MigrationSettings.cs

@@ -11,5 +11,6 @@ namespace BTCPayServer.Services
         public bool DeprecatedLightningConnectionStringCheck { get; set; }
         public bool ConvertMultiplierToSpread { get; set; }
         public bool ConvertNetworkFeeProperty { get; set; }
+        public bool ConvertCrowdfundOldSettings { get; set; }
     }
 }

BTCPayServer/Services/Rates/CurrencyNameTable.cs

@@ -42,6 +42,15 @@ namespace BTCPayServer.Services.Rates
 
         static Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
 
+        public string FormatCurrency(string price, string currency)
+        {
+            return FormatCurrency(decimal.Parse(price, CultureInfo.InvariantCulture), currency);
+        }
+        public string FormatCurrency(decimal price, string currency)
+        {
+            return price.ToString("C", GetCurrencyProvider(currency));
+        }
+
         public NumberFormatInfo GetNumberFormatInfo(string currency, bool useFallback)
         {
             var data = GetCurrencyProvider(currency);
@@ -121,15 +130,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/UpdateCrowdfund.cshtml

@@ -1,6 +1,4 @@
-@using BTCPayServer.Crowdfund
-@using BTCPayServer.Hubs
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
 @model UpdateCrowdfundViewModel
 @{
     ViewData["Title"] = "Update Crowdfund";
@@ -9,18 +7,18 @@
     <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">Contribution Perks 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">
-            </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 class="modal-header">
+                    <h5 class="modal-title">Contribution Perks 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">
+                </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>
@@ -44,20 +42,20 @@
                         <label asp-for="Title" class="control-label"></label>*
                         <input asp-for="Title" class="form-control" />
                         <span asp-validation-for="Title" class="text-danger"></span>
-                    </div> 
-                    
+                    </div>
+
                     <div class="form-group">
                         <label asp-for="Tagline" class="control-label"></label>
                         <input asp-for="Tagline" class="form-control" />
                         <span asp-validation-for="Tagline" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <label asp-for="Description" class="control-label"></label>
+                        <label asp-for="Description" class="control-label"></label>*
                         <textarea asp-for="Description" rows="20" cols="40" class="form-control richtext"></textarea>
                         <span asp-validation-for="Description" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <label asp-for="TargetCurrency" class="control-label"></label>
+                        <label asp-for="TargetCurrency" class="control-label"></label>*
                         <input asp-for="TargetCurrency" class="form-control" />
                         <span asp-validation-for="TargetCurrency" class="text-danger"></span>
                     </div>
@@ -68,13 +66,21 @@
                     </div>
                     <div class="form-group">
                         <label asp-for="StartDate" class="control-label"></label>
-                        <input asp-for="StartDate" class="form-control datetime " />
+                        <div class="input-group ">
+                            <input asp-for="StartDate" class="form-control datetime"/>
+                            <div class="input-group-append only-for-js">
+
+                                <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
+                                    <span class=" fa fa-times"></span>
+                                </button>
+                            </div>
+                        </div>
                         <span asp-validation-for="StartDate" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="ResetEvery" class="control-label"></label>
                         <div class="input-group">
-                            
+
                             <input type="number" asp-for="ResetEveryAmount" placeholder="Amount" class="form-control">
                             <select class="custom-select" asp-for="ResetEvery">
                                 @foreach (var opt in Model.ResetEveryValues)
@@ -84,10 +90,17 @@
                             </select>
                         </div>
                     </div>
-                    
                     <div class="form-group">
                         <label asp-for="EndDate" class="control-label"></label>
-                        <input asp-for="EndDate" class="form-control datetime" />
+                        <div class="input-group ">
+                            <input asp-for="EndDate" class="form-control datetime" />
+                            <div class="input-group-append only-for-js">
+
+                                <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
+                                    <span class=" fa fa-times"></span>
+                                </button>
+                            </div>
+                        </div>
                         <span asp-validation-for="EndDate" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -108,18 +121,17 @@
                         <a href="https://docs.btcpayserver.org/development/theme#bootstrap-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                         <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
-                    </div>                    
+                    </div>
                     <div class="form-group">
                         <label asp-for="MainImageUrl" class="control-label"></label>
                         <input asp-for="MainImageUrl" class="form-control" />
                         <span asp-validation-for="MainImageUrl" class="text-danger"></span>
-                    </div>  
+                    </div>
                     <div class="form-group">
                         <label asp-for="EmbeddedCSS" class="control-label"></label>
-                      
                         <textarea asp-for="EmbeddedCSS" rows="10" cols="40" class="form-control"></textarea>
                         <span asp-validation-for="EmbeddedCSS" class="text-danger"></span>
-                    </div> 
+                    </div>
                     <div class="form-group">
                         <label asp-for="NotificationUrl" class="control-label"></label>
                         <input asp-for="NotificationUrl" class="form-control" />
@@ -134,7 +146,7 @@
                         <label asp-for="SortPerksByPopularity"></label>
                         <input asp-for="SortPerksByPopularity" type="checkbox" class="form-check"/>
                         <span asp-validation-for="SortPerksByPopularity" class="text-danger"></span>
-                    </div> 
+                    </div>
                     <div class="form-group">
                         <label asp-for="DisplayPerksRanking"></label>
                         <input asp-for="DisplayPerksRanking" type="checkbox" class="form-check"/>
@@ -144,11 +156,6 @@
                         <label asp-for="EnforceTargetAmount"></label>
                         <input asp-for="EnforceTargetAmount" type="checkbox" class="form-check"/>
                         <span asp-validation-for="EnforceTargetAmount" class="text-danger"></span>
-                    </div> 
-                    <div class="form-group">
-                        <label asp-for="UseInvoiceAmount"></label>
-                        <input asp-for="UseInvoiceAmount" type="checkbox" class="form-check"/>
-                        <span asp-validation-for="UseInvoiceAmount" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="UseAllStoreInvoices"></label>
@@ -175,13 +182,13 @@
                         <input asp-for="DisqusShortname" class="form-control" />
                         <span asp-validation-for="DisqusShortname" class="text-danger"></span>
                     </div>
-                <div class="form-group">
-                    <input type="submit" class="btn btn-primary" value="Save Settings" />
-                    <a class="btn btn-secondary" target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@($"orderid:{CrowdfundHubStreamer.CrowdfundInvoiceOrderIdPrefix}{Model.AppId}")">Invoices generated by app</a>
-                    <a class="btn btn-secondary" target="_blank" asp-action="ViewCrowdfund" asp-controller="AppsPublic" asp-route-appId="@Model.AppId">View App</a>
-                    <a class="btn btn-secondary" target="_blank" asp-action="ListApps">Back to the app list</a>
-                </div>
-               
+                    <div class="form-group">
+                        <input type="submit" class="btn btn-primary" value="Save Settings" />
+                        <a class="btn btn-secondary" target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@Model.SearchTerm">Invoices</a>
+                        <a class="btn btn-secondary" target="_blank" asp-action="ViewCrowdfund" asp-controller="AppsPublic" asp-route-appId="@Model.AppId">View App</a>
+                        <a class="btn btn-secondary" target="_blank" asp-action="ListApps">Back to the app list</a>
+                    </div>
+
                 </form>
             </div>
         </div>
@@ -207,38 +214,38 @@
     </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 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="number" step="any" 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="col-sm-3">
-                <label>Price</label>*
-                <input type="number" step="any" class="js-product-price form-control mb-2" value="{price}" />
+            <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="col-sm-3">
-                <label>Custom price</label>
-                <select class="js-product-custom form-control">
-                    {custom}
-                </select>
+            <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>
-        <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>
 }
 

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/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml

@@ -37,7 +37,7 @@
                 {
                     <span class="mt-3">
                         <span class="h5">@Model.TargetAmount @Model.TargetCurrency</span>
-                        @if (Model.ResetEveryAmount > 0 && Model.ResetEvery != nameof(CrowdfundResetEvery.Never))
+                        @if (Model.ResetEveryAmount > 0 && !Model.NeverReset)
                         {
                             <span> Dynamic</span>
                         }

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -13,7 +13,7 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link href="@Context.Request.GetAbsoluteUri(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
     @if (Model.CustomCSSLink != null)
     {
         <link href="@Model.CustomCSSLink" rel="stylesheet"/>

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -20,7 +20,7 @@
 
     <link rel="manifest" href="~/manifest.json">
 
-    <link href="@this.Context.Request.GetAbsoluteUri(themeManager.BootstrapUri)" rel="stylesheet" />
+    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
         <link href="@Model.CustomCSSLink" rel="stylesheet" />
@@ -194,6 +194,7 @@
                 <div class="modal-footer bg-light">
                     <form method="post" asp-antiforgery="false" data-buy>
                         <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
+                        <input id="js-cart-posdata" class="form-control" type="hidden" name="posdata">
                         <button id="js-cart-pay" class="btn btn-primary btn-lg" type="submit"><b>@Model.CustomButtonText</b></button>
                     </form>
                 </div>

BTCPayServer/Views/Home/BitpayTranslator.cshtml

@@ -24,7 +24,7 @@
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">The Bitpay Translator</h2>
                 <hr class="primary">
-                <p>Bitpay is using deprecated standard in their invoices which multiple wallet do not support, use this transform their invoices to regular address/amount.</p>
+                <p>Bitpay is using a deprecated standard in their invoices that most wallets do not support. Use this tool to transform their invoices to a regular address/amount.</p>
             </div>
         </div>
         <div class="row">

BTCPayServer/Views/Home/Home.cshtml

@@ -10,7 +10,7 @@
             <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.</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>
+            <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://btcpayserver.org" target="_blank">Official website</a>
         </div>
     </div>
 </header>
@@ -128,13 +128,19 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-lg-4 ml-auto text-center">
-                <a href="http://slack.forkbitpay.ninja/">
+            <div class="col-lg-3 ml-auto text-center">
+                <a href="https://chat.btcpayserver.org/">
+                    <img src="~/img/mattermost.png" height="100" />
+                </a>
+                <p><a href="https://chat.btcpayserver.org/">On Mattermost</a></p>
+            </div>
+            <div class="col-lg-3 ml-auto text-center">
+                <a href="https://slack.btcpayserver.org/">
                     <img src="~/img/slack.png" height="100" />
                 </a>
                 <p><a href="http://slack.forkbitpay.ninja/">On Slack</a></p>
             </div>
-            <div class="col-lg-4 mr-auto text-center">
+            <div class="col-lg-3 mr-auto text-center">
                 <a href="https://twitter.com/BtcpayServer">
                     <img src="~/img/twitter.png" height="100" />
                 </a>
@@ -142,7 +148,7 @@
                     <a href="https://twitter.com/BtcpayServer">On Twitter</a>
                 </p>
             </div>
-            <div class="col-lg-4 mr-auto text-center">
+            <div class="col-lg-3 mr-auto text-center">
                 <a href="https://github.com/btcpayserver/btcpayserver">
                     <img src="~/img/github.png" height="100" />
                 </a>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -390,7 +390,7 @@
                     <span v-html="$t('Return to StoreName', srvModel)"></span>
                 </a>
                 <button class="action-button close-action" v-show="isModal">
-                    <span v-html="$t('home.header.title')">{{$t("Return to StoreName", srvModel)}}</span>
+                    <span v-html="$t('Close')">{{$t("Return to StoreName", srvModel)}}</span>
                 </button>
             </div>
         </div>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -155,7 +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.TaxIncluded</td>
                     </tr>
                 </table>
             }
@@ -178,30 +182,17 @@
                     </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.TaxIncluded</td>
                     </tr>
                 </table>
             </div>
             <div class="col-md-6">
                 <h3>Point of Sale Data</h3>
-                <table class="table table-sm table-responsive-md">
-                    @foreach (var posDataItem in Model.PosData)
-                    {
-                        <tr>
-                            @if (!string.IsNullOrEmpty(posDataItem.Key))
-                            {
-
-                                <th>@posDataItem.Key</th>
-                                <td>@posDataItem.Value</td>
-                            }
-                            else
-                            {
-
-                                <td colspan="2">@posDataItem.Value</td>
-                            }
-                        </tr>
-                    }
-                </table>
+                <partial name="PosData" model="@Model.PosData" />
             </div>
         </div>
     }

BTCPayServer/Views/Invoice/PosData.cshtml

@@ -0,0 +1,37 @@
+@model Dictionary<string, object>
+
+<table class="table table-sm table-responsive-md">
+    @foreach (var posDataItem in Model)
+    {
+        <tr>
+            @if (!string.IsNullOrEmpty(posDataItem.Key))
+            {
+                <th>@posDataItem.Key</th>
+                <td>
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+
+                </td>
+            }
+            else
+            {
+                <td colspan="2">
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+                </td>
+            }
+        </tr>
+    }
+</table>

BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
 @model BTCPayServer.Controllers.ShowLightningNodeInfoViewModel
@@ -18,7 +18,7 @@
 
     <link rel="manifest" href="~/manifest.json">
 
-    <link href="@this.Context.Request.GetAbsoluteUri(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
     <link href="~/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
 
     <bundle name="wwwroot/bundles/lightning-node-info-bundle.min.js"/>
@@ -73,36 +73,39 @@
             position: relative;
             text-align: center;
         }
-        .copy {
-            cursor: copy;
-        }
+
+        .copy { cursor: copy; }
         
     </style>
 </head>
 <body >
 <noscript>
     <div class="container">
-        <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
-            <div class="card border-0">
-                <div class="row"></div>
-                <h1 class="card-title text-center">
-                    @Model.CryptoCode Lightning Node - @(Model.Available? "Online" : "Unavailable")
-                    <small class="@(Model.Available? "text-success" : "text-danger")">
-                        <span class="fa fa-circle "></span>
-                    </small>
-                </h1>
-                @if (Model.Available)
-                {
-                    <div class="card-body m-sm-0 p-sm-0" >
-                        <div class="input-group">
-                            <input type="text" class="form-control " readonly="readonly" asp-for="NodeInfo" id="peer-info"/>
-                            <div class="input-group-append">
-                                <span class="input-group-text fa fa-copy"> </span>
+        <div class="row " style="height: 100vh">
+            <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
+                <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
+                    <div class="card border-0">
+                        <div class="row"></div>
+                        <h1 class="card-title text-center">
+                            @Model.CryptoCode Lightning Node - @(Model.Available ? "Online" : "Unavailable")
+                            <small class="@(Model.Available ? "text-success" : "text-danger")">
+                                <span class="fa fa-circle "></span>
+                            </small>
+                        </h1>
+                        @if (Model.Available)
+                        {
+                            <div class="card-body m-sm-0 p-sm-0">
+                                <div class="input-group">
+                                    <input type="text" class="form-control " readonly="readonly" asp-for="NodeInfo" id="peer-info"/>
+                                    <div class="input-group-append">
+                                        <span class="input-group-text fa fa-copy"> </span>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
+                        }
+
                     </div>
-                }
-             
+                </div>
             </div>
         </div>
     </div>

BTCPayServer/Views/Server/LightningWalletServices.cshtml

@@ -1,10 +1,10 @@
-@model SparkServicesViewModel
+@model LightningWalletServices
 @{
     ViewData.SetActivePageAndTitle(ServerNavPages.Services);
 }
 
 
-<h4>Spark service</h4>
+<h4>@Model.WalletName</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 
 @if (Model.ShowQR)
@@ -30,7 +30,7 @@
         <div class="form-group">
             <h5>Browser connection</h5>
             <p>
-                <span>You can go to spark from your browser by <a href="@Model.SparkLink" target="_blank">clicking here</a><br /></span>
+                <span>You can go to @Model.WalletName from your browser by <a href="@Model.ServiceLink" target="_blank">clicking here</a><br /></span>
             </p>
         </div>
 
@@ -54,7 +54,7 @@
             {
                 <div class="form-group">
                     <div id="qrCode"></div>
-                    <div id="qrCodeData" data-url="@Html.Raw(Model.SparkLink)"></div>
+                    <div id="qrCodeData" data-url="@Html.Raw(Model.ServiceLink)"></div>
                 </div>
             }
         </div>
@@ -70,7 +70,7 @@
         <script type="text/javascript">
         new QRCode(document.getElementById("qrCode"),
             {
-                text: "@Html.Raw(Model.SparkLink)",
+                text: "@Html.Raw(Model.ServiceLink)",
                 width: 150,
                 height: 150
             });

BTCPayServer/Views/Shared/Confirm.cshtml

@@ -12,6 +12,8 @@
                 <p>@Model.Description</p>
             </div>
         </div>
+        @if (!String.IsNullOrEmpty(Model.Action))
+        {
         <div class="row">
             <div class="col-lg-12 text-center">
                 <form method="post">
@@ -19,5 +21,6 @@
                 </form>
             </div>
         </div>
+        }
     </div>
 </section>

BTCPayServer/Views/Shared/_StatusMessage.cshtml

@@ -1,10 +1,17 @@
 @model string
 
-@if(!String.IsNullOrEmpty(Model))
+@if(!string.IsNullOrEmpty(Model))
 {
-    var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success";
-    <div class="alert alert-@statusMessageClass alert-dismissible" role="alert">
+    var parsedModel = new StatusMessageModel(Model);
+    <div class="alert alert-@parsedModel.SeverityCSS alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        @Model
+        @if (!string.IsNullOrEmpty(parsedModel.Message))
+        {
+            @parsedModel.Message
+        }
+        @if (!string.IsNullOrEmpty(parsedModel.Html))
+        {
+            @Html.Raw(parsedModel.Html)
+        }
     </div>
 }

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -38,12 +38,17 @@
                     </p>
                     <div id="ledger-info" class="form-text text-muted" style="display: none;">
                         <span>A ledger wallet is detected, which account do you want to use? No need to paste manually xpub if your ledger device was detected. Just select derivation scheme from the list bellow and xpub will automatically populate.</span>
-                        <ul>
-                            @for (int i = 0; i < 4; i++)
-                            {
-                                <li><a class="ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
-                            }
-                        </ul>
+                        <div class="dropdown">
+                            <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 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>
+                                }
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group">
@@ -58,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/Views/Stores/UpdateChangellySettings.cshtml

@@ -11,6 +11,9 @@
 <div class="row">
     <div class="col-md-10">
         <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling Changelly support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
             <p>
                 You can obtain API keys at
                 <a href="https://changelly.com/?ref_id=804298eb5753" target="_blank">

BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml

@@ -11,8 +11,11 @@
 <div class="row">
     <div class="col-md-10">
         <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling CoinSwitch support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
             <p>
-                You can obtain a merchant id at 
+                You can obtain a merchant id at
                 <a href="https://coinswitch.co/switch/setup/btcpay" target="_blank">
                     https://coinswitch.co/switch/setup/btcpay
                 </a>
@@ -24,10 +27,10 @@
             </div>
             <div class="form-group">
                 <label asp-for="Mode"></label>
-                <select asp-for="Mode" asp-items="Model.Modes" class="form-control" >
+                <select asp-for="Mode" asp-items="Model.Modes" class="form-control">
                 </select>
             </div>
-            
+
             <div class="form-group">
                 <label asp-for="Enabled"></label>
                 <input asp-for="Enabled" type="checkbox" class="form-check"/>

BTCPayServer/Views/Wallets/WalletTransactions.cshtml

@@ -29,7 +29,8 @@
 <h4>@ViewData["Title"]</h4>
 <div class="row">
     <div class="col-md-10">
-        If this wallet got restored, should have received money but nothing is showing up, please <a asp-action="WalletRescan">Rescan it</a>.
+        If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan">rescan your wallet</a>. <br />
+        If some transactions appear in BTCPay Server, but are missing on Electrum or another wallet, <a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-wallet#missing-payments-in-my-software-or-hardware-wallet">follow those instructions</a>.
     </div>
 </div>
 <div class="row">

BTCPayServer/bundleconfig.json

@@ -114,7 +114,7 @@
             "wwwroot/vendor/highlightjs/default.min.css",
             "wwwroot/vendor/summernote/summernote-bs4.css",
             "wwwroot/vendor/flatpickr/flatpickr.min.css",
-            "wwwroot/crowdfund-admin/**/*.js"
+            "wwwroot/crowdfund-admin/*.js"
         ]
     },
     {

BTCPayServer/wwwroot/cart/js/cart.js

@@ -21,6 +21,7 @@ function Cart() {
     
     this.updateItemsCount();
     this.updateAmount();
+    this.updatePosData();
 }
 
 Cart.prototype.setCustomAmount = function(amount) {
@@ -243,6 +244,7 @@ Cart.prototype.updateAll = function() {
     this.updateSummaryTotal();
     this.updateTotal();
     this.updateAmount();
+    this.updatePosData();
 }
 
 // Update number of cart items
@@ -290,6 +292,20 @@ Cart.prototype.updateTip = function(amount) {
 Cart.prototype.updateAmount = function() {
     $('#js-cart-amount').val(this.getTotal(true));
 }
+Cart.prototype.updatePosData = function() {
+
+    var result = {
+      cart: this.content,
+      customAmount: this.fromCents(this.getCustomAmount()),
+      discountPercentage: this.discount? parseFloat(this.discount): 0,
+      subTotal: this.fromCents(this.getTotalProducts()),
+      discountAmount: this.fromCents(this.getDiscountAmount(this.totalAmount)),
+      tip: this.tip? this.tip: 0,
+      total: this.getTotal(true)
+    };
+    console.warn(result);
+    $('#js-cart-posdata').val(JSON.stringify(result));
+}
 
 Cart.prototype.resetDiscount = function() {
     this.setDiscount(0);
@@ -644,6 +660,7 @@ $.fn.inputAmount = function(obj, type) {
 
         obj.updateSummaryTotal();
         obj.updateAmount();
+        obj.updatePosData();
         obj.emptyCartToggle();
     });
 }
@@ -668,4 +685,4 @@ $.fn.removeAmount = function(obj, type) {
         obj.updateSummaryTotal();
         obj.emptyCartToggle();  
     });
-}
+}

BTCPayServer/wwwroot/checkout/js/core.js

@@ -95,9 +95,8 @@ function onDataCallback(jsonData) {
 }
 
 function fetchStatus() {
-    var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/" + srvModel.paymentMethodId + "/status";
     $.ajax({
-        url: path,
+        url: window.location.pathname + "/status?invoiceId=" + srvModel.invoiceId + "&paymentMethodId=" + srvModel.paymentMethodId,
         type: "GET",
         cache: false
     }).done(function (data) {
@@ -164,11 +163,8 @@ $(document).ready(function () {
                 $("#emailAddressForm .input-wrapper bp-loading-button .action-button").addClass("loading");
                 // Push the email to a server, once the reception is confirmed move on
                 srvModel.customerEmail = emailAddress;
-
-                var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/UpdateCustomer";
-
                 $.ajax({
-                    url: path,
+                    url: window.location.pathname + "/UpdateCustomer?invoiceId=" + srvModel.invoiceId,
                     type: "POST",
                     data: JSON.stringify({ Email: srvModel.customerEmail }),
                     contentType: "application/json; charset=utf-8"
@@ -240,14 +236,22 @@ $(document).ready(function () {
 
     var supportsWebSockets = 'WebSocket' in window && window.WebSocket.CLOSING === 2;
     if (supportsWebSockets) {
-        var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/status/ws";
-        path = path.replace("https://", "wss://");
-        path = path.replace("http://", "ws://");
+        var loc = window.location, ws_uri;
+        if (loc.protocol === "https:") {
+            ws_uri = "wss:";
+        } else {
+            ws_uri = "ws:";
+        }
+        ws_uri += "//" + loc.host;
+        ws_uri += loc.pathname + "/status/ws?invoiceId=" + srvModel.invoiceId;
         try {
-            var socket = new WebSocket(path);
+            var socket = new WebSocket(ws_uri);
             socket.onmessage = function (e) {
                 fetchStatus();
             };
+            socket.onerror = function (e) {
+                console.error("Error while connecting to websocket for invoice notifications (callback)");
+            };
         }
         catch (e) {
             console.error("Error while connecting to websocket for invoice notifications");

BTCPayServer/wwwroot/crowdfund/services/listener.js

@@ -1,7 +1,7 @@
 
 var hubListener = function(){
    
-    var connection = new signalR.HubConnectionBuilder().withUrl("/apps/crowdfund/hub").build();
+    var connection = new signalR.HubConnectionBuilder().withUrl("/apps/hub").build();
 
     connection.onclose(function(){
         eventAggregator.$emit("connection-lost");

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/el-GR.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": "el-GR",
+  "currentLanguage": "Ελληνικά",
+  "lang": "Γλώσσα",
+  "Awaiting Payment...": "Αναμονή Πληρωμής...",
+  "Pay with": "Πληρώστε με",
+  "Contact and Refund Email": "Email Επικοινωνίας & Επιστροφής Πληρωμής",
+  "Contact_Body": "Παρακαλούμε εισάγετε το email σας παρακάτω. Θα επικοινωνήσουμε μαζί σας σε αυτή τη διεύθυνση ηλεκτρονικής αλληλογραφίας εαν προκύψει κάποιο θέμα με την πληρωμή σας.",
+  "Your email": "Το email σας",
+  "Continue": "Συνέχεια",
+  "Please enter a valid email address": "Παρακαλούμε εισάγετε μια έγκυρη διεύθυνση email",
+  "Order Amount": "Ποσό Παραγγελίας",
+  "Network Cost": "Κόστος Δικτύου",
+  "Already Paid": "Πληρώθηκαν Ήδη",
+  "Due": "Οφειλόμενα",
+  "Scan": "Σάρωση",
+  "Copy": "Αντιγραφή",
+  "Conversion": "Μετατροπή",
+  "Open in wallet": "Άνοιγμα στο πορτοφόλι",
+  "CompletePay_Body": "Για να ολοκληρωθεί η πληρωμή σας, παρακαλούμε στείλετε {{btcDue}} {{cryptoCode}} στην παρακάτω διεύθυνση.",
+  "Amount": "Ποσό",
+  "Address": "Διεύθυνση",
+  "Copied": "Αντιγράφηκε",
+  "ConversionTab_BodyTop": "Μπορείτε να πληρώσετε {{btcDue}} {{cryptoCode}} χρησιμοποιώντας άλλα κρυπτονομίσματα εκτός απο αυτά που υποστηρίζονται απευθείας απο τον έμπορο.",
+  "ConversionTab_BodyDesc": "Αυτή η υπηρεσία παρέχεται απο 3ο μέρος. Παρακαλούμε έχετε υπ'όψιν σας πως δεν έχουμε κανένα απολύτως έλεγχο στο πώς οι πάροχοι πληρωμών θα προωθήσουν την πληρωμή σας. Το παραστατικό πληρωμής θα καταχωρηθεί ώς πληρωμένο μόνο όταν τα νομίσματα εμφανιστούν στη Blockchain του {{cryptoCode}}.",
+  "ConversionTab_CalculateAmount_Error": "Δοκιμάστε πάλι",
+  "ConversionTab_LoadCurrencies_Error": "Δοκιμάστε πάλι",
+  "ConversionTab_Lightning": "Δεν υπάρχουν διαθέσιμοι πάροχοι πληρωμών για πληρωμες στο Lightning Network.",
+  "ConversionTab_CurrencyList_Select_Option": "Παρακαλούμε επιλέξτε ένα νόμισμα απο το οποίο θα γίνει η μετατροπή",
+  "Invoice expiring soon...": "Το παραστατικό πληρωμης θα λήξει σύντομα...",
+  "Invoice expired": "Το παραστατικό πληρωμής έληξε",
+  "What happened?": "Τί συνέβη;",
+  "InvoiceExpired_Body_1": "Το παρών παραστατικό πληρωμής έχει λήξει. Ένα παραστατικό πληρωμής ισχύει μόνο για {{maxTimeMinutes}} λεπτά.\nΜπορείτε να επιστρέψετε στο {{storeName}} εάν θα θέλατε να υποβάλετε ξανά την πληρωμή σας.",
+  "InvoiceExpired_Body_2": "Εάν επιχειρήσατε να στείλετε την πληρωμή σας, αυτή ακόμη δεν έχει γίνει αποδεκτή απο το δίκτυο. Δέν έχουμε λάβει ακόμη την πληρωμή σας.",
+  "InvoiceExpired_Body_3": "Εάν την λάβουμε αργότερα, είτε θα εκτέλεσουμε την παραγγελία σας ή θα επικοινωνήσουμε μαζί σας για να οργανώσουμε την επιστροφή των χρημάτων σας...",
+  "Invoice ID": "ID Παραστατικού Πληρωμής",
+  "Order ID": "ID Παραγγελίας",
+  "Return to StoreName": "Επιστροφή στο {{storeName}}",
+  "This invoice has been paid": "Αυτό το παραστατικό έχει πληρωθεί",
+  "This invoice has been archived": "Αυτό το παραστατικό έχει αρχειοθετηθεί",
+  "Archived_Body": "Παρακαλούμε επικοινωνήστε με το κατάστημα για πληροφορίες σχετικά με την παραγγελία ή εάν χρειάζεστε βοήθεια.",
+  "BOLT 11 Invoice": "Παραστατικό BOLT 11",
+  "Node Info": "Πληροφορίες Κόμβου",
+  "txCount": "{{count}} συναλλαγή",
+  "txCount_plural": "{{count}} συναλλαγών",
+  "Pay with CoinSwitch": "Πληρώστε με CoinSwitch",
+  "Pay with Changelly": "Πληρώστε με Changelly",
+  "Close": "Κλείσιμο"
+}

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

@@ -44,6 +44,7 @@
   "Node Info": "接続情報",
   "txCount": "取引 {{count}} 個",
   "txCount_plural": "取引 {{count}} 個",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "CoinSwitchでのお支払い",
+  "Pay with Changelly": "Changellyでのお支払い",
+  "Close": "閉じる"
 }