mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 18:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Custom logo and custom url for checkout page should accept any string (relative path) (Fix #1124)

Browse Source
This commit is contained in:
nicolas.dorier 2019-11-06 12:01:29 +09:00
parent c62aeb670a
commit 2d80dbfa8f
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/InvoiceController.UI.cs
View File

@ -232,8 +232,8 @@ namespace BTCPayServer.Controllers
InvoiceId = invoice.Id,
DefaultLang = storeBlob.DefaultLang ?? "en",
HtmlTitle = storeBlob.HtmlTitle ?? "BTCPay Invoice",
CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
CustomCSSLink = storeBlob.CustomCSS,
CustomLogoLink = storeBlob.CustomLogo,
CryptoImage = Request.GetRelativePathOrAbsolute(paymentMethodHandler.GetCryptoImage(paymentMethodId)),
BtcAddress = paymentMethodDetails.GetPaymentDestination(),
BtcDue = accounting.Due.ToString(),

8
BTCPayServer/Controllers/StoresController.cs
View File

@ -353,8 +353,8 @@ namespace BTCPayServer.Controllers
var storeBlob = CurrentStore.GetStoreBlob();
var vm = new CheckoutExperienceViewModel();
SetCryptoCurrencies(vm, CurrentStore);
vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
vm.CustomCSS = storeBlob.CustomCSS;
vm.CustomLogo = storeBlob.CustomLogo;
vm.HtmlTitle = storeBlob.HtmlTitle;
vm.SetLanguages(_LangService, storeBlob.DefaultLang);
vm.RequiresRefundEmail = storeBlob.RequiresRefundEmail;
@ -412,8 +412,8 @@ namespace BTCPayServer.Controllers
{
return View(model);
}
blob.CustomLogo = string.IsNullOrWhiteSpace(model.CustomLogo) ? null : new Uri(model.CustomLogo, UriKind.Absolute);
blob.CustomCSS = string.IsNullOrWhiteSpace(model.CustomCSS) ? null : new Uri(model.CustomCSS, UriKind.Absolute);
blob.CustomLogo = model.CustomLogo;
blob.CustomCSS = model.CustomCSS;
blob.HtmlTitle = string.IsNullOrWhiteSpace(model.HtmlTitle) ? null : model.HtmlTitle;
blob.DefaultLang = model.DefaultLang;
blob.RequiresRefundEmail = model.RequiresRefundEmail;

7
BTCPayServer/Data/StoreBlob.cs
View File

@ -89,10 +89,9 @@ namespace BTCPayServer.Data
public CurrencyValue LightningMaxValue { get; set; }
public bool LightningAmountInSatoshi { get; set; }
[JsonConverter(typeof(UriJsonConverter))]
public Uri CustomLogo { get; set; }
[JsonConverter(typeof(UriJsonConverter))]
public Uri CustomCSS { get; set; }
public string CustomLogo { get; set; }
public string CustomCSS { get; set; }
public string HtmlTitle { get; set; }
public bool RateScripting { get; set; }

2
BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs
View File

@ -27,10 +27,8 @@ namespace BTCPayServer.Models.StoreViewModels
public string DefaultLang { get; set; }
[Display(Name = "Link to a custom CSS stylesheet")]
[Uri]
public string CustomCSS { get; set; }
[Display(Name = "Link to a custom logo")]
[Uri]
public string CustomLogo { get; set; }
[Display(Name = "Custom HTML title to display on Checkout page")]

2
BTCPayServer/Views/Invoice/Checkout-Body.cshtml
View File

@ -3,7 +3,7 @@
<div class="top-header">
<div class="header">
<div class="header__icon">
@if (Model.CustomLogoLink != null)
@if (!string.IsNullOrEmpty(Model.CustomLogoLink))
{
<img class="header__icon__img" src="@Model.CustomLogoLink" height="40">
}

2
BTCPayServer/Views/Invoice/Checkout.cshtml
View File

@ -24,7 +24,7 @@
<bundle name="wwwroot/bundles/checkout-bundle.min.js" />
<script>vex.defaultOptions.className = 'vex-theme-btcpay'</script>
@if (Model.CustomCSSLink != null)
@if (!string.IsNullOrEmpty(Model.CustomCSSLink))
{
<link href="@Model.CustomCSSLink" rel="stylesheet" />
}