Merge pull request #643 from TManITtech/main

abuzuhri · web-flow · commit fd5d44a02893 · 2023-08-30T09:39:12.000+04:00
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/AvailableValueAddedServiceGroupList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/AvailableValueAddedServiceGroupList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of value-added services available for a shipping service offering.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class AvailableValueAddedServiceGroupList : List<AvailableValueAddedServiceGroup> {
 
     /// <summary>
@@ -32,5 +32,5 @@ public override string ToString()  {
       return JsonConvert.SerializeObject(this, Formatting.Indented);
     }
 
-}
+  }
 }
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/ChargeList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/ChargeList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of charges based on the shipping service charges applied on a package.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class ChargeList : List<ChargeComponent> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/IneligibleRateList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/IneligibleRateList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of ineligible shipping service offerings.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class IneligibleRateList : List<IneligibleRate> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/ItemList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/ItemList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of items.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class ItemList : List<Item> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageDocumentDetailList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageDocumentDetailList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of post-purchase details about a package that will be shipped using a shipping service.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class PackageDocumentDetailList : List<PackageDocumentDetail> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageDocumentList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageDocumentList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of documents related to a package.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class PackageDocumentList : List<PackageDocument> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PackageList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of packages to be shipped through a shipping service offering.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class PackageList : List<Package> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PrintOptionList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/PrintOptionList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of the format options for a label.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class PrintOptionList : List<PrintOption> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/RateList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/RateList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of eligible shipping service offerings.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class RateList : List<Rate> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/RequestedValueAddedServiceList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/RequestedValueAddedServiceList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// The value-added services to be added to a shipping service purchase.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class RequestedValueAddedServiceList : List<RequestedValueAddedService> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/SupportedDocumentSpecificationList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/SupportedDocumentSpecificationList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of the document specifications supported for a shipment service offering.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class SupportedDocumentSpecificationList : List<SupportedDocumentSpecification> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/TaxDetailList.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ShippingV2/TaxDetailList.cs
@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {
   /// <summary>
   /// A list of tax detail information.
   /// </summary>
-  [DataContract]
+  [CollectionDataContract]
   public class TaxDetailList : List<TaxDetail> {
 
     /// <summary>
diff --git a/Source/FikaAmazonAPI/Services/ShippingServiceV2.cs b/Source/FikaAmazonAPI/Services/ShippingServiceV2.cs
@@ -17,7 +17,7 @@ public bool CancelShipment(string shipmentId) =>
             Task.Run(() => CancelShipmentAsync(shipmentId)).ConfigureAwait(false).GetAwaiter().GetResult();
         public async Task<bool> CancelShipmentAsync(string shipmentId, CancellationToken cancellationToken = default)
         {
-            await CreateAuthorizedRequestAsync(ShippingApiV2Urls.CancelShipment(shipmentId), RestSharp.Method.Post, cancellationToken: cancellationToken);
+            await CreateAuthorizedRequestAsync(ShippingApiV2Urls.CancelShipment(shipmentId), RestSharp.Method.Put, cancellationToken: cancellationToken);
             var response = await ExecuteRequestAsync<CancelShipmentResponse>(RateLimitType.ShippingV2_CancelShipment, cancellationToken);
             if (response != null)
                 return true;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace FikaAmazonAPI.AmazonSpApiSDK.Models.ShippingV2 {`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// A list of value-added services available for a shipping service offering.`
`12`	`12`	`/// </summary>`
`13`		`- [DataContract]`
	`13`	`+ [CollectionDataContract]`
`14`	`14`	`public class AvailableValueAddedServiceGroupList : List<AvailableValueAddedServiceGroup> {`
`15`	`15`
`16`	`16`	`/// <summary>`
`@@ -32,5 +32,5 @@ public override string ToString() {`
`32`	`32`	`return JsonConvert.SerializeObject(this, Formatting.Indented);`
`33`	`33`	`}`
`34`	`34`
`35`		`-}`
	`35`	`+ }`
`36`	`36`	`}`