Merge pull request #1405 from spryker-shop/feature/cc-31332/dev-widge…

…t-cleanup

Auto-merge based on green CI result.

composer.json

@@ -40,6 +40,7 @@
         "spryker-shop/checkout-page": "^3.0.0",
         "spryker-shop/checkout-page-extension": "^1.0.0",
         "spryker-shop/checkout-widget": "^1.0.0",
+        "spryker-shop/click-and-collect-page-example": "^0.1.0",
         "spryker-shop/cms-block-widget": "^2.0.0",
         "spryker-shop/cms-content-widget-chart-connector": "^1.0.0",
         "spryker-shop/cms-content-widget-product-connector": "^1.3.0",
@@ -159,7 +160,7 @@
         "spryker-shop/sales-service-point-widget": "^0.1.0",
         "spryker-shop/security-blocker-page": "^1.0.0",
         "spryker-shop/service-point-cart-page": "^0.1.0",
-        "spryker-shop/service-point-widget": "^0.5.0",
+        "spryker-shop/service-point-widget": "^0.6.0",
         "spryker-shop/session-agent-validation": "^1.0.0",
         "spryker-shop/session-agent-validation-extension": "^1.0.0",
         "spryker-shop/session-customer-validation-page": "^1.0.0",
@@ -290,7 +291,7 @@
         "spryker/checkout-extension": "^1.3.0",
         "spryker/checkout-rest-api": "^3.7.1",
         "spryker/checkout-rest-api-extension": "^1.0.0",
-        "spryker/click-and-collect-example": "^0.3.0",
+        "spryker/click-and-collect-example": "^0.4.0",
         "spryker/cms": "^7.0.0",
         "spryker/cms-block": "^3.3.0",
         "spryker/cms-block-category-connector": "^2.5.0",
@@ -867,7 +868,7 @@
         "spryker/product-offer-shipment-type-data-import": "^0.2.0",
         "spryker/product-offer-shipment-type-gui": "^0.1.0",
         "spryker/product-offer-shipment-type-merchant-portal-gui": "^0.1.0",
-        "spryker/product-offer-shipment-type-storage": "^0.2.0",
+        "spryker/product-offer-shipment-type-storage": "^0.3.0",
         "spryker/product-offer-shipment-type-storage-extension": "^1.0.0",
         "spryker/product-offer-shopping-list": "^1.0.0",
         "spryker/product-offer-shopping-list-data-import": "^0.1.0",

src/Pyz/Client/ShipmentTypeStorage/ShipmentTypeStorageDependencyProvider.php

@@ -7,7 +7,7 @@
 
 namespace Pyz\Client\ShipmentTypeStorage;
 
-use Spryker\Client\ProductOfferShipmentTypeStorage\Plugin\ShipmentTypeStorage\ShipmentTypeProductOfferAvailableShipmentTypeFilterPlugin;
+use Spryker\Client\ClickAndCollectExample\Plugin\ShipmentTypeStorage\ShipmentTypeProductOfferAvailableShipmentTypeFilterPlugin;
 use Spryker\Client\ShipmentTypeServicePoint\Plugin\ShipmentTypeStorage\ServiceTypeShipmentTypeStorageExpanderPlugin;
 use Spryker\Client\ShipmentTypeStorage\ShipmentTypeStorageDependencyProvider as SprykerShipmentTypeStorageDependencyProvider;
 

src/Pyz/Yves/CustomerPage/CustomerPageDependencyProvider.php

@@ -9,6 +9,8 @@
 
 use Spryker\Yves\MerchantShipment\Plugin\CustomerPage\MerchantShipmentCheckoutAddressStepPreGroupItemsByShipmentPlugin;
 use SprykerShop\Yves\AgentPage\Plugin\FixAgentTokenAfterCustomerAuthenticationSuccessPlugin;
+use SprykerShop\Yves\ClickAndCollectPageExample\Plugin\CustomerPage\ClickAndCollectServiceTypeCheckoutAddressCollectionFormExpanderPlugin;
+use SprykerShop\Yves\ClickAndCollectPageExample\Plugin\CustomerPage\ClickAndCollectServiceTypeCheckoutMultiShippingAddressesFormExpanderPlugin;
 use SprykerShop\Yves\CompanyPage\Plugin\CustomerPage\BusinessOnBehalfCompanyUserRedirectAfterLoginStrategyPlugin;
 use SprykerShop\Yves\CompanyPage\Plugin\CustomerPage\CompanyBusinessUnitOrderSearchFormExpanderPlugin;
 use SprykerShop\Yves\CompanyPage\Plugin\CustomerPage\CompanyBusinessUnitOrderSearchFormHandlerPlugin;
@@ -17,8 +19,6 @@
 use SprykerShop\Yves\CustomerPage\Plugin\CustomerPage\RedirectUriCustomerRedirectStrategyPlugin;
 use SprykerShop\Yves\CustomerReorderWidget\Plugin\CustomerPage\CustomerReorderWidgetPlugin;
 use SprykerShop\Yves\MerchantSwitcherWidget\Plugin\CustomerPage\MerchantSwitchCartAfterCustomerAuthenticationSuccessPlugin;
