bump

This reverts commit 1619666befd4bf8931a11a8c2927de4c5b1add86.

BTCPayServer.Tests/UnitTest1.cs

@@ -518,7 +518,6 @@ namespace BTCPayServer.Tests
                 var controller = acc.GetController<StoresController>();
                 var token = (RedirectToActionResult)controller.CreateToken(new Models.StoreViewModels.CreateTokenViewModel()
                 {
-                    Facade = Facade.Merchant.ToString(),
                     Label = "bla",
                     PublicKey = null
                 }).GetAwaiter().GetResult();
@@ -972,7 +971,6 @@ namespace BTCPayServer.Tests
                 var storeController = user.GetController<StoresController>();
                 storeController.CreateToken(new CreateTokenViewModel()
                 {
-                    Facade = Facade.Merchant.ToString(),
                     Label = "test2",
                     StoreId = user.StoreId
                 }).GetAwaiter().GetResult();

BTCPayServer.Tests/docker-compose.yml

@@ -69,7 +69,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.26
+    image: nicolasdorier/nbxplorer:2.0.0.27
     restart: unless-stopped
     ports:
       - "32838:32838"

BTCPayServer/Authentication/BitToken.cs

@@ -8,10 +8,6 @@ namespace BTCPayServer.Authentication
 {
     public class BitTokenEntity
     {
-        public string Facade
-        {
-            get; set;
-        }
         public string Value
         {
             get; set;
@@ -39,7 +35,6 @@ namespace BTCPayServer.Authentication
             return new BitTokenEntity()
             {
                 Label = Label,
-                Facade = Facade,
                 StoreId = StoreId,
                 PairingTime = PairingTime,
                 SIN = SIN,

BTCPayServer/Authentication/PairingCodeEntity.cs

@@ -11,11 +11,6 @@ namespace BTCPayServer.Authentication
             get;
             set;
         }
-        public string Facade
-        {
-            get;
-            set;
-        }
         public string Label
         {
             get;

BTCPayServer/Authentication/TokenRepository.cs

@@ -90,7 +90,6 @@ namespace BTCPayServer.Authentication
             return new BitTokenEntity()
             {
                 Label = data.Label,
-                Facade = data.Facade,
                 Value = data.Id,
                 SIN = data.SIN,
                 PairingTime = data.PairingTime,
@@ -129,7 +128,6 @@ namespace BTCPayServer.Authentication
             {
                 var pairingCode = await ctx.PairingCodes.FindAsync(pairingCodeEntity.Id);
                 pairingCode.Label = pairingCodeEntity.Label;
-                pairingCode.Facade = pairingCodeEntity.Facade;
                 await ctx.SaveChangesAsync();
                 return CreatePairingCodeEntity(pairingCode);
             }
@@ -178,7 +176,6 @@ namespace BTCPayServer.Authentication
                 {
                     Id = pairingCode.TokenValue,
                     PairingTime = DateTime.UtcNow,
-                    Facade = pairingCode.Facade,
                     Label = pairingCode.Label,
                     StoreDataId = pairingCode.StoreDataId,
                     SIN = pairingCode.SIN
@@ -213,7 +210,6 @@ namespace BTCPayServer.Authentication
                 return null;
             return new PairingCodeEntity()
             {
-                Facade = data.Facade,
                 Id = data.Id,
                 Label = data.Label,
                 Expiration = data.Expiration,

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.92</Version>
+		<Version>1.0.3.93</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -34,7 +34,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.15" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.16" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />
@@ -48,7 +48,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NBitcoin" Version="4.1.1.98" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.32" />	  
+    <PackageReference Include="NBitpayClient" Version="1.0.0.34" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
     <PackageReference Include="NBXplorer.Client" Version="2.0.0.6" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />

BTCPayServer/Controllers/AccessTokenController.cs

@@ -42,15 +42,12 @@ namespace BTCPayServer.Controllers
             {
                 if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
                     throw new BitpayHttpException(400, "'id' property is required");
-                if (string.IsNullOrEmpty(request.Facade))
-                    throw new BitpayHttpException(400, "'facade' property is required");
 
                 var pairingCode = await _TokenRepository.CreatePairingCodeAsync();
                 await _TokenRepository.PairWithSINAsync(pairingCode, request.Id);
                 pairingEntity = await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
                 {
                     Id = pairingCode,
-                    Facade = request.Facade,
                     Label = request.Label
                 });
 
@@ -86,7 +83,7 @@ namespace BTCPayServer.Controllers
                         PairingCode = pairingEntity.Id,
                         PairingExpiration = pairingEntity.Expiration,
                         DateCreated = pairingEntity.CreatedTime,
-                        Facade = pairingEntity.Facade,
+                        Facade = "merchant",
                         Token = pairingEntity.TokenValue,
                         Label = pairingEntity.Label
                     }

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -79,6 +79,7 @@ namespace BTCPayServer.Controllers
             public string CustomCSSLink { get; set; }
             public string NotificationEmail { get; set; }
             public string NotificationUrl { get; set; }
+            public bool? RedirectAutomatically { get; set; }
         }
 
         [HttpGet]
@@ -105,7 +106,8 @@ namespace BTCPayServer.Controllers
                 CustomTipPercentages = settings.CustomTipPercentages != null ? string.Join(",", settings.CustomTipPercentages) : string.Join(",", PointOfSaleSettings.CUSTOM_TIP_PERCENTAGES_DEF),
                 CustomCSSLink = settings.CustomCSSLink,
                 NotificationEmail = settings.NotificationEmail,
-                NotificationUrl = settings.NotificationUrl
+                NotificationUrl = settings.NotificationUrl,
+                RedirectAutomatically = settings.RedirectAutomatically.HasValue? settings.RedirectAutomatically.Value? "true": "false" : "" 
             };
             if (HttpContext?.Request != null)
             {
@@ -178,7 +180,11 @@ namespace BTCPayServer.Controllers
                 CustomButtonText = vm.CustomButtonText,
                 CustomTipText = vm.CustomTipText,
                 CustomTipPercentages = ListSplit(vm.CustomTipPercentages),
-                CustomCSSLink = vm.CustomCSSLink
+                CustomCSSLink = vm.CustomCSSLink,
+                NotificationUrl = vm.NotificationUrl,
+                NotificationEmail = vm.NotificationEmail,
+                RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically)? (bool?) null: bool.Parse(vm.RedirectAutomatically)
+                
             });
             await UpdateAppSettings(app);
             StatusMessage = "App updated";

BTCPayServer/Controllers/AppsPublicController.cs

@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
+using BTCPayServer.ModelBinders;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Payments;
@@ -31,7 +32,7 @@ namespace BTCPayServer.Controllers
 {
     public class AppsPublicController : Controller
     {
-        public AppsPublicController(AppService AppService, 
+        public AppsPublicController(AppService AppService,
             InvoiceController invoiceController,
             UserManager<ApplicationUser> userManager)
         {
@@ -85,34 +86,34 @@ namespace BTCPayServer.Controllers
                 AppId = appId
             });
         }
-        
-        
+
+
         [HttpGet]
         [Route("/apps/{appId}/crowdfund")]
         [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
-        
         {
             var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
-            
+
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<CrowdfundSettings>();
-            
+
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
-            
-            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency );
+
+            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency);
             if (!hasEnoughSettingsToLoad)
             {
-                if(!isAdmin)
+                if (!isAdmin)
                     return NotFound();
 
                 return NotFound("A Target Currency must be set for this app in order to be loadable.");
             }
             var appInfo = (ViewCrowdfundViewModel)(await _AppService.GetAppInfo(appId));
             appInfo.HubPath = AppHub.GetHubPath(this.Request);
-            if (settings.Enabled) return View(appInfo);
-            if(!isAdmin)
+            if (settings.Enabled)
+                return View(appInfo);
+            if (!isAdmin)
                 return NotFound();
 
             return View(appInfo);
@@ -134,7 +135,8 @@ namespace BTCPayServer.Controllers
 
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
 
-            if (!settings.Enabled && !isAdmin) {
+            if (!settings.Enabled && !isAdmin)
+            {
                 return NotFound("Crowdfund is not currently active");
             }
 
@@ -192,7 +194,7 @@ namespace BTCPayServer.Controllers
                 if (request.RedirectToCheckout)
                 {
                     return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
-                        new {invoiceId = invoice.Data.Id});
+                        new { invoiceId = invoice.Data.Id });
                 }
                 else
                 {
@@ -203,7 +205,7 @@ namespace BTCPayServer.Controllers
             {
                 return BadRequest(e.Message);
             }
-            
+
         }
 
         [HttpPost]
@@ -212,7 +214,7 @@ namespace BTCPayServer.Controllers
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ViewPointOfSale(string appId,
-                                                        decimal amount,
+                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal amount,
                                                         string email,
                                                         string orderId,
                                                         string notificationUrl,
@@ -263,16 +265,21 @@ namespace BTCPayServer.Controllers
                 Price = price,
                 BuyerEmail = email,
                 OrderId = orderId,
-                NotificationURL = string.IsNullOrEmpty(notificationUrl)? settings.NotificationUrl: notificationUrl,
+                NotificationURL =
+                        string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
                 NotificationEmail = settings.NotificationEmail,
-                RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
+                RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
-                PosData = string.IsNullOrEmpty(posData) ? null : posData
-            }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+                ExtendedNotifications = true,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData,
+                RedirectAutomatically = settings.RedirectAutomatically,
+            }, store, HttpContext.Request.GetAbsoluteRoot(),
+                new List<string>() { AppService.GetAppInternalTag(appId) },
+                cancellationToken);
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }
-        
-        
+
+
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);

