From 24e63109fc4877e42baf0f88e09c3025419b1998 Mon Sep 17 00:00:00 2001 From: Simon Solutions Date: Mon, 1 Jul 2024 20:21:48 +0200 Subject: [PATCH 1/3] Update ShippingService.php RequiresAdditionalSellerInputs is not always present in response, so allow nulled value --- src/Seller/MerchantFulfillmentV0/Dto/ShippingService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Seller/MerchantFulfillmentV0/Dto/ShippingService.php b/src/Seller/MerchantFulfillmentV0/Dto/ShippingService.php index 558f35acf..42e88d4c6 100644 --- a/src/Seller/MerchantFulfillmentV0/Dto/ShippingService.php +++ b/src/Seller/MerchantFulfillmentV0/Dto/ShippingService.php @@ -41,7 +41,7 @@ final class ShippingService extends Dto * @param \DateTimeInterface $shipDate Date-time formatted timestamp. * @param CurrencyAmount $rate Currency type and amount. * @param ShippingServiceOptions $shippingServiceOptions Extra services provided by a carrier. - * @param bool $requiresAdditionalSellerInputs When true, additional seller inputs are required. + * @param ?bool $requiresAdditionalSellerInputs When true, additional seller inputs are required. * @param ?\DateTimeInterface $earliestEstimatedDeliveryDate Date-time formatted timestamp. * @param ?\DateTimeInterface $latestEstimatedDeliveryDate Date-time formatted timestamp. * @param ?AvailableShippingServiceOptions $availableShippingServiceOptions The available shipping service options. @@ -57,7 +57,7 @@ public function __construct( public readonly \DateTimeInterface $shipDate, public readonly CurrencyAmount $rate, public readonly ShippingServiceOptions $shippingServiceOptions, - public readonly bool $requiresAdditionalSellerInputs, + public readonly ?bool $requiresAdditionalSellerInputs = null, public readonly ?\DateTimeInterface $earliestEstimatedDeliveryDate = null, public readonly ?\DateTimeInterface $latestEstimatedDeliveryDate = null, public readonly ?AvailableShippingServiceOptions $availableShippingServiceOptions = null, From c99b76ac8a906b68c4717e27920da7aab11061ab Mon Sep 17 00:00:00 2001 From: Simon Solutions Date: Tue, 2 Jul 2024 13:40:28 +0200 Subject: [PATCH 2/3] Update v0.json remove required parameter requiresAdditionalSellerInputs --- resources/models/seller/merchant-fulfillment/v0.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/models/seller/merchant-fulfillment/v0.json b/resources/models/seller/merchant-fulfillment/v0.json index 0ca91ec2d..a08f51233 100644 --- a/resources/models/seller/merchant-fulfillment/v0.json +++ b/resources/models/seller/merchant-fulfillment/v0.json @@ -3080,7 +3080,6 @@ "required": [ "CarrierName", "Rate", - "RequiresAdditionalSellerInputs", "ShipDate", "ShippingServiceId", "ShippingServiceName", @@ -3543,4 +3542,4 @@ } }, "x-original-swagger-version": "2.0" -} \ No newline at end of file +} From c95befe573c15b85c5cf0aef22402701542874d6 Mon Sep 17 00:00:00 2001 From: Simon Solutions Date: Tue, 2 Jul 2024 13:46:22 +0200 Subject: [PATCH 3/3] Update modifications.json Add removal of requirement "RequiresAdditionalSellerInputs" to modifications json --- resources/metadata/modifications.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/resources/metadata/modifications.json b/resources/metadata/modifications.json index 10d03595c..c3fb32279 100644 --- a/resources/metadata/modifications.json +++ b/resources/metadata/modifications.json @@ -46,6 +46,24 @@ } ] }, + "merchant-fulfillment": { + "0": [ + { + "comment": "Remove required 'RequiresAdditionalSellerInputs', its not always present in response", + "action": "replace", + "path": "components.schemas.ShippingService.required", + "value": [ + "CarrierName", + "Rate", + "ShipDate", + "ShippingServiceId", + "ShippingServiceName", + "ShippingServiceOfferId", + "ShippingServiceOptions" + ] + } + ] + }, "orders": { "0": [ {