diff --git a/BTCPayServer/Controllers/AppsController.PointOfSale.cs b/BTCPayServer/Controllers/AppsController.PointOfSale.cs index ae8d9dd4f..8505b4423 100644 --- a/BTCPayServer/Controllers/AppsController.PointOfSale.cs +++ b/BTCPayServer/Controllers/AppsController.PointOfSale.cs @@ -78,6 +78,10 @@ namespace BTCPayServer.Controllers public string CustomCSSLink { get; set; } + + public string EmbeddedCSS { get; set; } + + public string Description { get; set; } public string NotificationEmail { get; set; } public string NotificationUrl { get; set; } public bool? RedirectAutomatically { get; set; } @@ -109,6 +113,8 @@ namespace BTCPayServer.Controllers CustomTipText = settings.CustomTipText ?? PointOfSaleSettings.CUSTOM_TIP_TEXT_DEF, CustomTipPercentages = settings.CustomTipPercentages != null ? string.Join(",", settings.CustomTipPercentages) : string.Join(",", PointOfSaleSettings.CUSTOM_TIP_PERCENTAGES_DEF), CustomCSSLink = settings.CustomCSSLink, + EmbeddedCSS = settings.EmbeddedCSS, + Description = settings.Description, NotificationEmail = settings.NotificationEmail, NotificationUrl = settings.NotificationUrl, RedirectAutomatically = settings.RedirectAutomatically.HasValue? settings.RedirectAutomatically.Value? "true": "false" : "" @@ -187,6 +193,8 @@ namespace BTCPayServer.Controllers CustomCSSLink = vm.CustomCSSLink, NotificationUrl = vm.NotificationUrl, NotificationEmail = vm.NotificationEmail, + Description = vm.Description, + EmbeddedCSS = vm.EmbeddedCSS, RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically)? (bool?) null: bool.Parse(vm.RedirectAutomatically) }); diff --git a/BTCPayServer/Controllers/AppsPublicController.cs b/BTCPayServer/Controllers/AppsPublicController.cs index 880ae8d0b..35044773e 100644 --- a/BTCPayServer/Controllers/AppsPublicController.cs +++ b/BTCPayServer/Controllers/AppsPublicController.cs @@ -87,7 +87,9 @@ namespace BTCPayServer.Controllers CustomTipText = settings.CustomTipText, CustomTipPercentages = settings.CustomTipPercentages, CustomCSSLink = settings.CustomCSSLink, - AppId = appId + AppId = appId, + Description = settings.Description, + EmbeddedCSS = settings.EmbeddedCSS }); } diff --git a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs index 9affda5ae..610bf94c7 100644 --- a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs +++ b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs @@ -85,5 +85,7 @@ namespace BTCPayServer.Models.AppViewModels }, nameof(SelectListItem.Value), nameof(SelectListItem.Text), RedirectAutomatically); public bool NotificationEmailWarning { get; set; } + public string EmbeddedCSS { get; set; } + public string Description { get; set; } } } diff --git a/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs b/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs index 9d87769e2..8c83dae6e 100644 --- a/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs +++ b/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs @@ -50,5 +50,7 @@ namespace BTCPayServer.Models.AppViewModels public int[] CustomTipPercentages { get; set; } public string CustomCSSLink { get; set; } + public string Description { get; set; } + public string EmbeddedCSS { get; set; } } } diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml index 4b364fac6..71ac7bfbf 100644 --- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml +++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml @@ -1,5 +1,4 @@ @addTagHelper *, BundlerMinifier.TagHelpers -@using System.Globalization @model UpdatePointOfSaleViewModel @{ ViewData["Title"] = "Update Point of Sale"; @@ -132,6 +131,16 @@ +