BTCPayServer/Controllers/HomeController.cs

@@ -8,19 +8,39 @@ using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using NBitcoin;
 using Newtonsoft.Json;
+using BTCPayServer.Services;
+using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Controllers
 {
     public class HomeController : Controller
     {
+        private readonly CssThemeManager _cachedServerSettings;
+
         public IHttpClientFactory HttpClientFactory { get; }
 
-        public HomeController(IHttpClientFactory httpClientFactory)
+        public HomeController(IHttpClientFactory httpClientFactory, CssThemeManager cachedServerSettings)
         {
             HttpClientFactory = httpClientFactory;
+            _cachedServerSettings = cachedServerSettings;
         }
-        public IActionResult Index()
+        
+        public async Task<IActionResult> Index()
         {
+            if (_cachedServerSettings.RootAppType is Services.Apps.AppType.Crowdfund)
+            {
+                var serviceProvider = HttpContext.RequestServices;
+                var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));
+                controller.Url = Url;
+                controller.ControllerContext = ControllerContext;
+                var res = await controller.ViewCrowdfund(_cachedServerSettings.RootAppId, null) as ViewResult;
+                if (res != null)
+                {
+                    res.ViewName = "/Views/AppsPublic/ViewCrowdfund.cshtml";
+                    return res; // return 
+                }
+            }
+
             return View("Home");
         }
 

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -314,6 +314,7 @@ namespace BTCPayServer.Controllers
                 ItemDesc = invoice.ProductInformation.ItemDesc,
                 Rate = ExchangeRate(paymentMethod),
                 MerchantRefLink = invoice.RedirectURL ?? "/",
+                RedirectAutomatically = invoice.RedirectAutomatically,
                 StoreName = store.StoreName,
                 InvoiceBitcoinUrl = paymentMethodId.PaymentType == PaymentTypes.BTCLike ? cryptoInfo.PaymentUrls.BIP21 :
                                     paymentMethodId.PaymentType == PaymentTypes.LightningLike ? cryptoInfo.PaymentUrls.BOLT11 :

BTCPayServer/Controllers/InvoiceController.cs

@@ -84,6 +84,7 @@ namespace BTCPayServer.Controllers
             entity.ServerUrl = serverUrl;
             entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
             entity.ExtendedNotifications = invoice.ExtendedNotifications;
+            
             if (invoice.NotificationURL != null &&
                 Uri.TryCreate(invoice.NotificationURL, UriKind.Absolute, out var notificationUri) &&
                 (notificationUri.Scheme == "http" || notificationUri.Scheme == "https"))
@@ -125,6 +126,9 @@ namespace BTCPayServer.Controllers
             if (!Uri.IsWellFormedUriString(entity.RedirectURL, UriKind.Absolute))
                 entity.RedirectURL = null;
 
+            entity.RedirectAutomatically =
+                invoice.RedirectAutomatically.GetValueOrDefault(storeBlob.RedirectAutomatically);
+
             entity.Status = InvoiceStatus.New;
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 

BTCPayServer/Controllers/ServerController.cs

@@ -27,6 +27,9 @@ using Renci.SshNet;
 using BTCPayServer.Logging;
 using BTCPayServer.Lightning;
 using System.Runtime.CompilerServices;
+using BTCPayServer.Services.Apps;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using BTCPayServer.Data;
 
 namespace BTCPayServer.Controllers
 {
@@ -41,16 +44,18 @@ namespace BTCPayServer.Controllers
         LightningConfigurationProvider _LnConfigProvider;
         private readonly TorServices _torServices;
         BTCPayServerOptions _Options;
+        ApplicationDbContextFactory _ContextFactory;
 
         public ServerController(UserManager<ApplicationUser> userManager,
-            Configuration.BTCPayServerOptions options,
+            BTCPayServerOptions options,
             RateFetcher rateProviderFactory,
             SettingsRepository settingsRepository,
             NBXplorerDashboard dashBoard,
             IHttpClientFactory httpClientFactory,
             LightningConfigurationProvider lnConfigProvider,
             TorServices torServices,
-            Services.Stores.StoreRepository storeRepository)
+            StoreRepository storeRepository,
+            ApplicationDbContextFactory contextFactory)
         {
             _Options = options;
             _UserManager = userManager;
@@ -61,6 +66,7 @@ namespace BTCPayServer.Controllers
             _StoreRepository = storeRepository;
             _LnConfigProvider = lnConfigProvider;
             _torServices = torServices;
+            _ContextFactory = contextFactory;
         }
 
         [Route("server/rates")]
@@ -441,15 +447,46 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> Policies()
         {
             var data = (await _SettingsRepository.GetSettingAsync<PoliciesSettings>()) ?? new PoliciesSettings();
+
+            // load display app dropdown
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                var userId = _UserManager.GetUserId(base.User);
+                var selectList = ctx.Users.Where(user => user.Id == userId)
+                                .SelectMany(s => s.UserStores)
+                                .Select(s => s.StoreData)
+                                .SelectMany(s => s.Apps)
+                                .Select(a => new SelectListItem($"{a.AppType} - {a.Name}", a.Id)).ToList();
+                selectList.Insert(0, new SelectListItem("(None)", null));
+                ViewBag.AppsList = new SelectList(selectList, "Value", "Text", data.RootAppId);
+            }
+
             return View(data);
         }
         [Route("server/policies")]
         [HttpPost]
         public async Task<IActionResult> Policies(PoliciesSettings settings)
         {
+            if (!String.IsNullOrEmpty(settings.RootAppId))
+            {
+                using (var ctx = _ContextFactory.CreateContext())
+                {
+                    var app = ctx.Apps.SingleOrDefault(a => a.Id == settings.RootAppId);
+                    if (app != null)
+                        settings.RootAppType = Enum.Parse<AppType>(app.AppType);
+                    else
+                        settings.RootAppType = null;
+                }
+            }
+            else
+            {
+                // not preserved on client side, but clearing it just in case
+                settings.RootAppType = null;
+            }
+
             await _SettingsRepository.UpdateSetting(settings);
             TempData["StatusMessage"] = "Policies updated successfully";
-            return View(settings);
+            return RedirectToAction(nameof(Policies));
         }
 
         [Route("server/services")]
@@ -473,7 +510,7 @@ namespace BTCPayServer.Controllers
                     Link = this.Url.Action(nameof(SSHService))
                 });
             }
-            foreach(var torService in _torServices.Services)
+            foreach (var torService in _torServices.Services)
             {
                 if (torService.VirtualPort == 80)
                 {
@@ -680,7 +717,7 @@ namespace BTCPayServer.Controllers
                 return File(System.IO.File.ReadAllBytes(settings.KeyFile), "application/octet-stream", "id_rsa");
             }
 
-            var server = Extensions.IsLocalNetwork(settings.Server) ? this.Request.Host.Host: settings.Server;
+            var server = Extensions.IsLocalNetwork(settings.Server) ? this.Request.Host.Host : settings.Server;
             SSHServiceViewModel vm = new SSHServiceViewModel();
             string port = settings.Port == 22 ? "" : $" -p {settings.Port}";
             vm.CommandLine = $"ssh {settings.Username}@{server}{port}";

BTCPayServer/Controllers/StoresController.cs

@@ -356,6 +356,7 @@ namespace BTCPayServer.Controllers
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.LightningAmountInSatoshi = storeBlob.LightningAmountInSatoshi;
+            vm.RedirectAutomatically = storeBlob.RedirectAutomatically;
             return View(vm);
         }
         void SetCryptoCurrencies(CheckoutExperienceViewModel vm, Data.StoreData storeData)
@@ -420,6 +421,7 @@ namespace BTCPayServer.Controllers
             blob.OnChainMinValue = onchainMinValue;
             blob.LightningMaxValue = lightningMaxValue;
             blob.LightningAmountInSatoshi = model.LightningAmountInSatoshi;
+            blob.RedirectAutomatically = model.RedirectAutomatically;
             if (StoreData.SetStoreBlob(blob))
             {
                 needUpdate = true;
@@ -507,7 +509,7 @@ namespace BTCPayServer.Controllers
                 Action = nameof(UpdateChangellySettings),
                 Provider = "Changelly"
             });
