Merge pull request #77 from easykeys/version/6.3.6

ucrengineer · web-flow · commit 70dc2e27c5be · 2025-05-20T11:27:55.000-07:00
Version/6.3.6
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 6.3.5
+next-version: 6.3.6
 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.DHL.Shipment/DHLExpressShipmentProvider.cs b/src/EasyKeys.Shipping.DHL.Shipment/DHLExpressShipmentProvider.cs
@@ -246,7 +246,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(Shipping.Abstractions.Model
                         ReceiverId = details.Recipient.Email,
                         LanguageCode = "eng",
                         LanguageCountryCode = "UK",
-                        BespokeMessage = details.CustomShipmentMessage ?? "Package has shipped!"
+                        BespokeMessage = details.CustomShipmentMessage ?? "Your Package has shipped!"
                     }
                 },
                 EstimatedDeliveryDate = new EstimatedDeliveryDate
@@ -381,6 +381,6 @@ private string GetFilingType(Shipping.Abstractions.Models.Shipment shipment, Shi
             valueAddedServices.Add(paperless);
         }
 
-        return valueAddedServices.Any() ? valueAddedServices.ToArray() : null;
+        return valueAddedServices.Any() ? valueAddedServices.Distinct().ToArray() : null;
     }
 }
diff --git a/src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs b/src/EasyKeys.Shipping.FedEx.Shipment/RestApi/Impl/FedExShipmentProvider.cs
@@ -198,7 +198,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                             DocType = ShippingDocumentFormatDocType.PDF,
                             StockType = ShippingDocumentFormatStockType.PAPER_LETTER
                         },
