diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FeatureSettings.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FeatureSettings.cs index 817ca949..1eda73de 100644 --- a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FeatureSettings.cs +++ b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/FeatureSettings.cs @@ -1,7 +1,9 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; using System.Text; @@ -24,11 +26,12 @@ public FeatureSettings() { } /// /// The feature name. (required). /// The feature description. (required). + /// The feature FulfillmentPolicy. (required). /// When true, indicates that the seller is eligible to use the feature.. - public FeatureSettings(string featureName = default(string), FeatureFulfillmentPolicy featureFulfillmentPolicy = default(FeatureFulfillmentPolicy)) + public FeatureSettings(string featureName = default(string), FeatureFulfillmentPolicyEnum featureFulfillmentPolicy = default(FeatureFulfillmentPolicyEnum)) { this.FeatureName = featureName; - this.featureFulfillmentPolicy = featureFulfillmentPolicy; + this.FeatureFulfillmentPolicy = featureFulfillmentPolicy; } /// @@ -43,7 +46,8 @@ public FeatureSettings() { } /// /// The feature description. [DataMember(Name = "featureFulfillmentPolicy", EmitDefaultValue = false)] - public FeatureFulfillmentPolicy featureFulfillmentPolicy { get; set; } + [JsonProperty("featureFulfillmentPolicy", Required = Required.Always)] + public FeatureFulfillmentPolicyEnum FeatureFulfillmentPolicy { get; set; } /// /// Returns the string presentation of the object @@ -53,7 +57,8 @@ public override string ToString() { var sb = new StringBuilder(); sb.Append("class Feature {\n"); - sb.Append(" FeatureName: ").Append(FeatureName).Append("\n"); + sb.Append(" FeatureName: ").Append(this.FeatureName).Append("\n"); + sb.Append(" FeatureFulfillmentPolicy: ").Append(this.FeatureFulfillmentPolicy).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -64,7 +69,16 @@ public override string ToString() /// JSON string presentation of the object public virtual string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); + var jsonSettings = new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore, + Formatting = Formatting.Indented + }; + + var jsonObject = JObject.FromObject(this, JsonSerializer.Create(jsonSettings)); + jsonObject["featureFulfillmentPolicy"] = this.FeatureFulfillmentPolicy.ToString(); + + return jsonObject.ToString(); } /// @@ -125,8 +139,10 @@ public override int GetHashCode() /// Variant of the image, such as `MAIN` or `PT01`. /// /// Variant of the image, such as `MAIN` or `PT01`. + + [DefaultValue(FeatureFulfillmentPolicyEnum.Required)] [JsonConverter(typeof(StringEnumConverter))] - public enum FeatureFulfillmentPolicy + public enum FeatureFulfillmentPolicyEnum { /// diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/GetFulfillmentPreviewItem.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/GetFulfillmentPreviewItem.cs index 0f80b190..e49465cc 100644 --- a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/GetFulfillmentPreviewItem.cs +++ b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/GetFulfillmentPreviewItem.cs @@ -70,7 +70,7 @@ public GetFulfillmentPreviewItem() { } /// The seller SKU of the item. /// /// The seller SKU of the item. - [DataMember(Name = "sellerSKU", EmitDefaultValue = false)] + [DataMember(Name = "sellerSku", EmitDefaultValue = false)] public string SellerSKU { get; set; } /// diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/Weight.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/Weight.cs index 4f3d9a7d..208d7a12 100644 --- a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/Weight.cs +++ b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/Weight.cs @@ -39,11 +39,23 @@ public enum UnitEnum [EnumMember(Value = "KG")] KG = 1, + /// + /// Enum KILOGRAMS for value: KILOGRAMS + /// + [EnumMember(Value = "KILOGRAMS")] + KILOGRAMS = 2, + /// /// Enum LB for value: LB /// [EnumMember(Value = "LB")] - LB = 2 + LB = 3, + + /// + /// Enum POUNDS for value: POUNDS + /// + [EnumMember(Value = "POUNDS")] + POUNDS =4 } ///