-            
+
             var coinSwitchEnabled = storeBlob.CoinSwitchSettings != null && storeBlob.CoinSwitchSettings.Enabled;
             vm.ThirdPartyPaymentMethods.Add(new StoreViewModel.ThirdPartyPaymentMethod()
             {
@@ -611,7 +613,6 @@ namespace BTCPayServer.Controllers
             model.StoreNotConfigured = StoreNotConfigured;
             model.Tokens = tokens.Select(t => new TokenViewModel()
             {
-                Facade = t.Facade,
                 Label = t.Label,
                 SIN = t.SIN,
                 Id = t.Value
@@ -696,7 +697,6 @@ namespace BTCPayServer.Controllers
 
             var tokenRequest = new TokenRequest()
             {
-                Facade = model.Facade,
                 Label = model.Label,
                 Id = model.PublicKey == null ? null : NBitpayClient.Extensions.BitIdExtensions.GetBitIDSIN(new PubKey(model.PublicKey))
             };
@@ -708,7 +708,6 @@ namespace BTCPayServer.Controllers
                 await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
                 {
                     Id = tokenRequest.PairingCode,
-                    Facade = model.Facade,
                     Label = model.Label,
                 });
                 await _TokenRepository.PairWithStoreAsync(tokenRequest.PairingCode, storeId);
@@ -748,7 +747,6 @@ namespace BTCPayServer.Controllers
                 }
             }
             var model = new CreateTokenViewModel();
-            model.Facade = "merchant";
             ViewBag.HidePublicKey = storeId == null;
             ViewBag.ShowStores = storeId == null;
             ViewBag.ShowMenu = storeId != null;
@@ -800,7 +798,6 @@ namespace BTCPayServer.Controllers
                 return View(new PairingModel()
                 {
                     Id = pairing.Id,
-                    Facade = pairing.Facade,
                     Label = pairing.Label,
                     SIN = pairing.SIN ?? "Server-Initiated Pairing",
                     SelectedStore = selectedStore ?? stores.FirstOrDefault()?.Id,
@@ -891,7 +888,11 @@ namespace BTCPayServer.Controllers
                 ButtonSize = 2,
                 UrlRoot = appUrl,
                 PayButtonImageUrl = appUrl + "img/paybutton/pay.png",
-                StoreId = store.Id
+                StoreId = store.Id,
+                ButtonType = 0,
+                Min = 1,
+                Max = 20,
+                Step = 1
             };
             return View(model);
         }

BTCPayServer/Data/PairedSINData.cs

@@ -12,11 +12,6 @@ namespace BTCPayServer.Data
             get; set;
         }
 
-        public string Facade
-        {
-            get; set;
-        }
-
         public string StoreDataId
         {
             get; set;

BTCPayServer/Data/PairingCodeData.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
+        [Obsolete("Unused")]
         public string Facade
         {
             get; set;

BTCPayServer/Data/StoreData.cs

@@ -449,6 +449,7 @@ namespace BTCPayServer.Data
         public Dictionary<string, string> WalletKeyPathRoots { get; set; } = new Dictionary<string, string>();
 
         public EmailSettings EmailSettings { get; set; }
+        public bool RedirectAutomatically { get; set; }
 
         public IPaymentFilter GetExcludedPaymentMethods()
         {

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -13,6 +13,7 @@ using BTCPayServer.Events;
 using BTCPayServer.Services;
 using Microsoft.AspNetCore.Mvc.Filters;
 using BTCPayServer.Security;
+using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.HostedServices
 {
@@ -44,13 +45,20 @@ namespace BTCPayServer.HostedServices
             get { return _creativeStartUri; }
         }
 
+
         public bool ShowRegister { get; set; }
         public bool DiscourageSearchEngines { get; set; }
 
+        public AppType? RootAppType { get; set; }
+        public string RootAppId { get; set; }
+
         internal void Update(PoliciesSettings data)
         {
             ShowRegister = !data.LockSubscription;
             DiscourageSearchEngines = data.DiscourageSearchEngines;
+
+            RootAppType = data.RootAppType;
+            RootAppId = data.RootAppId;
         }
     }
 

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -49,7 +49,6 @@ namespace BTCPayServer.HostedServices
             InvoiceRepository invoiceRepository,
             EventAggregator eventAggregator)
         {
-            PollInterval = TimeSpan.FromMinutes(1.0);
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
             _EventAggregator = eventAggregator ?? throw new ArgumentNullException(nameof(eventAggregator));
             _NetworkProvider = networkProvider;
@@ -99,8 +98,8 @@ namespace BTCPayServer.HostedServices
 
                 if (accounting.Paid < accounting.MinimumTotalDue && invoice.GetPayments().Count != 0 && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidPartial)
                 {
-                        invoice.ExceptionStatus = InvoiceExceptionStatus.PaidPartial;
-                        context.MarkDirty();
+                    invoice.ExceptionStatus = InvoiceExceptionStatus.PaidPartial;
+                    context.MarkDirty();
                 }
             }
 
@@ -185,19 +184,6 @@ namespace BTCPayServer.HostedServices
             return result;
         }
 