-                        
+
                         CustomerImageUsages =
                         [
                             new CustomerImageUsage
@@ -309,7 +309,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                         shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1
                         {
                             PaymentType = Payment_1PaymentType.RECIPIENT,
-                            Payor = new Payor_1
+                            Payor = string.IsNullOrEmpty(shipmentDetails.AccountNumber) ? null : new Payor_1
                             {
                                 ResponsibleParty = new Party_2
                                 {
@@ -326,7 +326,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                         shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1
                         {
                             PaymentType = Payment_1PaymentType.THIRD_PARTY,
-                            Payor = new Payor_1
+                            Payor = string.IsNullOrEmpty(shipmentDetails.AccountNumber) ? null : new Payor_1
                             {
                                 ResponsibleParty = new Party_2
                                 {
@@ -388,6 +388,12 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                         }
                     };
                     break;
+                default:
+                    shipmentRequest.RequestedShipment.ShippingChargesPayment = new Payment
+                    {
+                        PaymentType = PaymentType.SENDER
+                    };
+                    break;
             }
 
             var token = await _authService.GetTokenAsync(cancellationToken);
@@ -408,15 +414,15 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp
                 var netCharge = (decimal?)rateDetail?.TotalNetCharge ?? 0m;
                 var surCharge = (decimal?)rateDetail?.TotalSurcharges ?? 0m;
 
-                foreach (var piece in createdShipment.PieceResponses!)
+                foreach (var piece in createdShipment?.PieceResponses!)
                 {
                     if(createdShipment?.ShipmentDocuments != null)
                     {
                         foreach (var doc in createdShipment.ShipmentDocuments!)
                         {
                             label.ShippingDocuments.Add(new Document
                             {
-                                DocumentName = doc.ContentType.ToString()!,
+                                DocumentName = doc.ContentType.ToString() !,
                                 ImageType = doc.DocType!,
                                 Bytes = [doc.EncodedLabel],
                                 CopiesToPrint = doc.CopiesToPrint.ToString()
diff --git a/src/EasyKeys.Shipping.FedEx.Shipment/WebServices/Impl/FedExShipmentProvider.cs b/src/EasyKeys.Shipping.FedEx.Shipment/WebServices/Impl/FedExShipmentProvider.cs
@@ -635,11 +635,7 @@ private void SetPackageLineItems(
                 PartiesToTransactionAreRelatedSpecified = true,
                 DutiesPayment = new Payment()
                 {
-                    PaymentType = PaymentType.RECIPIENT,
-                    Payor = new Payor()
-                    {
-                        ResponsibleParty = request.RequestedShipment.ShippingChargesPayment.Payor.ResponsibleParty
-                    }
+                    PaymentType = PaymentType.RECIPIENT
                 }
             };
 
diff --git a/test/EasyKeys.Shipping.FuncTest/FedEx/FedExShipmentProviderTests.cs b/test/EasyKeys.Shipping.FuncTest/FedEx/FedExShipmentProviderTests.cs
@@ -31,6 +31,60 @@ public FedExShipmentProviderTests(ITestOutputHelper output)
         _output = output;
     }
 
+    [Fact]
+    public async Task CreateDelete_Labels_ChargeRecipient_For_Domestic_Shipments_Async()
+    {
+        var packages = new List<Package>
+            {
+                // fedex envelope
+               FedExRateConfigurator.GetFedExEnvelop(0.05M, 199m),
+            };
+
+        var configurator = new FedExRateConfigurator(
+               _origin,
+               _domestic,
+               packages.First(),
+               true,
+               DateTime.Now);
+
+        var stype = FedExServiceType.FedExStandardOvernight;
+        var ptype = FedExPackageType.FedExEnvelope;
+
+        var shipmentOptions = new ShipmentOptions(ptype.Name, DateTime.Now);
+
+        var shipment = new Shipment(_origin, _domestic, packages, shipmentOptions);
+
+        var (sender, recipient) = TestShipments.CreateContactInfo();
+
+        var shipmentDetails = new EasyKeys.Shipping.FedEx.Shipment.Models.ShipmentDetails
+        {
+            Sender = sender,
+            Recipient = recipient,
+
+            TransactionId = "1234",
+
+            PaymentType = FedExPaymentType.Recipient,
+            CustomsPaymentType = FedExPaymentType.Recipient,
+            AccountNumber = "",
+
+            RateRequestType = "list",
+
+            LabelOptions = new EasyKeys.Shipping.FedEx.Shipment.Models.LabelOptions()
+            {
+                LabelFormatType = "COMMON2D",
+                ImageType = "PNG",
+            }
+        };
+
+        foreach (var provider in _providers)
+        {
+            var label = await provider.CreateShipmentAsync(stype, shipment, shipmentDetails, CancellationToken.None);
+
+            Assert.NotNull(label);
+            Assert.True(label.InternalErrors.Any());
+        }
+    }
+
     [Fact]
     public async Task CreateDelete_Labels_For_Domestic_Shipments_Async()
     {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(Shipping.Abstractions.Model`
`246`	`246`	`ReceiverId = details.Recipient.Email,`
`247`	`247`	`LanguageCode = "eng",`
`248`	`248`	`LanguageCountryCode = "UK",`
`249`		`- BespokeMessage = details.CustomShipmentMessage ?? "Package has shipped!"`
	`249`	`+ BespokeMessage = details.CustomShipmentMessage ?? "Your Package has shipped!"`
`250`	`250`	`}`
`251`	`251`	`},`
`252`	`252`	`EstimatedDeliveryDate = new EstimatedDeliveryDate`
`@@ -381,6 +381,6 @@ private string GetFilingType(Shipping.Abstractions.Models.Shipment shipment, Shi`
`381`	`381`	`valueAddedServices.Add(paperless);`
`382`	`382`	`}`
`383`	`383`
`384`		`- return valueAddedServices.Any() ? valueAddedServices.ToArray() : null;`
	`384`	`+ return valueAddedServices.Any() ? valueAddedServices.Distinct().ToArray() : null;`
`385`	`385`	`}`
`386`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp`
`198`	`198`	`DocType = ShippingDocumentFormatDocType.PDF,`
`199`	`199`	`StockType = ShippingDocumentFormatStockType.PAPER_LETTER`
`200`	`200`	`},`
`201`		`-`
	`201`	`+`
`202`	`202`	`CustomerImageUsages =`
`203`	`203`	`[`
`204`	`204`	`new CustomerImageUsage`
`@@ -309,7 +309,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp`
`309`	`309`	`shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1`
`310`	`310`	`{`
`311`	`311`	`PaymentType = Payment_1PaymentType.RECIPIENT,`
`312`		`- Payor = new Payor_1`
	`312`	`+ Payor = string.IsNullOrEmpty(shipmentDetails.AccountNumber) ? null : new Payor_1`
`313`	`313`	`{`
`314`	`314`	`ResponsibleParty = new Party_2`
`315`	`315`	`{`
`@@ -326,7 +326,7 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp`
`326`	`326`	`shipmentRequest.RequestedShipment.CustomsClearanceDetail.DutiesPayment = new Payment_1`
`327`	`327`	`{`
`328`	`328`	`PaymentType = Payment_1PaymentType.THIRD_PARTY,`
`329`		`- Payor = new Payor_1`
	`329`	`+ Payor = string.IsNullOrEmpty(shipmentDetails.AccountNumber) ? null : new Payor_1`
`330`	`330`	`{`
`331`	`331`	`ResponsibleParty = new Party_2`
`332`	`332`	`{`
`@@ -388,6 +388,12 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp`
`388`	`388`	`}`
`389`	`389`	`};`
`390`	`390`	`break;`
	`391`	`+ default:`
	`392`	`+ shipmentRequest.RequestedShipment.ShippingChargesPayment = new Payment`
	`393`	`+ {`
	`394`	`+ PaymentType = PaymentType.SENDER`
	`395`	`+ };`
	`396`	`+ break;`
`391`	`397`	`}`
`392`	`398`
`393`	`399`	`var token = await _authService.GetTokenAsync(cancellationToken);`
`@@ -408,15 +414,15 @@ public async Task<ShipmentLabel> CreateShipmentAsync(FedExServiceType serviceTyp`
`408`	`414`	`var netCharge = (decimal?)rateDetail?.TotalNetCharge ?? 0m;`
`409`	`415`	`var surCharge = (decimal?)rateDetail?.TotalSurcharges ?? 0m;`
`410`	`416`
`411`		`- foreach (var piece in createdShipment.PieceResponses!)`
	`417`	`+ foreach (var piece in createdShipment?.PieceResponses!)`
`412`	`418`	`{`
`413`	`419`	`if(createdShipment?.ShipmentDocuments != null)`
`414`	`420`	`{`
`415`	`421`	`foreach (var doc in createdShipment.ShipmentDocuments!)`
`416`	`422`	`{`
`417`	`423`	`label.ShippingDocuments.Add(new Document`
`418`	`424`	`{`
`419`		`- DocumentName = doc.ContentType.ToString()!,`
	`425`	`+ DocumentName = doc.ContentType.ToString() !,`
`420`	`426`	`ImageType = doc.DocType!,`
`421`	`427`	`Bytes = [doc.EncodedLabel],`
`422`	`428`	`CopiesToPrint = doc.CopiesToPrint.ToString()`
Original file line number	Diff line number	Diff line change
`@@ -635,11 +635,7 @@ private void SetPackageLineItems(`
`635`	`635`	`PartiesToTransactionAreRelatedSpecified = true,`
`636`	`636`	`DutiesPayment = new Payment()`
`637`	`637`	`{`
`638`		`- PaymentType = PaymentType.RECIPIENT,`
`639`		`- Payor = new Payor()`
`640`		`- {`
`641`		`- ResponsibleParty = request.RequestedShipment.ShippingChargesPayment.Payor.ResponsibleParty`
`642`		`- }`
	`638`	`+ PaymentType = PaymentType.RECIPIENT`
`643`	`639`	`}`
`644`	`640`	`};`
`645`	`641`