Merge branch 'main' into fix-carton-content-request-feed

Author: abuzuhri

Source/FikaAmazonAPI.SampleCode/FeedsSample.cs

@@ -318,7 +318,8 @@ public void CartonContentsRequestFeed()
                         new CartonItem() {
                             QuantityInCase=12,
                         QuantityShipped=12,
-                        SKU="4051"
+                        SKU="4051",
+                        ExpirationDate=DateTime.Now,
                         }
                     }
                     }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInbound/PrepInstruction.cs

@@ -58,7 +58,24 @@ public enum PrepInstruction
         /// Enum HangGarment for value: HangGarment
         /// </summary>
         [EnumMember(Value = "HangGarment")]
-        HangGarment = 6
-    }
+        HangGarment = 6,
+
+        /// <summary>
+        /// Enum Boxing for value: Boxing
+        /// </summary>
+        [EnumMember(Value = "Boxing")]
+        Boxing = 7,
+
+        /// <summary>
+        /// Enum SuffocationStickering for value: SuffocationStickering
+        /// </summary>
+        [EnumMember(Value = "SuffocationStickering")]
+        SuffocationStickering = 8,
 
+        /// <summary>
+        /// Enum SetCreation for value: SetCreation
+        /// </summary>
+        [EnumMember(Value = "SetCreation")]
+        SetCreation = 9
+    }
 }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInbound/UnitOfMeasurement.cs

@@ -30,6 +30,12 @@ public enum UnitOfMeasurement
         [EnumMember(Value = "inches")]
         Inches = 1,
 
+        /// <summary>
+        /// Enum Inches for value: inches
+        /// </summary>
+        [EnumMember(Value = "IN")]
+        IN = 1,
+
         /// <summary>
         /// Enum Centimeters for value: centimeters
         /// </summary>

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/DocumentFormat.cs

@@ -4,33 +4,21 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
 
-  /// <summary>
-  /// The file format of the document.
-  /// </summary>
-  [DataContract]
-  public class DocumentFormat {
-
     /// <summary>
-    /// Get the string presentation of the object
+    /// The file format of the document.
     /// </summary>
-    /// <returns>String presentation of the object</returns>
-    public override string ToString()  {
-      var sb = new StringBuilder();
-      sb.Append("class DocumentFormat {\n");
-      sb.Append("}\n");
-      return sb.ToString();
-    }
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum DocumentFormat {
 
-    /// <summary>
-    /// Get the JSON string presentation of the object
-    /// </summary>
-    /// <returns>JSON string presentation of the object</returns>
-    public string ToJson() {
-      return JsonConvert.SerializeObject(this, Formatting.Indented);
+        [EnumMember(Value = "PDF")]
+        PDF ,
+        [EnumMember(Value = "PNG")]
+        PNG ,
+        [EnumMember(Value = "ZPL")]
+        ZPL 
     }
-
-}
 }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/DocumentType.cs

@@ -4,33 +4,23 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
 
-  /// <summary>
-  /// The type of shipping document.
-  /// </summary>
-  [DataContract]
-  public class DocumentType {
-
     /// <summary>
-    /// Get the string presentation of the object
+    /// The type of shipping document.
     /// </summary>
-    /// <returns>String presentation of the object</returns>
-    public override string ToString()  {
-      var sb = new StringBuilder();
-      sb.Append("class DocumentType {\n");
-      sb.Append("}\n");
-      return sb.ToString();
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum DocumentType
+    {
+        [EnumMember(Value = "PACKSLIP")]
+        PACKSLIP,
+        [EnumMember(Value = "LABEL")]
+        LABEL,
+        [EnumMember(Value = "RECEIPT")]
+        RECEIPT,
+        [EnumMember(Value = "CUSTOM_FORM")]
+        CUSTOM_FORM    
     }
-
-    /// <summary>
-    /// Get the JSON string presentation of the object
-    /// </summary>
-    /// <returns>JSON string presentation of the object</returns>
-    public string ToJson() {
-      return JsonConvert.SerializeObject(this, Formatting.Indented);
-    }
-
-}
 }

Source/FikaAmazonAPI/ConstructFeed/Messages/CartonContentsRequest.cs

@@ -9,11 +9,13 @@ public class CartonContentsRequest
     {
         [XmlElement(ElementName = "ShipmentId")]
         public string ShipmentId { get; set; }
+
         [XmlElement(ElementName = "NumCartons")]
         public int NumCartons
         {
             get { return Carton.Count; }
-            set { /* required for xml serialization */ }
+            [Obsolete("Only used for xml serialization", error: true)]
+            set { throw new NotSupportedException(); }
         }
         [XmlElement(ElementName = "Carton")]
         public List<Carton> Carton { get; set; } = new List<Carton>();

Source/FikaAmazonAPI/FikaAmazonAPI.csproj

@@ -7,9 +7,9 @@
     <Product>CSharp Amazon Sp API</Product>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>8.0</LangVersion>
-    <Version>1.5.3</Version>
-    <AssemblyVersion>1.5.3</AssemblyVersion>
-    <FileVersion>1.5.3</FileVersion>
+    <Version>1.5.5</Version>
+    <AssemblyVersion>1.5.5</AssemblyVersion>
+    <FileVersion>1.5.5</FileVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/abuzuhri/Amazon-SP-API-CSharp</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>