Fix checkout experience custom logo and css

This commit is contained in:
nicolas.dorier
2018-04-05 11:34:25 +09:00
parent a845ed88a7
commit 6270a626fb
3 changed files with 7 additions and 7 deletions

View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.0.1.72</Version> <Version>1.0.1.73</Version>
<NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn> <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -197,8 +197,8 @@ namespace BTCPayServer.Controllers
vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? ""; vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? ""; vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
vm.AllowCoinConversion = storeBlob.AllowCoinConversion; vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
vm.CustomCSS = storeBlob.CustomCSS; vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
vm.CustomLogo = storeBlob.CustomLogo; vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
return View(vm); return View(vm);
} }
@@ -245,8 +245,8 @@ namespace BTCPayServer.Controllers
blob.AllowCoinConversion = model.AllowCoinConversion; blob.AllowCoinConversion = model.AllowCoinConversion;
blob.LightningMaxValue = lightningMaxValue; blob.LightningMaxValue = lightningMaxValue;
blob.OnChainMinValue = onchainMinValue; blob.OnChainMinValue = onchainMinValue;
blob.CustomLogo = model.CustomLogo; blob.CustomLogo = string.IsNullOrWhiteSpace(model.CustomLogo) ? null : new Uri(model.CustomLogo, UriKind.Absolute);
blob.CustomCSS = model.CustomCSS; blob.CustomCSS = string.IsNullOrWhiteSpace(model.CustomCSS) ? null : new Uri(model.CustomCSS, UriKind.Absolute);
if (store.SetStoreBlob(blob)) if (store.SetStoreBlob(blob))
{ {
needUpdate = true; needUpdate = true;

View File

@@ -37,10 +37,10 @@ namespace BTCPayServer.Models.StoreViewModels
[Display(Name = "Link to a custom CSS stylesheet")] [Display(Name = "Link to a custom CSS stylesheet")]
[Url] [Url]
public Uri CustomCSS { get; set; } public string CustomCSS { get; set; }
[Display(Name = "Link to a custom logo")] [Display(Name = "Link to a custom logo")]
[Url] [Url]
public Uri CustomLogo { get; set; } public string CustomLogo { get; set; }
public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto) public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto)
{ {