From 1c0ce945c224f5a81972c32f8ac758109eddb293 Mon Sep 17 00:00:00 2001
From: Brandon Moffett <bmoffett@easykeys.com>
Date: Mon, 19 May 2025 17:40:40 -0700
Subject: [PATCH] Update versioning and enhance payment handling logic

- Bumped version in GitVersion.yml to 6.3.3 and enabled commit message incrementing for continuous delivery.
- Added `CustomsPaymentType` property to `ShipmentDetails` class with appropriate documentation.
- Modified payment handling in `FedExShipmentProvider` to use `CustomsPaymentType` in the switch statement, simplifying the logic for the "RECIPIENT" case.
---
 GitVersion.yml                                    |  2 +-
 .../Models/ShipmentDetails.cs                     |  6 ++++++
 .../RestApi/Impl/FedExShipmentProvider.cs         | 15 +++------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index 6979f05..4387120 100644
--- a/GitVersion.yml
+++ b/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)'
diff --git a/src/EasyKeys.Shipping.FedEx.Shipment/Models/ShipmentDetails.cs b/src/EasyKeys.Shipping.FedEx.Shipment/Models/ShipmentDetails.cs
index 926924b..5992532 100644
--- a/src/EasyKeys.Shipping.FedEx.Shipment/Models/ShipmentDetails.cs
+++ b/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>
diff --git a/src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs b/src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs
index 11dc22e..ac5ce9d 100644
--- a/src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs
+++ b/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;
                 }