add redirect automatically to checkout experience/ store settings

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -79,7 +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; }
+            public bool? RedirectAutomatically { get; set; }
         }
 
         [HttpGet]
@@ -107,7 +107,7 @@ namespace BTCPayServer.Controllers
                 CustomCSSLink = settings.CustomCSSLink,
                 NotificationEmail = settings.NotificationEmail,
                 NotificationUrl = settings.NotificationUrl,
-                RedirectAutomatically = settings.RedirectAutomatically
+                RedirectAutomatically = settings.RedirectAutomatically.HasValue? settings.RedirectAutomatically.Value? "true": "false" : "" 
             };
             if (HttpContext?.Request != null)
             {
@@ -183,7 +183,7 @@ namespace BTCPayServer.Controllers
                 CustomCSSLink = vm.CustomCSSLink,
                 NotificationUrl = vm.NotificationUrl,
                 NotificationEmail = vm.NotificationEmail,
-                RedirectAutomatically = vm.RedirectAutomatically
+                RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically)? (bool?) null: bool.Parse(vm.RedirectAutomatically)
                 
             });
             await UpdateAppSettings(app);

BTCPayServer/Controllers/AppsPublicController.cs

@@ -271,7 +271,7 @@ namespace BTCPayServer.Controllers
                     FullNotifications = true,
                     ExtendedNotifications = true,
                     PosData = string.IsNullOrEmpty(posData) ? null : posData,
-                     RedirectAutomatically =  settings.RedirectAutomatically
+                    RedirectAutomatically =  settings.RedirectAutomatically,
                 }, store, HttpContext.Request.GetAbsoluteRoot(),
                 new List<string>() {AppService.GetAppInternalTag(appId)},
                 cancellationToken);

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,7 +126,8 @@ namespace BTCPayServer.Controllers
             if (!Uri.IsWellFormedUriString(entity.RedirectURL, UriKind.Absolute))
                 entity.RedirectURL = null;
 
-            entity.RedirectAutomatically = invoice.RedirectAutomatically;
+            entity.RedirectAutomatically =
+                invoice.RedirectAutomatically.GetValueOrDefault(storeBlob.RedirectAutomatically);
 
             entity.Status = InvoiceStatus.New;
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);

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;

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/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,8 +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 bool  RedirectAutomatically { get; set; }
+        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

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

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -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/Views/Apps/UpdatePointOfSale.cshtml

@@ -118,10 +118,9 @@
                         <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"></label>
+                        <label asp-for="RedirectAutomatically" class="control-label"></label>*
-                        <input asp-for="RedirectAutomatically" type="checkbox" class="form-check" />
+                        <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">

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>