Merge pull request #1620 from NicolasDorier/additionaldata

[GreenField] Add additional data to allow roundtrip of upper version fields
This commit is contained in:
Nicolas Dorier 2020-06-01 19:23:35 +09:00 committed by GitHub
commit 44ee7c66ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View file

@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Generic;
using BTCPayServer.JsonConverters; using BTCPayServer.JsonConverters;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Client.Models namespace BTCPayServer.Client.Models
{ {
@ -17,5 +19,8 @@ namespace BTCPayServer.Client.Models
public string EmbeddedCSS { get; set; } public string EmbeddedCSS { get; set; }
public string CustomCSSLink { get; set; } public string CustomCSSLink { get; set; }
public bool AllowCustomPaymentAmounts { get; set; } public bool AllowCustomPaymentAmounts { get; set; }
[JsonExtensionData]
public IDictionary<string, JToken> AdditionalData { get; set; }
} }
} }

View file

@ -1,8 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using BTCPayServer.Client.JsonConverters; using BTCPayServer.Client.JsonConverters;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Client.Models namespace BTCPayServer.Client.Models
{ {
@ -55,6 +57,9 @@ namespace BTCPayServer.Client.Models
public bool PayJoinEnabled { get; set; } public bool PayJoinEnabled { get; set; }
public bool LightningPrivateRouteHints { get; set; } public bool LightningPrivateRouteHints { get; set; }
[JsonExtensionData]
public IDictionary<string, JToken> AdditionalData { get; set; }
} }
public enum NetworkFeeMode public enum NetworkFeeMode