-use SprykerShop\Yves\ServicePointWidget\Plugin\CustomerPage\ClickCollectServiceTypeCheckoutAddressCollectionFormExpanderPlugin;
-use SprykerShop\Yves\ServicePointWidget\Plugin\CustomerPage\ClickCollectServiceTypeCheckoutMultiShippingAddressesFormExpanderPlugin;
 use SprykerShop\Yves\ServicePointWidget\Plugin\CustomerPage\ServicePointAddressCheckoutAddressCollectionFormExpanderPlugin;
 use SprykerShop\Yves\ServicePointWidget\Plugin\CustomerPage\ServicePointCheckoutAddressCollectionFormExpanderPlugin;
 use SprykerShop\Yves\ServicePointWidget\Plugin\CustomerPage\ServicePointCheckoutMultiShippingAddressesFormExpanderPlugin;
@@ -132,7 +132,7 @@ protected function getCheckoutAddressCollectionFormExpanderPlugins(): array
             new ShipmentTypeCheckoutAddressCollectionFormExpanderPlugin(),
             new ServicePointCheckoutAddressCollectionFormExpanderPlugin(),
             new ServicePointAddressCheckoutAddressCollectionFormExpanderPlugin(),
-            new ClickCollectServiceTypeCheckoutAddressCollectionFormExpanderPlugin(),
+            new ClickAndCollectServiceTypeCheckoutAddressCollectionFormExpanderPlugin(),
         ];
     }
 
@@ -144,7 +144,7 @@ protected function getCheckoutMultiShippingAddressesFormExpanderPlugins(): array
         return [
             new ShipmentTypeCheckoutMultiShippingAddressesFormExpanderPlugin(),
             new ServicePointCheckoutMultiShippingAddressesFormExpanderPlugin(),
-            new ClickCollectServiceTypeCheckoutMultiShippingAddressesFormExpanderPlugin(),
+            new ClickAndCollectServiceTypeCheckoutMultiShippingAddressesFormExpanderPlugin(),
         ];
     }
 }

src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php

@@ -39,6 +39,8 @@
 use SprykerShop\Yves\CategoryImageStorageWidget\Widget\CategoryImageStorageWidget;
 use SprykerShop\Yves\CheckoutWidget\Widget\CheckoutBreadcrumbWidget;
 use SprykerShop\Yves\CheckoutWidget\Widget\ProceedToCheckoutButtonWidget;
+use SprykerShop\Yves\ClickAndCollectPageExample\Plugin\ShopApplication\ClickAndCollectServicePointAddressFormWidgetCacheKeyGeneratorStrategyPlugin;
+use SprykerShop\Yves\ClickAndCollectPageExample\Widget\ClickAndCollectServicePointAddressFormWidget;
 use SprykerShop\Yves\CommentWidget\Widget\CommentThreadWidget;
 use SprykerShop\Yves\CompanyPage\Plugin\ShopApplication\CheckBusinessOnBehalfCompanyUserHandlerPlugin;
 use SprykerShop\Yves\CompanyPage\Plugin\ShopApplication\CompanyBusinessUnitControllerRestrictionPlugin;
@@ -154,8 +156,6 @@
 use SprykerShop\Yves\SalesProductBundleWidget\Widget\OrderItemsProductBundleWidget;
 use SprykerShop\Yves\SalesProductConfigurationWidget\Widget\ProductConfigurationOrderItemDisplayWidget;
 use SprykerShop\Yves\SalesServicePointWidget\Widget\SalesServicePointNameForShipmentGroupWidget;
-use SprykerShop\Yves\ServicePointWidget\Plugin\ShopApplication\ClickCollectServicePointAddressFormWidgetCacheKeyGeneratorStrategyPlugin;
-use SprykerShop\Yves\ServicePointWidget\Widget\ClickCollectServicePointAddressFormWidget;
 use SprykerShop\Yves\ServicePointWidget\Widget\ServicePointSearchWidget;
 use SprykerShop\Yves\SharedCartWidget\Widget\CartDeleteSharingCompanyUsersListWidget;
 use SprykerShop\Yves\SharedCartWidget\Widget\CartListPermissionGroupWidget;
@@ -333,7 +333,7 @@ protected function getGlobalWidgets(): array
             ServicePointSearchWidget::class,
             ShipmentTypeAddressFormWidget::class,
             SalesServicePointNameForShipmentGroupWidget::class,
-            ClickCollectServicePointAddressFormWidget::class,
+            ClickAndCollectServicePointAddressFormWidget::class,
             ProductOfferServicePointAvailabilityWidget::class,
             ProductOfferServicePointAvailabilityDisplayWidget::class,
             CartSummaryHideTaxAmountWidget::class,
@@ -353,7 +353,7 @@ protected function getWidgetCacheKeyGeneratorStrategyPlugins(): array
             new CartItemNoteFormWidgetCacheKeyGeneratorStrategyPlugin(),
             new MerchantSalesReturnCreateFormWidgetCacheKeyGeneratorStrategyPlugin(),
             new ShipmentTypeAddressFormWidgetCacheKeyGeneratorStrategyPlugin(),
-            new ClickCollectServicePointAddressFormWidgetCacheKeyGeneratorStrategyPlugin(),
+            new ClickAndCollectServicePointAddressFormWidgetCacheKeyGeneratorStrategyPlugin(),
         ];
     }