-        TimeSpan _PollInterval;
-        public TimeSpan PollInterval
-        {
-            get
-            {
-                return _PollInterval;
-            }
-            set
-            {
-                _PollInterval = value;
-            }
-        }
-
         private void Watch(string invoiceId)
         {
             if (invoiceId == null)
@@ -231,25 +217,24 @@ namespace BTCPayServer.HostedServices
         BlockingCollection<string> _WatchRequests = new BlockingCollection<string>(new ConcurrentQueue<string>());
 
         Task _Loop;
-        Task _WaitingInvoices;
         CancellationTokenSource _Cts;
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
             _Cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
             _Loop = StartLoop(_Cts.Token);
-            _WaitingInvoices = WaitPendingInvoices();
+            _ = WaitPendingInvoices();
 
             leases.Add(_EventAggregator.Subscribe<Events.InvoiceNeedUpdateEvent>(b =>
             {
                 Watch(b.InvoiceId);
             }));
-            leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async b =>
+            leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(b =>
             {
                 if (b.Name == InvoiceEvent.Created)
                 {
                     Watch(b.Invoice.Id);
-                    await Wait(b.Invoice.Id);
+                    _ = Wait(b.Invoice.Id);
                 }
 
                 if (b.Name == InvoiceEvent.ReceivedPayment)
@@ -264,81 +249,76 @@ namespace BTCPayServer.HostedServices
         {
             await Task.WhenAll((await _InvoiceRepository.GetPendingInvoices())
                 .Select(id => Wait(id)).ToArray());
-            _WaitingInvoices = null;
         }
 
         async Task StartLoop(CancellationToken cancellation)
         {
             Logs.PayServer.LogInformation("Start watching invoices");
             await Task.Delay(1).ConfigureAwait(false); // Small hack so that the caller does not block on GetConsumingEnumerable
-            try
+
+            foreach (var invoiceId in _WatchRequests.GetConsumingEnumerable(cancellation))
             {
-                foreach (var invoiceId in _WatchRequests.GetConsumingEnumerable(cancellation))
+                int maxLoop = 5;
+                int loopCount = -1;
+                while (loopCount < maxLoop)
                 {
-                    int maxLoop = 5;
-                    int loopCount = -1;
-                    while (!cancellation.IsCancellationRequested && loopCount < maxLoop)
+                    loopCount++;
+                    try
                     {
-                        loopCount++;
-                        try
+                        cancellation.ThrowIfCancellationRequested();
+                        var invoice = await _InvoiceRepository.GetInvoice(invoiceId, true);
+                        if (invoice == null)
+                            break;
+                        var updateContext = new UpdateInvoiceContext(invoice);
+                        await UpdateInvoice(updateContext);
+                        if (updateContext.Dirty)
                         {
-                            var invoice = await _InvoiceRepository.GetInvoice(invoiceId, true);
-                            if (invoice == null)
-                                break;
-                            var updateContext = new UpdateInvoiceContext(invoice);
-                            await UpdateInvoice(updateContext);
-                            if (updateContext.Dirty)
-                            {
-                                await _InvoiceRepository.UpdateInvoiceStatus(invoice.Id, invoice.GetInvoiceState());
-                                updateContext.Events.Insert(0, new InvoiceDataChangedEvent(invoice));
-                            }
-
-                            foreach (var evt in updateContext.Events)
-                            {
-                                _EventAggregator.Publish(evt, evt.GetType());
-                            }
-
-                            if (invoice.Status == InvoiceStatus.Complete ||
-                               ((invoice.Status == InvoiceStatus.Invalid || invoice.Status == InvoiceStatus.Expired) && invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
-                            {
-                                if (await _InvoiceRepository.RemovePendingInvoice(invoice.Id))
-                                    _EventAggregator.Publish(new InvoiceStopWatchedEvent(invoice.Id));
-                                break;
-                            }
-
-                            if (updateContext.Events.Count == 0 || cancellation.IsCancellationRequested)
-                                break;
+                            await _InvoiceRepository.UpdateInvoiceStatus(invoice.Id, invoice.GetInvoiceState());
+                            updateContext.Events.Insert(0, new InvoiceDataChangedEvent(invoice));
                         }
-                        catch (OperationCanceledException) when (cancellation.IsCancellationRequested)
+
+                        foreach (var evt in updateContext.Events)
                         {
+                            _EventAggregator.Publish(evt, evt.GetType());
+                        }
+
+                        if (invoice.Status == InvoiceStatus.Complete ||
+                           ((invoice.Status == InvoiceStatus.Invalid || invoice.Status == InvoiceStatus.Expired) && invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
+                        {
+                            if (await _InvoiceRepository.RemovePendingInvoice(invoice.Id))
+                                _EventAggregator.Publish(new InvoiceStopWatchedEvent(invoice.Id));
                             break;
                         }
-                        catch (Exception ex)
-                        {
-                            Logs.PayServer.LogError(ex, "Unhandled error on watching invoice " + invoiceId);
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-                            Task.Delay(10000, cancellation)
-                                .ContinueWith(t => _WatchRequests.Add(invoiceId), TaskScheduler.Default);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+
+                        if (updateContext.Events.Count == 0)
                             break;
-                        }
+                    }
+                    catch (Exception ex) when (!cancellation.IsCancellationRequested)
+                    {
+                        Logs.PayServer.LogError(ex, "Unhandled error on watching invoice " + invoiceId);
+                        _ = Task.Delay(10000, cancellation)
+                            .ContinueWith(t => Watch(invoiceId), TaskScheduler.Default);
+                        break;
                     }
                 }
             }
-            catch when (cancellation.IsCancellationRequested)
-            {
-            }
-            Logs.PayServer.LogInformation("Stop watching invoices");
         }
 
-        public Task StopAsync(CancellationToken cancellationToken)
+        public async Task StopAsync(CancellationToken cancellationToken)
         {
             if (_Cts == null)
-                return Task.CompletedTask;
+                return;
             leases.Dispose();
             _Cts.Cancel();
-            var waitingPendingInvoices = _WaitingInvoices ?? Task.CompletedTask;
-            return Task.WhenAll(waitingPendingInvoices, _Loop);
+            try
+            {
+                await _Loop;
+            }
+            catch { }
+            finally
+            {
+                Logs.PayServer.LogInformation("Stop watching invoices");
+            }
         }
     }
 }

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -64,6 +64,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<SettingsRepository>();
             services.TryAddSingleton<TorServices>();
             services.TryAddSingleton<SocketFactory>();
+            services.TryAddSingleton<LightningClientFactoryService>();
             services.TryAddSingleton<InvoicePaymentNotification>();
             services.TryAddSingleton<BTCPayServerOptions>(o => o.GetRequiredService<IOptions<BTCPayServerOptions>>().Value);
             services.TryAddSingleton<InvoiceRepository>(o =>

BTCPayServer/Hosting/Startup.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Hosting
                 //    StyleSrc = "'self' 'unsafe-inline'",
                 //    ScriptSrc = "'self' 'unsafe-inline'"
                 //});
-            });
+            }).AddControllersAsServices();
             services.TryAddScoped<ContentSecurityPolicies>();
             services.Configure<IdentityOptions>(options =>
             {

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -1,5 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using BTCPayServer.Validation;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace BTCPayServer.Models.AppViewModels
 {
@@ -54,5 +56,28 @@ namespace BTCPayServer.Models.AppViewModels
         public string CustomCSSLink { get; set; }
 
         public string Id { get; set; }
+
+        [Display(Name = "Redirect invoice to redirect url automatically after paid")]
+        public string RedirectAutomatically { get; set; } = string.Empty;
+
+        public SelectList RedirectAutomaticallySelectList =>
+            new SelectList(new List< SelectListItem>()
+            {
+                new SelectListItem()
+                {
+                    Text = "Yes",
+                    Value = "true"
+                },
+                new SelectListItem()
+                {
+                    Text = "No",
+                    Value = "false"
+                },
+                new SelectListItem()
+                {
+                    Text = "Use Store Settings",
+                    Value = ""
+                }
+            }, nameof(SelectListItem.Value), nameof(SelectListItem.Text), RedirectAutomatically);
     }
 }

BTCPayServer/Models/CreateInvoiceRequest.cs

@@ -79,5 +79,8 @@ namespace BTCPayServer.Models
         public string Guid { get; set; }
         [JsonProperty(PropertyName = "token", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string Token { get; set; }
+
+        [JsonProperty(PropertyName = "redirectAutomatically", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool? RedirectAutomatically { get; set; }
     }
 }

BTCPayServer/Models/GetTokensResponse.cs

@@ -39,7 +39,7 @@ namespace BTCPayServer.Models
             {
                 JObject item = new JObject();
                 jarray.Add(item);
-                JProperty jProp = new JProperty(token.Facade);
+                JProperty jProp = new JProperty("merchant");
                 item.Add(jProp);
                 jProp.Value = token.Value;
             }

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -67,5 +67,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public string CoinSwitchMerchantId { get; set; }
         public string RootPath { get; set; }
         public decimal CoinSwitchAmountMarkupPercentage { get; set; }
+        public bool RedirectAutomatically { get; set; }
     }
 }

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Models.StoreViewModels
         public SelectList CryptoCurrencies { get; set; }
         public SelectList Languages { get; set; }
 
-        [Display(Name = "Default the default payment method on checkout")]
+        [Display(Name = "Default payment method on checkout")]
         public string DefaultPaymentMethod { get; set; }
         [Display(Name = "Default language on checkout")]
         public string DefaultLang { get; set; }
@@ -49,6 +49,9 @@ namespace BTCPayServer.Models.StoreViewModels
 
         [Display(Name = "Display lightning payment amounts in Satoshis")]
         public bool LightningAmountInSatoshi { get; set; }
+        
+        [Display(Name = "Redirect invoice to redirect url automatically after paid")]
+        public bool  RedirectAutomatically { get; set; }
 
         public void SetLanguages(LanguageService langService, string defaultLang)
         {

BTCPayServer/Models/StoreViewModels/PairingModel.cs

@@ -27,10 +27,6 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             get; set;
         }
-        public string Facade
-        {
-            get; set;
-        }
         public string SIN
         {
             get; set;

BTCPayServer/Models/StoreViewModels/PayButtonViewModel.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
 using BTCPayServer.ModelBinders;
 using Microsoft.AspNetCore.Mvc;
 
@@ -18,6 +15,13 @@ namespace BTCPayServer.Models.StoreViewModels
         public string CheckoutDesc { get; set; }
         public string OrderId { get; set; }
         public int ButtonSize { get; set; }
+        public int ButtonType { get; set; }
+
+        // Slider properties (ButtonType = 2)
+        public decimal Min { get; set; }
+        public decimal Max { get; set; }
+        public decimal Step { get; set; }
+
         [Url]
         public string ServerIpn { get; set; }
         [Url]

BTCPayServer/Models/StoreViewModels/TokensViewModel.cs

@@ -21,12 +21,6 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
-        [Required]
-        public string Facade
-        {
-            get; set;
-        }
-
         [Required]
         public string StoreId
         {
@@ -52,10 +46,6 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             get; set;
         }
-        public string Facade
-        {
-            get; set;
-        }
     }
     public class TokensViewModel
     {

BTCPayServer/Models/TokenRequest.cs

@@ -20,11 +20,6 @@ namespace BTCPayServer.Models
         {
             get; set;
         }
-        [JsonProperty(PropertyName = "facade")]
-        public string Facade
-        {
-            get; set;
-        }
         [JsonProperty(PropertyName = "count")]
         public int Count
         {

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -19,13 +19,16 @@ namespace BTCPayServer.Payments.Lightning
         public static int LIGHTNING_TIMEOUT = 5000;
 
         NBXplorerDashboard _Dashboard;
+        private readonly LightningClientFactoryService _lightningClientFactory;
         private readonly SocketFactory _socketFactory;
 
         public LightningLikePaymentHandler(
             NBXplorerDashboard dashboard,
+            LightningClientFactoryService lightningClientFactory,
             SocketFactory socketFactory)
         {
             _Dashboard = dashboard;
+            _lightningClientFactory = lightningClientFactory;
             _socketFactory = socketFactory;
         }
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
@@ -34,7 +37,7 @@ namespace BTCPayServer.Payments.Lightning
             var test = GetNodeInfo(paymentMethod.PreferOnion, supportedPaymentMethod, network);
             var invoice = paymentMethod.ParentEntity;
             var due = Extensions.RoundUp(invoice.ProductInformation.Price / paymentMethod.Rate, 8);
-            var client = supportedPaymentMethod.CreateClient(network);
+            var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
             var expiry = invoice.ExpirationTime - DateTimeOffset.UtcNow;
             if (expiry < TimeSpan.Zero)
                 expiry = TimeSpan.FromSeconds(1);
@@ -76,7 +79,7 @@ namespace BTCPayServer.Payments.Lightning
 
             using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
             {
-                var client = supportedPaymentMethod.CreateClient(network);
+                var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
                 LightningNodeInformation info = null;
                 try
                 {

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -13,6 +13,8 @@ using BTCPayServer.Lightning;
 using System.Collections.Concurrent;
 using System.Threading.Channels;
 using Microsoft.Extensions.Caching.Memory;
+using System.Net.Http;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.Payments.Lightning
 {
@@ -22,6 +24,7 @@ namespace BTCPayServer.Payments.Lightning
         InvoiceRepository _InvoiceRepository;
         private readonly IMemoryCache _memoryCache;
         BTCPayNetworkProvider _NetworkProvider;
+        private readonly LightningClientFactoryService lightningClientFactory;
         Channel<string> _CheckInvoices = Channel.CreateUnbounded<string>();
         Task _CheckingInvoice;
         Dictionary<(string, string), LightningInstanceListener> _InstanceListeners = new Dictionary<(string, string), LightningInstanceListener>();
@@ -29,12 +32,15 @@ namespace BTCPayServer.Payments.Lightning
         public LightningListener(EventAggregator aggregator,
                               InvoiceRepository invoiceRepository,
                               IMemoryCache memoryCache,
-                              BTCPayNetworkProvider networkProvider)
+                              BTCPayNetworkProvider networkProvider,
+                              LightningClientFactoryService lightningClientFactory,
+                              IHttpClientFactory httpClientFactory)
         {
             _Aggregator = aggregator;
             _InvoiceRepository = invoiceRepository;
             _memoryCache = memoryCache;
             _NetworkProvider = networkProvider;
+            this.lightningClientFactory = lightningClientFactory;
         }
 
         async Task CheckingInvoice(CancellationToken cancellation)
@@ -50,7 +56,7 @@ namespace BTCPayServer.Payments.Lightning
                         if (!_InstanceListeners.TryGetValue(instanceListenerKey, out var instanceListener) || 
                             !instanceListener.IsListening)
                         {
-                            instanceListener = instanceListener ?? new LightningInstanceListener(_InvoiceRepository, _Aggregator, listenedInvoice.SupportedPaymentMethod, listenedInvoice.Network);
+                            instanceListener = instanceListener ?? new LightningInstanceListener(_InvoiceRepository, _Aggregator, listenedInvoice.SupportedPaymentMethod, lightningClientFactory, listenedInvoice.Network);
                             var status = await instanceListener.PollPayment(listenedInvoice, cancellation);
                             if (status is null ||
                                 status is LightningInvoiceStatus.Paid ||
@@ -201,16 +207,19 @@ namespace BTCPayServer.Payments.Lightning
         private readonly InvoiceRepository invoiceRepository;
         private readonly EventAggregator _eventAggregator;
         private readonly BTCPayNetwork network;
+        private readonly LightningClientFactoryService _lightningClientFactory;
 
         public LightningInstanceListener(InvoiceRepository invoiceRepository,
                                         EventAggregator eventAggregator,
                                         LightningSupportedPaymentMethod supportedPaymentMethod,
+                                        LightningClientFactoryService lightningClientFactory,
                                         BTCPayNetwork network)
         {
             this.supportedPaymentMethod = supportedPaymentMethod;
             this.invoiceRepository = invoiceRepository;
             _eventAggregator = eventAggregator;
             this.network = network;
+            _lightningClientFactory = lightningClientFactory;
         }
         internal bool AddListenedInvoice(ListenedInvoice invoice)
         {
@@ -219,7 +228,7 @@ namespace BTCPayServer.Payments.Lightning
 
         internal async Task<LightningInvoiceStatus?> PollPayment(ListenedInvoice listenedInvoice, CancellationToken cancellation)
         {
-            var client = supportedPaymentMethod.CreateClient(network);
+            var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
             LightningInvoice lightningInvoice = await client.GetInvoice(listenedInvoice.PaymentMethodDetails.InvoiceId);
             if (lightningInvoice?.Status is LightningInvoiceStatus.Paid && 
                 await AddPayment(lightningInvoice, listenedInvoice.InvoiceId))
@@ -245,7 +254,7 @@ namespace BTCPayServer.Payments.Lightning
             Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Start listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
             try
             {
-                var lightningClient = supportedPaymentMethod.CreateClient(network);
+                var lightningClient = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
                 using (var session = await lightningClient.Listen(cancellation))
                 {
                     // Just in case the payment arrived after our last poll but before we listened.
@@ -290,6 +299,7 @@ namespace BTCPayServer.Payments.Lightning
             if (_ListenedInvoices.IsEmpty)
                 Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): No more invoice to listen on {supportedPaymentMethod.GetLightningUrl().BaseUri}, releasing the connection.");
         }
+
         public DateTimeOffset? LastFullPoll { get; set; }
 
         internal async Task PollAllListenedInvoices(CancellationToken cancellation)

BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs

@@ -60,10 +60,5 @@ namespace BTCPayServer.Payments.Lightning
             LightningChargeUrl = null;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
-
-        public ILightningClient CreateClient(BTCPayNetwork network)
-        {
-            return LightningClientFactory.CreateClient(this.GetLightningUrl(), network.NBitcoinNetwork);
-        }
     }
 }

BTCPayServer/Security/BitpayAuthentication.cs

@@ -148,7 +148,7 @@ namespace BTCPayServer.Security
 
                         if (token != null)
                         {
-                            var bitToken = await GetTokenPermissionAsync(sin, token);
+                            var bitToken = (await _TokenRepository.GetTokens(sin)).FirstOrDefault();
                             if (bitToken == null)
                             {
                                 return (null, false);
@@ -184,34 +184,6 @@ namespace BTCPayServer.Security
                 }
                 return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
             }
-
-            private async Task<BitTokenEntity> GetTokenPermissionAsync(string sin, string expectedToken)
-            {
-                var actualTokens = (await _TokenRepository.GetTokens(sin)).ToArray();
-                actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
-
-                var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
-                if (expectedToken == null || actualToken == null)
-                {
-                    Logs.PayServer.LogDebug($"No token found for facade {Facade.Merchant} for SIN {sin}");
-                    return null;
-                }
-                return actualToken;
-            }
-
-            private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
-            {
-                if (token.Facade == Facade.Merchant.ToString())
-                {
-                    yield return token.Clone(Facade.User);
-                    yield return token.Clone(Facade.PointOfSale);
-                }
-                if (token.Facade == Facade.PointOfSale.ToString())
-                {
-                    yield return token.Clone(Facade.User);
-                }
-                yield return token;
-            }
         }
         internal static void AddAuthentication(IServiceCollection services, Action<BitpayAuthOptions> bitpayAuth = null)
         {

BTCPayServer/Services/Apps/AppService.cs

@@ -53,7 +53,11 @@ namespace BTCPayServer.Services.Apps
         public async Task<object> GetAppInfo(string appId)
         {
             var app = await GetApp(appId, AppType.Crowdfund, true);
-            return await GetInfo(app);
+            if (app != null)
+            {
+                return await GetInfo(app);
+            }
+            return null;
         }
         private async Task<ViewCrowdfundViewModel> GetInfo(AppData appData, string statusMessage = null)
         {

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -298,6 +298,12 @@ namespace BTCPayServer.Services.Invoices
             get;
             set;
         }
+        
+        public bool RedirectAutomatically
+        {
+            get;
+            set;
+        }
 
         [Obsolete("Use GetPaymentMethod(network).GetTxFee() instead")]
         public Money TxFee
@@ -356,7 +362,6 @@ namespace BTCPayServer.Services.Invoices
             return DateTimeOffset.UtcNow > ExpirationTime;
         }
 
-
         public InvoiceResponse EntityToDTO(BTCPayNetworkProvider networkProvider)
         {
             ServerUrl = ServerUrl ?? "";
@@ -417,6 +422,22 @@ namespace BTCPayServer.Services.Invoices
                 var scheme = info.Network.UriScheme;
                 cryptoInfo.Url = ServerUrl.WithTrailingSlash() + $"i/{paymentId}/{Id}";
 
+                cryptoInfo.Payments = GetPayments(info.Network).Select(entity =>
+                {
+                    var data = entity.GetCryptoPaymentData();
+                    return new InvoicePaymentInfo()
+                    {
+                        Id = data.GetPaymentId(),
+                        Fee = entity.NetworkFee,
+                        Value = data.GetValue(),
+                        Completed = data.PaymentCompleted(entity, info.Network),
+                        Confirmed = data.PaymentConfirmed(entity, SpeedPolicy, info.Network),
+                        Destination = data.GetDestination(info.Network),
+                        PaymentType = data.GetPaymentType().ToString(),
+                        ReceivedDate = entity.ReceivedTime.DateTime
+                    };
+                }).ToList();
+                
                 if (paymentId.PaymentType == PaymentTypes.BTCLike)
                 {
                     var minerInfo = new MinerFeeInfo();

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -71,14 +71,14 @@ retry:
             using (var db = _ContextFactory.CreateContext())
             {
                 var key = scriptPubKey.Hash.ToString() + "#" + cryptoCode;
-                var result = await db.AddressInvoices
+                var result = (await db.AddressInvoices
 #pragma warning disable CS0618
                                     .Where(a => a.Address == key)
 #pragma warning restore CS0618
                                     .Select(a => a.InvoiceData)
                                     .Include(a => a.Payments)
                                     .Include(a => a.RefundAddresses)
-                                    .FirstOrDefaultAsync();
+                                    .ToListAsync()).FirstOrDefault();
                 if (result == null)
                     return null;
                 return ToEntity(result);
@@ -213,7 +213,7 @@ retry:
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                var invoice = await context.Invoices.FirstOrDefaultAsync(i => i.Id == invoiceId);
+                var invoice = (await context.Invoices.Where(i => i.Id == invoiceId).ToListAsync()).FirstOrDefault();
                 if (invoice == null)
                     return false;
 
@@ -383,7 +383,7 @@ retry:
                     query = query.Include(o => o.HistoricalAddressInvoices).Include(o => o.AddressInvoices);
                 query = query.Where(i => i.Id == id);
 
-                var invoice = await query.FirstOrDefaultAsync().ConfigureAwait(false);
+                var invoice = (await query.ToListAsync()).FirstOrDefault();
                 if (invoice == null)
                     return null;
 

BTCPayServer/Services/LightningClientFactoryService.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Services
+{
+    public class LightningClientFactoryService
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        public LightningClientFactoryService(IHttpClientFactory httpClientFactory)
+        {
+            _httpClientFactory = httpClientFactory;
+        }
+
+        public ILightningClient Create(LightningConnectionString lightningConnectionString, BTCPayNetwork network)
+        {
+            if (lightningConnectionString == null)
+                throw new ArgumentNullException(nameof(lightningConnectionString));
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            return new Lightning.LightningClientFactory(network.NBitcoinNetwork)
+            {
+                HttpClient = _httpClientFactory.CreateClient($"{network.CryptoCode}: Lightning client")
+            }.Create(lightningConnectionString);
+        }
+    }
+}

BTCPayServer/Services/PoliciesSettings.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Apps;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Services
@@ -10,17 +11,19 @@ namespace BTCPayServer.Services
     public class PoliciesSettings
     {
         [Display(Name = "Requires a confirmation mail for registering")]
-        public bool RequiresConfirmedEmail
-        {
-            get; set;
-        }
+        public bool RequiresConfirmedEmail { get; set; }
 
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Disable registration")]
         public bool LockSubscription { get; set; }
-        
+
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Discourage search engines from indexing this site")]
         public bool DiscourageSearchEngines { get; set; }
+
+        [Display(Name = "Display app on website root")]
+        public string RootAppId { get; set; }
+
+        public AppType? RootAppType { get; set; }
     }
 }

BTCPayServer/Services/Rates/BitbankRateProvider.cs

@@ -24,9 +24,17 @@ namespace BTCPayServer.Services.Rates
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             return new ExchangeRates(((jobj["data"] as JObject) ?? new JObject())
                 .Properties()
-                .Select(p => new ExchangeRate(ExchangeName, CurrencyPair.Parse(p.Name), new BidAsk(p.Value["buy"].Value<decimal>(), p.Value["sell"].Value<decimal>())))
+                .Select(p => new ExchangeRate(ExchangeName, CurrencyPair.Parse(p.Name), CreateBidAsk(p)))
                 .ToArray());
-                
+
+        }
+
+        private static BidAsk CreateBidAsk(JProperty p)
+        {
+            var buy = p.Value["buy"].Value<decimal>();
+            var sell = p.Value["sell"].Value<decimal>();
+            // Bug from their API (https://github.com/btcpayserver/btcpayserver/issues/741)
+            return buy < sell ? new BidAsk(buy, sell) : new BidAsk(sell, buy);
         }
     }
 }

BTCPayServer/Services/Rates/QuadrigacxRateProvider.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class QuadrigacxRateProvider : IRateProvider, IHasExchangeName
-    {
-        public const string QuadrigacxName = "quadrigacx";
-        static HttpClient _Client = new HttpClient();
-
-        public string ExchangeName => QuadrigacxName;
-
-        private bool TryToBidAsk(JObject p, out BidAsk v)
-        {
-            v = null;
-            JToken bid = p.Property("bid")?.Value;
-            JToken ask = p.Property("ask")?.Value;
-            if (bid == null || ask == null)
-                return false;
-            if (!decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v1) ||
-               !decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v2) ||
-               v1 <= 0m || v2 <= 0m || v1 > v2)
-                return false;
-            v = new BidAsk(v1, v2);
-            return true;
-        }
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            var response = await _Client.GetAsync($"https://api.quadrigacx.com/v2/ticker?book=all", cancellationToken);
-            response.EnsureSuccessStatusCode();
-            var rates = JObject.Parse(await response.Content.ReadAsStringAsync());
-
-            var exchangeRates = new ExchangeRates();
-            foreach (var prop in rates.Properties())
-            {
-                var rate = new ExchangeRate();
-                if (!Rating.CurrencyPair.TryParse(prop.Name, out var pair))
-                    continue;
-                rate.CurrencyPair = pair;
-                rate.Exchange = QuadrigacxName;
-                if (!TryToBidAsk((JObject)prop.Value, out var v))
-                    continue;
-                rate.BidAsk = v;
-                exchangeRates.Add(rate);
-            }
-            return exchangeRates;
-        }
-    }
-}

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -109,7 +109,6 @@ namespace BTCPayServer.Services.Rates
             // Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
-            Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
             Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_COINAVERAGE"), Authenticator = _CoinAverageSettings });
             Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_KRAKEN") });
             Providers.Add("bylls", new ByllsRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BYLLS")));

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -52,18 +52,22 @@
                     <div class="form-group">
                         <label asp-for="EnableShoppingCart"></label>
                         <input asp-for="EnableShoppingCart" type="checkbox" class="form-check" />
+                        <span asp-validation-for="EnableShoppingCart" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="ShowCustomAmount"></label>
                         <input asp-for="ShowCustomAmount" type="checkbox" class="form-check" />
+                        <span asp-validation-for="ShowCustomAmount" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="ShowDiscount"></label>
                         <input asp-for="ShowDiscount" type="checkbox" class="form-check" />
+                        <span asp-validation-for="ShowDiscount" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="EnableTips"></label>
                         <input asp-for="EnableTips" type="checkbox" class="form-check" />
+                        <span asp-validation-for="EnableTips" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="ButtonText" class="control-label"></label>*
@@ -114,6 +118,11 @@
                         <input type="email" asp-for="NotificationEmail" class="form-control" />
                         <span asp-validation-for="NotificationEmail" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <label asp-for="RedirectAutomatically" class="control-label"></label>*
+                        <select asp-for="RedirectAutomatically" asp-items="Model.RedirectAutomaticallySelectList" class="form-control"></select>
+                        <span asp-validation-for="RedirectAutomatically" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <input type="submit" class="btn btn-primary" value="Save Settings" />
                     </div>

BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml

@@ -135,7 +135,7 @@
                         </div>
                         <div class="col-md-4 col-sm-12">
                             <partial 
-                                name="Crowdfund/ContributeForm"
+                                name="/Views/AppsPublic/Crowdfund/ContributeForm.cshtml"
                                 model="@(new ContributeToCrowdfund()
                                               {
                                                   ViewCrowdfundViewModel = Model,

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -41,19 +41,19 @@
 <body>
 @if (Context.Request.Query.ContainsKey("simple"))
 {
-    @await Html.PartialAsync("Crowdfund/MinimalCrowdfund", Model)
+    @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
 }
 else
 {
     <noscript>
-        @await Html.PartialAsync("Crowdfund/MinimalCrowdfund", Model)
+        @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
     </noscript>
 
     if (Model.AnimationsEnabled)
     {
         <canvas id="fireworks"></canvas>
     }
-    @await Html.PartialAsync("Crowdfund/VueCrowdfund", Model)
+    @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml", Model)
 }
 
 </body>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -303,7 +303,7 @@
                                     :mode="srvModel.coinSwitchMode"
                                     :merchant-id="srvModel.coinSwitchMerchantId"
                                     :to-currency="srvModel.paymentMethodId"
-                                    :to-currency-due="srvModel.coinSwitchAmountMarkupPercentage? (1 + (srvModel.coinSwitchAmountMarkupPercentage / 100) :srvModel.btcDue"
+                                    :to-currency-due="coinswitchAmountDue"
                                     :autoload="selectedThirdPartyProcessor === 'coinswitch'"
                                     :to-currency-address="srvModel.btcAddress">
                             <div>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -178,6 +178,13 @@
             isModal: srvModel.isModal,
             lightningAmountInSatoshi: srvModel.lightningAmountInSatoshi,
             selectedThirdPartyProcessor: ""
+        },
+        computed: {
+            coinswitchAmountDue: function() {
+                return this.srvModel.coinSwitchAmountMarkupPercentage
+                    ? (1 + (this.srvModel.coinSwitchAmountMarkupPercentage / 100))
+                    : this.srvModel.btcDue;
+            }
         }
     });
     </script>

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -48,7 +48,9 @@
                 <a class="btn btn-primary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Export
                 </a>
-                <a href="https://docs.btcpayserver.org/features/accounting" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                <a href="https://docs.btcpayserver.org/features/accounting" target="_blank">
+                    <span class="fa fa-question-circle-o" title="More information..."></span>
+                </a>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                     <a asp-action="Export" asp-route-format="csv" asp-route-searchTerm="@Model.SearchTerm" class="dropdown-item" target="_blank">CSV</a>
                     <a asp-action="Export" asp-route-format="json" asp-route-searchTerm="@Model.SearchTerm" class="dropdown-item" target="_blank">JSON</a>
@@ -77,7 +79,12 @@
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>
-                        <th>Date</th>
+                        <th style="min-width: 90px;" class="col-md-auto">
+                            Date
+                            <a href="javascript:switchTimeFormat()">
+                                <span class="fa fa-clock-o" title="Switch date format"></span>
+                            </a>
+                        </th>
                         <th>OrderId</th>
                         <th>InvoiceId</th>
                         <th>Status</th>
@@ -89,7 +96,11 @@
                     @foreach (var invoice in Model.Invoices)
                     {
                         <tr>
-                            <td>@invoice.Date.ToBrowserDate()</td>
+                            <td>
+                                <span class="switchTimeFormat" data-switch="@invoice.Date.ToTimeAgo()">
+                                    @invoice.Date.ToBrowserDate()
+                                </span> 
+                            </td>
                             <td>
                                 @if (invoice.RedirectUrl != string.Empty)
                                 {
@@ -173,7 +184,7 @@
                     </li>
                 </ul>
             </nav>
-            @{ 
+            @{
                 string listInvoices(int prevNext, int count)
                 {
                     var skip = Model.Skip;
@@ -192,8 +203,19 @@
                     return act;
                 }
             }
-
         </div>
 
     </div>
+
+    <script type="text/javascript">
+        function switchTimeFormat() {
+            $(".switchTimeFormat").each(function (index) {
+                var htmlVal = $(this).html();
+                var switchVal = $(this).attr("data-switch");
+
+                $(this).html(switchVal);
+                $(this).attr("data-switch", htmlVal);
+            });
+        }
+    </script>
 </section>

BTCPayServer/Views/Server/Policies.cshtml

@@ -21,11 +21,15 @@
             <div class="form-group">
                 <label asp-for="LockSubscription"></label>
                 <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
-            </div> 
+            </div>
             <div class="form-group">
                 <label asp-for="DiscourageSearchEngines"></label>
                 <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-inline" />
             </div>
+            <div class="form-group">
+                <label asp-for="RootAppId"></label>
+                <select asp-for="RootAppId" asp-items="ViewBag.AppsList" class="form-control"></select>
+            </div>
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>
     </div>

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -57,6 +57,12 @@
             <div class="form-group">
                 <label asp-for="LightningAmountInSatoshi"></label>
                 <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check" />
+                <span asp-validation-for="LightningAmountInSatoshi" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="RedirectAutomatically"></label>
+                <input asp-for="RedirectAutomatically" type="checkbox" class="form-check" />
+                <span asp-validation-for="RedirectAutomatically" class="text-danger"></span>
             </div>
             <br />
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>

BTCPayServer/Views/Stores/CreateToken.cshtml

@@ -28,14 +28,6 @@
                     <input asp-for="PublicKey" class="form-control" />
                     <span asp-validation-for="PublicKey" class="text-danger"></span>
                 </div>}
-            <div class="form-group">
-                <label asp-for="Facade"></label>
-                <select asp-for="Facade" class="form-control">
-                    <option value="merchant">merchant</option>
-                    <option value="pos">pos</option>
-                </select>
-                <span asp-validation-for="Facade" class="text-danger"></span>
-            </div>
 
             @if(ViewBag.ShowStores)
             {

BTCPayServer/Views/Stores/ListTokens.cshtml

@@ -25,7 +25,6 @@
             <thead>
                 <tr>
                     <th>Label</th>
-                    <th>Facade</th>
                     <th class="text-right">Actions</th>
                 </tr>
             </thead>
@@ -34,7 +33,6 @@
                 {
                     <tr>
                         <td>@token.Label</td>
-                        <td>@token.Facade</td>
                         <td class="text-right">
                             <a asp-action="ShowToken" asp-route-tokenId="@token.Id">See information</a> - <a asp-action="RevokeToken" asp-route-tokenId="@token.Id">Revoke</a>
                         </td>

BTCPayServer/Views/Stores/PayButton.cshtml

@@ -18,7 +18,7 @@
                 </div>
                 <div class="form-group col-md-4">
                     <label>&nbsp;</label>
-                    <input name="price" type="text" class="form-control"
+                    <input name="currency" type="text" class="form-control"
                            v-model="srvModel.currency" v-on:change="inputChanges"
                            :class="{'is-invalid': errors.has('currency') }">
                 </div>
@@ -57,6 +57,44 @@
                     </button>
                 </div>
             </div>
+            <div class="form-group">
+                <label>Button Type</label>
+                <div>
+                    <input type="radio" name="button-type" id="btn-fixed" value="0" v-model="srvModel.buttonType" v-on:change="inputChanges" checked />
+                    <label for="btn-fixed">Fixed amount</label>
+                </div>
+                <div>
+                    <input type="radio" name="button-type" id="btn-custom" value="1" v-model="srvModel.buttonType" v-on:change="inputChanges" />
+                    <label for="btn-custom">Custom amount</label>
+                </div>
+                <div>
+                    <input type="radio" name="button-type" id="btn-slider" value="2" v-model="srvModel.buttonType" v-on:change="inputChanges" />
+                    <label for="btn-slider">Slider</label>
+                </div>
+            </div>
+            <div class="form-row" v-if="srvModel.buttonType == 2">
+                <div class="form-group col-md-4">
+                    <label>Min</label>
+                    <input name="min" type="text" class="form-control"
+                           v-model="srvModel.min" v-on:change="inputChanges"
+                           v-validate="'required|decimal|min_value:1'" :class="{'is-invalid': errors.has('min') }">
+                    <small class="text-danger">{{ errors.first('min') }}</small>
+                </div>
+                <div class="form-group col-md-4">
+                    <label>Max</label>
+                    <input name="max" type="text" class="form-control"
+                           v-model="srvModel.max" v-on:change="inputChanges"
+                           v-validate="'required|decimal|min_value:1'" :class="{'is-invalid': errors.has('max') }">
+                    <small class="text-danger">{{ errors.first('max') }}</small>
+                </div>
+                <div class="form-group col-md-4">
+                    <label>Step</label>
+                    <input name="step" type="text" class="form-control"
+                           v-model="srvModel.step" v-on:change="inputChanges"
+                           v-validate="'required|decimal|min_value:1'" :class="{'is-invalid': errors.has('step') }">
+                    <small class="text-danger">{{ errors.first('step') }}</small>
+                </div>
+            </div>
         </div>
         <div class="col-lg-5">
             <br />
@@ -121,7 +159,7 @@
             Please fix errors shown in order for code generation to successfully execute.
         </div>
     </div>
-
+</div>
 
 @section HeadScripts {
     <link rel="stylesheet" href="~/vendor/highlightjs/default.min.css">
@@ -152,3 +190,20 @@
         });
     </script>
 }
+
+<script id="template-select-currency" type="text/template">
+    <select onchange="document.querySelector('input[type = hidden][name = currency]').value = event.target.value" style="-webkit-appearance: none; border: 0; display: block; padding: 0 3em; margin: auto auto 5px auto; font-size: 11px; background: 0 0; cursor: pointer;"><option value="USD">USD</option><option value="GBP">GBP</option><option value="EUR">EUR</option><option value="BTC">BTC</option></select>
+</script>
+
+<script id="template-button-plus-minus" type="text/template">
+    <button style="cursor:pointer; font-size:25px; line-height: 25px; background: rgba(0,0,0,.1); height: 30px; width: 45px; border:none; border-radius: 60px; margin: auto;" onclick="event.preventDefault(); var price = parseInt(document.querySelector('#btcpay-input-price').value); if ('TYPE' == '-' && (price - 1) < 1) { return; } document.querySelector('#btcpay-input-price').value = parseInt(document.querySelector('#btcpay-input-price').value) TYPE 1;">TYPE</button>
+</script>
+
+<script id="template-input-price" type="text/template">
+    <input type="text" id="btcpay-input-price" name="price" value="PRICEVALUE" style="border: none; background-image: none; background-color: transparent; -webkit-box-shadow: none ; -moz-box-shadow: none ; -webkit-appearance: none ; width: WIDTHINPUT; text-align: center; font-size: 25px; margin: auto; border-radius: 5px; line-height: 35px; background: #fff;" oninput="event.preventDefault();isNaN(event.target.value) || event.target.value <= 0 ? document.querySelector('#btcpay-input-price').value = PRICEVALUE : event.target.value" CUSTOM />
+</script>
+
+<script id="template-input-slider" type="text/template">
+    <input class="btcpay-input-range" id="btcpay-input-range" value="PRICE" type="range" min="MIN" max="MAX" step="STEP" style="width:WIDTH ;margin-bottom:15px;" oninput="document.querySelector('#btcpay-input-price').value = document.querySelector('#btcpay-input-range').value" />
+    <style type="text/css">input[type=range].btcpay-input-range{-webkit-appearance:none;width:100%;margin:9.45px 0}input[type=range].btcpay-input-range:focus{outline:0}input[type=range].btcpay-input-range::-webkit-slider-runnable-track{width:100%;height:3.1px;cursor:pointer;box-shadow:0 0 1.7px #020,0 0 0 #003c00;background:#f3f3f3;border-radius:1px;border:0 solid rgba(24,213,1,0)}input[type=range].btcpay-input-range::-webkit-slider-thumb{box-shadow:0 0 3.7px rgba(0,170,0,0),0 0 0 rgba(0,195,0,0);border:2.5px solid #cedc21;height:22px;width:23px;border-radius:12px;background:#0f3723;cursor:pointer;-webkit-appearance:none;margin-top:-9.45px}input[type=range].btcpay-input-range:focus::-webkit-slider-runnable-track{background:#fff}input[type=range].btcpay-input-range::-moz-range-track{width:100%;height:3.1px;cursor:pointer;box-shadow:0 0 1.7px #020,0 0 0 #003c00;background:#f3f3f3;border-radius:1px;border:0 solid rgba(24,213,1,0)}input[type=range].btcpay-input-range::-moz-range-thumb{box-shadow:0 0 3.7px rgba(0,170,0,0),0 0 0 rgba(0,195,0,0);border:2.5px solid #cedc21;height:22px;width:23px;border-radius:12px;background:#0f3723;cursor:pointer}input[type=range].btcpay-input-range::-ms-track{width:100%;height:3.1px;cursor:pointer;background:0 0;border-color:transparent;color:transparent}input[type=range].btcpay-input-range::-ms-fill-lower{background:#e6e6e6;border:0 solid rgba(24,213,1,0);border-radius:2px;box-shadow:0 0 1.7px #020,0 0 0 #003c00}input[type=range].btcpay-input-range::-ms-fill-upper{background:#f3f3f3;border:0 solid rgba(24,213,1,0);border-radius:2px;box-shadow:0 0 1.7px #020,0 0 0 #003c00}input[type=range].btcpay-input-range::-ms-thumb{box-shadow:0 0 3.7px rgba(0,170,0,0),0 0 0 rgba(0,195,0,0);border:2.5px solid #cedc21;height:22px;width:23px;border-radius:12px;background:#0f3723;cursor:pointer;height:3.1px}input[type=range].btcpay-input-range:focus::-ms-fill-lower{background:#f3f3f3}input[type=range].btcpay-input-range:focus::-ms-fill-upper{background:#fff}</style>
+</script>

BTCPayServer/Views/Stores/RequestPairing.cshtml

@@ -20,10 +20,6 @@
                         <th>Label</th>
                         <td style="text-align:right;">@Model.Label</td>
                     </tr>
-                    <tr>
-                        <th>Facade</th>
-                        <td style="text-align:right;">@Model.Facade</td>
-                    </tr>
                     <tr>
                         <th>SIN</th>
                         <td style="text-align:right;">@Model.SIN</td>

BTCPayServer/Views/Stores/ShowToken.cshtml

@@ -20,10 +20,6 @@
                 <th>Token</th>
                 <td>@Model.Value</td>
             </tr>
-            <tr>
-                <th>Facade</th>
-                <td>@Model.Facade</td>
-            </tr>
         </table>
     </div>
 </div>

BTCPayServer/wwwroot/checkout/js/core.js

@@ -46,6 +46,12 @@ function onDataCallback(jsonData) {
 
         resetTabsSlider();
         $("#paid").addClass("active");
+        if (!jsonData.isModal && jsonData.redirectAutomatically && jsonData.merchantRefLink) {
+            $(".payment__spinner").show();
+            setTimeout(function () {
+                window.location = jsonData.merchantRefLink;
+            }, 2000);
+        }
     }
 
     if (newStatus === "expired" || newStatus === "invalid") { //TODO: different state if the invoice is invalid (failed to confirm after timeout)

BTCPayServer/wwwroot/paybutton/paybutton.js

@@ -22,7 +22,7 @@ function esc(input) {
         (but it's not necessary).
         Or for XML, only if the named entities are defined in its DTD.
         */
-    ;
+        ;
 }
 
 Vue.use(VeeValidate);
@@ -42,9 +42,42 @@ function inputChanges(event, buttonSize) {
         srvModel.buttonSize = buttonSize;
     }
 
+    var width = "209px";
+    var widthInput = "3em";
+    if (srvModel.buttonSize === 0) {
+        width = "146px";
+        widthInput = "2em";
+    } else if (srvModel.buttonSize === 1) {
+        width = "168px";
+    } else if (srvModel.buttonSize === 2) {
+        width = "209px";
+    }
+
     var html = '<form method="POST" action="' + esc(srvModel.urlRoot) + 'api/v1/invoices">';
     html += addinput("storeId", srvModel.storeId);
-    html += addinput("price", srvModel.price);
+
+    // Add price as hidden only if it's a fixed amount (srvModel.buttonType = 0)
+    if (srvModel.buttonType == 0) {
+        html += addinput("price", srvModel.price);
+    }
+    else if (srvModel.buttonType == 1) {
+        html += '\n    <div style="text-align:center;width:' + width + '">';
+        html += '<div>';
+        html += addPlusMinusButton("-");
+        html += addInputPrice(srvModel.price, widthInput, "");
+        html += addPlusMinusButton("+");
+        html += '</div>';
+        html += addSelectCurrency();
+        html += '</div>';
+    }
+    else if (srvModel.buttonType == 2) {
+        html += '\n    <div style="text-align:center;width:' + width + '">';
+        html += addInputPrice(srvModel.price, width, 'onchange="document.querySelector(\'#btcpay-input-range\').value = document.querySelector(\'#btcpay-input-price\').value"');
+        html += addSelectCurrency();
+        html += addSlider(srvModel.price, srvModel.min, srvModel.max, srvModel.step, width);
+        html += '</div>';
+    }
+
     if (srvModel.currency) {
         html += addinput("currency", srvModel.currency);
     }
@@ -65,14 +98,6 @@ function inputChanges(event, buttonSize) {
         html += addinput("notifyEmail", srvModel.notifyEmail);
     }
 
-    var width = "209px";
-    if (srvModel.buttonSize === 0) {
-        width = "146px";
-    } else if (srvModel.buttonSize === 1) {
-        width = "168px";
-    } else if (srvModel.buttonSize === 2) {
-        width = "209px";
-    }
     html += '\n    <input type="image" src="' + esc(srvModel.payButtonImageUrl) + '" name="submit" style="width:' + width +
         '" alt="Pay with BtcPay, Self-Hosted Bitcoin Payment Processor">';
 
@@ -93,3 +118,37 @@ function addinput(name, value) {
     return html;
 }
 
+function addPlusMinusButton(type) {
+    var button = document.getElementById('template-button-plus-minus').innerHTML.trim();
+    if (type === "+") {
+        return button.replace(/TYPE/g, '+');
+    } else {
+        return button.replace(/TYPE/g, '-');
+    }
+}
+
+function addInputPrice(price, widthInput, customFn) {
+    var input = document.getElementById('template-input-price').innerHTML.trim();
+
+    input = input.replace(/PRICEVALUE/g, price);
+    input = input.replace("WIDTHINPUT", widthInput);
+
+    if (customFn) {
+        return input.replace("CUSTOM", customFn);
+    }
+    return input.replace("CUSTOM", "");
+}
+
+function addSelectCurrency() {
+    return document.getElementById('template-select-currency').innerHTML.trim();
+}
+
+function addSlider(price, min, max, step, width) {
+    var input = document.getElementById('template-input-slider').innerHTML.trim();
+    input = input.replace("PRICE", price);
+    input = input.replace("MIN", min);
+    input = input.replace("MAX", max);
+    input = input.replace("STEP", step);
+    input = input.replace("WIDTH", width);
+    return input;
+}

README.md

@@ -35,7 +35,7 @@ Thanks to the [apps](https://github.com/btcpayserver/btcpayserver-doc/blob/maste
 * SegWit support
 * Lightning Network support (LND and c-lightning)
 * Tor support
-* Opt-in Altcoin integrations
+* Opt-in altcoin integrations
 * Full compatibility with BitPay API (easy migration)
 * Process payments for others
 * Easy-embeddable Payment buttons
@@ -43,30 +43,20 @@ Thanks to the [apps](https://github.com/btcpayserver/btcpayserver-doc/blob/maste
 * Crowdfunding app
 * Payment requests
 
-## Supported Altcoins
-
-Bitcoin is the only focus of the project and its core developers. However, opt in integrations for several altcoins maintained by altcoins community is implemented for several altcoins:
-
-* Bitcoin Gold (BTG)
-* Bitcoin Plus (XBC)
-* Bitcore (BTX)
-* Dash (DASH)
-* Dogecoin (DOGE)
-* Feathercoin (FTC)
-* Groestlcoin (GRS)
-* Litecoin (LTC)
-* Monacoin (MONA)
-* Polis (POLIS)
-* Viacoin (VIA)
-
-Altcoins are maintained by their respective communities.
-
 ## Documentation
 
 Please check out our [official website](https://btcpayserver.org/), our [complete documentation](https://github.com/btcpayserver/btcpayserver-doc) and [FAQ](https://github.com/btcpayserver/btcpayserver-doc/tree/master/FAQ#btcpay-frequently-asked-questions-and-common-issues) for more details. 
 
-If you have any troubles with BTCPay, please file a [Github issue](https://github.com/btcpayserver/btcpayserver/issues).
-For general questions, please join the community chat on [Mattermost](https://chat.btcpayserver.org/).
+If you have trouble using BTCPay, consider joining [communities listed on official website](https://btcpayserver.org/#communityCTA) to get help from BTCPay community members. Only file [Github issue](https://github.com/btcpayserver/btcpayserver/issues) for technical issues you can't resolve through other channels or feature requests you've validated with other members of community.
+
+Main community chat is located on [Mattermost](https://chat.btcpayserver.org/).
+
+## Contributing
+BTCPay is built and maintained entirely by volunteer contributors around the internet. We welcome and appreciate new contributions.
+
+If you're a developer looking to help, but you're not sure where to begin, check the [good first issue label](https://github.com/btcpayserver/btcpayserver/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22), which contains small pieces of work that have been specifically flagged as being friendly to new contributors.
+
+Contributors looking to do something a bit more challenging, before opening a pull request, please [create an issue](https://github.com/btcpayserver/btcpayserver/issues/new/choose) or join [our community chat](https://chat.btcpayserver.org/) to get early feedback, discuss best ways to tackle the problem and to ensure there is no work duplication.
 
 ## How to build
 
@@ -100,11 +90,11 @@ On linux:
 
 ## How to debug
 
-If you want to debug, use Visual Studio Code or Visual studio 2017.
+If you want to debug, use Visual Studio Code or Visual Studio 2017.
 
 You need to run the development time docker-compose as described [in the test guide](BTCPayServer.Tests/README.md).
 
-You can then run the debugger by using the Launch Profile `Docker-Regtest` on either Visual Studio Code or Visual studio 2017.
+You can then run the debugger by using the Launch Profile `Docker-Regtest` on either Visual Studio Code or Visual Studio 2017.
 
 If you need to debug ledger wallet interaction, install the development time certificate with:
 
@@ -115,8 +105,24 @@ dotnet dev-certs https --trust
 
 Then use the `Docker-Regtest-https` debug profile.
 
-
-
 ## Other dependencies
 
 For more information, see the documentation: [How to deploy a BTCPay server instance](https://github.com/btcpayserver/btcpayserver-doc/#deployment).
+
+## Supported altcoins
+
+Bitcoin is the only focus of the project and its core developers. However, opt in integrations are present for several altcoins:
+
+* BGold (BTG) (also known as Bitcoin Gold)
+* BPlus (XBC) (also known as Bitcoin Plus)
+* Bitcore (BTX)
+* Dash (DASH)
+* Dogecoin (DOGE)
+* Feathercoin (FTC)
+* Groestlcoin (GRS)
+* Litecoin (LTC)
+* Monacoin (MONA)
+* Polis (POLIS)
+* Viacoin (VIA)
+
+Altcoins are maintained by their respective communities.