CC-26584 nonsplit to split merge

composer.json

@@ -155,6 +155,7 @@
         "spryker-shop/sales-product-configuration-widget-extension": "^1.0.0",
         "spryker-shop/sales-return-page": "^1.0.0",
         "spryker-shop/sales-return-page-extension": "^1.0.0",
+        "spryker-shop/sales-service-point-widget": "^0.1.0",
         "spryker-shop/security-blocker-page": "^1.0.0",
         "spryker-shop/service-point-widget": "^0.2.0",
         "spryker-shop/session-agent-validation": "^1.0.0",
@@ -987,6 +988,8 @@
         "spryker/sales-return-gui-extension": "^1.0.0",
         "spryker/sales-return-search": "^1.0.0",
         "spryker/sales-returns-rest-api": "^1.0.0",
+        "spryker/sales-service-point": "^0.1.0",
+        "spryker/sales-service-point-gui": "^0.1.0",
         "spryker/sales-split": "^5.0.0",
         "spryker/sales-statistics": "^1.0.0",
         "spryker/scheduler": "^1.2.0",

src/Orm/Zed/SalesServicePoint/Persistence/SpySalesOrderItemServicePoint.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the Spryker Suite.
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace Orm\Zed\SalesServicePoint\Persistence;
+
+use Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint as BaseSpySalesOrderItemServicePoint;
+
+/**
+ * Skeleton subclass for representing a row from the 'spy_sales_order_item_service_point' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+class SpySalesOrderItemServicePoint extends BaseSpySalesOrderItemServicePoint
+{
+}

src/Orm/Zed/SalesServicePoint/Persistence/SpySalesOrderItemServicePointQuery.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the Spryker Suite.
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace Orm\Zed\SalesServicePoint\Persistence;
+
+use Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery as BaseSpySalesOrderItemServicePointQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'spy_sales_order_item_service_point' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+class SpySalesOrderItemServicePointQuery extends BaseSpySalesOrderItemServicePointQuery
+{
+}

src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php

@@ -150,6 +150,7 @@
 use SprykerShop\Yves\SalesOrderThresholdWidget\Widget\SalesOrderThresholdWidget;
 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;
@@ -328,6 +329,7 @@ protected function getGlobalWidgets(): array
             MerchantMetaSchemaWidget::class,
             ServicePointSearchWidget::class,
             ShipmentTypeAddressFormWidget::class,
+            SalesServicePointNameForShipmentGroupWidget::class,
             ClickCollectServicePointAddressFormWidget::class,
         ];
     }

src/Pyz/Zed/Sales/SalesDependencyProvider.php

@@ -71,6 +71,8 @@
 use Spryker\Zed\SalesReturn\Communication\Plugin\Sales\RemunerationTotalOrderExpanderPlugin;
 use Spryker\Zed\SalesReturn\Communication\Plugin\Sales\UpdateOrderItemIsReturnableByGlobalReturnableNumberOfDaysPlugin;
 use Spryker\Zed\SalesReturn\Communication\Plugin\Sales\UpdateOrderItemIsReturnableByItemStatePlugin;
+use Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemExpanderPlugin;
+use Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemsPostSavePlugin;
 use Spryker\Zed\Shipment\Communication\Plugin\Sales\ShipmentOrderItemExpanderPlugin;
 use Spryker\Zed\Shipment\Communication\Plugin\ShipmentOrderHydratePlugin;
 use Spryker\Zed\WarehouseAllocation\Communication\Plugin\Sales\WarehouseOrderItemExpanderPlugin;
@@ -206,6 +208,7 @@ protected function getOrderItemExpanderPlugins(): array
             new ProductConfigurationOrderItemExpanderPlugin(),
             new ShipmentOrderItemExpanderPlugin(),
             new WarehouseOrderItemExpanderPlugin(),
+            new ServicePointOrderItemExpanderPlugin(),
         ];
     }
 
@@ -266,6 +269,7 @@ protected function getOrderItemsPostSavePlugins(): array
             new ConfiguredBundlesOrderItemsPostSavePlugin(),
             new ProductConfigurationOrderItemsPostSavePlugin(),
             new ItemMetadataOrderItemsPostSavePlugin(),
+            new ServicePointOrderItemsPostSavePlugin(),
         ];
     }
 }