Update versioning and enhance payment handling logic

GitVersion.yml

@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 6.3.2
+next-version: 6.3.3
 increment: Patch
 major-version-bump-message: '\+semver:\s?(breaking|major|release)'
 minor-version-bump-message: '\+semver:\s?(feat|feature|minor)'

src/EasyKeys.Shipping.FedEx.Shipment/Models/ShipmentDetails.cs

@@ -92,6 +92,12 @@ public class ShipmentDetails
     /// </summary>
     public FedExPaymentType PaymentType { get; set; } = FedExPaymentType.Sender;
 
+    /// <summary>
+    /// Default payment type would be recipient unless its a COD.
+    /// Sender,ThirdParty,Recipient,Account,Collect.
+    /// </summary>
+    public FedExPaymentType CustomsPaymentType { get; set; } = FedExPaymentType.Recipient;
+
     /// <summary>
     /// Collect on delivery is defaulted to false.
     /// </summary>

src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs

@@ -296,7 +296,8 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                     }).ToList()
                 };
 
-                switch (shipmentDetails.PaymentType.Name)
+                // customs payment type
+                switch (shipmentDetails.CustomsPaymentType.Name)
                 {
                     case "SENDER":
                         shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1
@@ -307,17 +308,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                     case "RECIPIENT":
                         shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1
                         {
-                            PaymentType = Payment_1PaymentType.RECIPIENT,
-                            Payor = new Payor_1
-                            {
-                                ResponsibleParty = new Party_2
-                                {
-                                    AccountNumber = new PartyAccountNumber
-                                    {
-                                        Value = shipmentDetails.AccountNumber
-                                    }
-                                }
-                            }
+                            PaymentType = Payment_1PaymentType.RECIPIENT
                         };
                         break;
                 }