From 486115b7992ee643b869bf91b8c5733336d51fb1 Mon Sep 17 00:00:00 2001 From: Pyvovarov Stanislav <58219818+pyvovarov-s@users.noreply.github.com> Date: Tue, 21 Nov 2023 12:41:19 +0300 Subject: [PATCH 1/2] CC-31758 Display service point name on the checkout summary page (#8412) CC-31758 Yves: Service Point name is not shown for all orders on Summary page --- composer.lock | 20 +++++++++---------- ...ustomerReorderWidgetDependencyProvider.php | 2 ++ .../ShopApplicationDependencyProvider.php | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index eabf688567..523565b311 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.287.0", + "version": "3.287.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "06978bfc63111fccd78b364238bf214b4ade8d18" + "reference": "efe7b6e370cf12af6c2ee9503aa2aba61350ed03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06978bfc63111fccd78b364238bf214b4ade8d18", - "reference": "06978bfc63111fccd78b364238bf214b4ade8d18", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/efe7b6e370cf12af6c2ee9503aa2aba61350ed03", + "reference": "efe7b6e370cf12af6c2ee9503aa2aba61350ed03", "shasum": "" }, "require": { @@ -335,9 +335,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.287.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.287.1" }, - "time": "2023-11-17T20:03:36+00:00" + "time": "2023-11-20T20:12:54+00:00" }, { "name": "brick/math", @@ -7150,7 +7150,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker-shop.git", - "reference": "f26c8971d5c1fc15cf773ecec523b9fb5a3872ae" + "reference": "0632c8db6f0924199cd96120985dc4675e7624f1" }, "require": { "php": ">=8.1" @@ -7345,7 +7345,7 @@ "proprietary" ], "description": "Spryker Shop page and widget modules", - "time": "2023-11-17T11:19:58+00:00" + "time": "2023-11-21T09:36:32+00:00" }, { "name": "spryker/synchronization-behavior", @@ -18186,7 +18186,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "6b8fb282b1fd6a4f84f41151b8a44ccaab975f0d" + "reference": "cd65a16fb2d35142a1fdadb1a404301663645dfd" }, "default-branch": true, "type": "library", @@ -18194,7 +18194,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2023-11-17T13:40:25+00:00" + "time": "2023-11-20T13:12:13+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/src/Pyz/Yves/CustomerReorderWidget/CustomerReorderWidgetDependencyProvider.php b/src/Pyz/Yves/CustomerReorderWidget/CustomerReorderWidgetDependencyProvider.php index d16ddac2ea..716dc713bc 100644 --- a/src/Pyz/Yves/CustomerReorderWidget/CustomerReorderWidgetDependencyProvider.php +++ b/src/Pyz/Yves/CustomerReorderWidget/CustomerReorderWidgetDependencyProvider.php @@ -12,6 +12,7 @@ use SprykerShop\Yves\SalesConfigurableBundleWidget\Plugin\CustomerReorder\ConfiguredBundlePostReorderPlugin; use SprykerShop\Yves\SalesProductConfigurationWidget\Plugin\CustomerReorderWidget\ProductConfigurationReorderItemExpanderPlugin; use SprykerShop\Yves\SalesReturnPage\Plugin\CustomerReorderWidget\RemunerationAmountReorderItemSanitizerPlugin; +use SprykerShop\Yves\SalesServicePointWidget\Plugin\CustomerReorderWidget\ServicePointReorderItemSanitizerPlugin; use SprykerShop\Yves\ShipmentPage\Plugin\CustomerReorderWidget\ShipmentReorderItemSanitizerPlugin; class CustomerReorderWidgetDependencyProvider extends SprykerCustomerReorderWidgetDependencyProvider @@ -44,6 +45,7 @@ protected function getReorderItemSanitizerPlugins(): array return [ new RemunerationAmountReorderItemSanitizerPlugin(), new ShipmentReorderItemSanitizerPlugin(), + new ServicePointReorderItemSanitizerPlugin(), ]; } diff --git a/src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php b/src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php index 4984420062..b798978ba8 100644 --- a/src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php +++ b/src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php @@ -156,6 +156,7 @@ use SprykerShop\Yves\SalesProductBundleWidget\Widget\OrderItemsProductBundleWidget; use SprykerShop\Yves\SalesProductConfigurationWidget\Widget\ProductConfigurationOrderItemDisplayWidget; use SprykerShop\Yves\SalesServicePointWidget\Widget\SalesServicePointNameForShipmentGroupWidget; +use SprykerShop\Yves\ServicePointWidget\Widget\ServicePointNameForShipmentGroupWidget; use SprykerShop\Yves\ServicePointWidget\Widget\ServicePointSearchWidget; use SprykerShop\Yves\SharedCartWidget\Widget\CartDeleteSharingCompanyUsersListWidget; use SprykerShop\Yves\SharedCartWidget\Widget\CartListPermissionGroupWidget; @@ -333,6 +334,7 @@ protected function getGlobalWidgets(): array ServicePointSearchWidget::class, ShipmentTypeAddressFormWidget::class, SalesServicePointNameForShipmentGroupWidget::class, + ServicePointNameForShipmentGroupWidget::class, ClickAndCollectServicePointAddressFormWidget::class, ProductOfferServicePointAvailabilityWidget::class, ProductOfferServicePointAvailabilityDisplayWidget::class, From 522b333f3cf719536899505d7ad7021d73d5ce2f Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Tue, 21 Nov 2023 10:47:12 +0000 Subject: [PATCH 2/2] CC-31758 Merge nonsplit/master. --- composer.lock | 59 +++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index f6daab004b..7f75ca2c42 100644 --- a/composer.lock +++ b/composer.lock @@ -8391,16 +8391,16 @@ }, { "name": "spryker-shop/checkout-page", - "version": "3.29.2", + "version": "3.29.3", "source": { "type": "git", "url": "https://github.com/spryker-shop/checkout-page.git", - "reference": "1e4e57a6f9fa2bb7c92b3f590c43449dc7899524" + "reference": "f07b111a4c58a8d4e60ec2fc57faeb37c3d221ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/checkout-page/zipball/1e4e57a6f9fa2bb7c92b3f590c43449dc7899524", - "reference": "1e4e57a6f9fa2bb7c92b3f590c43449dc7899524", + "url": "https://api.github.com/repos/spryker-shop/checkout-page/zipball/f07b111a4c58a8d4e60ec2fc57faeb37c3d221ff", + "reference": "f07b111a4c58a8d4e60ec2fc57faeb37c3d221ff", "shasum": "" }, "require": { @@ -8455,6 +8455,7 @@ "spryker-shop/order-custom-reference-widget": "Add the module if you want to use order custom reference functionality", "spryker-shop/product-packaging-unit-widget": "If you want to use components from module ProductPackagingUnitWidget or SummaryProductPackagingUnitWidgetPlugin: ^0.5.2", "spryker-shop/quote-request-widget": "If you want to use QuoteRequestActionsWidget: ^2.2.0", + "spryker-shop/service-point-widget": "Add the module if you want to use service point widget", "spryker-shop/shipment-type-widget": "Add the module if you want to use ShipmentTypeAddressFormWidget.", "spryker/router": "Use this module when you want to use the Router.", "spryker/shipment-cart-connector": "If you want to use shipment totals in quote or shipment source prices, min version 2.1.0", @@ -8477,9 +8478,9 @@ ], "description": "CheckoutPage module", "support": { - "source": "https://github.com/spryker-shop/checkout-page/tree/3.29.2" + "source": "https://github.com/spryker-shop/checkout-page/tree/3.29.3" }, - "time": "2023-11-17T11:19:58+00:00" + "time": "2023-11-21T09:36:32+00:00" }, { "name": "spryker-shop/checkout-page-extension", @@ -14747,27 +14748,29 @@ }, { "name": "spryker-shop/sales-service-point-widget", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/sales-service-point-widget.git", - "reference": "e442a1d151f154b750df280c8c96c61725619ee6" + "reference": "1ca1cc9b08fe72e40e1469424aee063a5cb03bf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/sales-service-point-widget/zipball/e442a1d151f154b750df280c8c96c61725619ee6", - "reference": "e442a1d151f154b750df280c8c96c61725619ee6", + "url": "https://api.github.com/repos/spryker-shop/sales-service-point-widget/zipball/1ca1cc9b08fe72e40e1469424aee063a5cb03bf5", + "reference": "1ca1cc9b08fe72e40e1469424aee063a5cb03bf5", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", + "spryker-shop/customer-reorder-widget-extension": "^1.2.0", "spryker-shop/shop-ui": "^1.72.0", "spryker/kernel": "^3.52.0", "spryker/sales-service-point": "^1.0.0", "spryker/transfer": "^3.27.0" }, "require-dev": { - "spryker/code-sniffer": "*" + "spryker/code-sniffer": "*", + "spryker/testify": "*" }, "suggest": { "spryker/router": "Use this module if you need use the RouterProviderPlugin.", @@ -14790,9 +14793,9 @@ ], "description": "SalesServicePointWidget module", "support": { - "source": "https://github.com/spryker-shop/sales-service-point-widget/tree/1.0.0" + "source": "https://github.com/spryker-shop/sales-service-point-widget/tree/1.1.0" }, - "time": "2023-11-01T17:06:49+00:00" + "time": "2023-11-21T09:36:32+00:00" }, { "name": "spryker-shop/security-blocker-page", @@ -14900,16 +14903,16 @@ }, { "name": "spryker-shop/service-point-widget", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/service-point-widget.git", - "reference": "08635a79d1c1f9e18a5c8de6595f44558f4ea2cc" + "reference": "24d3d338eb18f244d0fc79e0bd15414efbea9901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/service-point-widget/zipball/08635a79d1c1f9e18a5c8de6595f44558f4ea2cc", - "reference": "08635a79d1c1f9e18a5c8de6595f44558f4ea2cc", + "url": "https://api.github.com/repos/spryker-shop/service-point-widget/zipball/24d3d338eb18f244d0fc79e0bd15414efbea9901", + "reference": "24d3d338eb18f244d0fc79e0bd15414efbea9901", "shasum": "" }, "require": { @@ -14950,9 +14953,9 @@ ], "description": "ServicePointWidget module", "support": { - "source": "https://github.com/spryker-shop/service-point-widget/tree/1.1.0" + "source": "https://github.com/spryker-shop/service-point-widget/tree/1.2.0" }, - "time": "2023-11-02T20:09:30+00:00" + "time": "2023-11-21T09:36:32+00:00" }, { "name": "spryker-shop/session-agent-validation", @@ -76093,12 +76096,12 @@ "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "a846e0e43279d2f9ed577d07e4dbe6d216ca23a3" + "reference": "9e181bd11f081f3697cbe2af1f680299b31a613a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/a846e0e43279d2f9ed577d07e4dbe6d216ca23a3", - "reference": "a846e0e43279d2f9ed577d07e4dbe6d216ca23a3", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/9e181bd11f081f3697cbe2af1f680299b31a613a", + "reference": "9e181bd11f081f3697cbe2af1f680299b31a613a", "shasum": "" }, "require-dev": { @@ -76134,7 +76137,7 @@ "support": { "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master" }, - "time": "2023-11-17T15:52:59+00:00" + "time": "2023-11-20T09:59:27+00:00" }, { "name": "masterminds/html5", @@ -78115,12 +78118,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/robotframework-suite-tests.git", - "reference": "7092a24d0dc95871d68d0f7b5f8b3c96504d08cd" + "reference": "cd65a16fb2d35142a1fdadb1a404301663645dfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/7092a24d0dc95871d68d0f7b5f8b3c96504d08cd", - "reference": "7092a24d0dc95871d68d0f7b5f8b3c96504d08cd", + "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/cd65a16fb2d35142a1fdadb1a404301663645dfd", + "reference": "cd65a16fb2d35142a1fdadb1a404301663645dfd", "shasum": "" }, "default-branch": true, @@ -78134,7 +78137,7 @@ "issues": "https://github.com/spryker/robotframework-suite-tests/issues", "source": "https://github.com/spryker/robotframework-suite-tests/tree/master" }, - "time": "2023-11-20T09:44:04+00:00" + "time": "2023-11-20T13:12:13+00:00" }, { "name": "spryker/silex",