Merge pull request #1348 from spryker-shop/feature/cc-29675/dev-shipm…

…ent-type-checkout-and-oms

Auto-merge based on green CI result.

composer.json

@@ -985,6 +985,7 @@
         "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-shipment-type": "^0.1.0",
         "spryker/sales-split": "^5.0.0",
         "spryker/sales-statistics": "^1.0.0",
         "spryker/scheduler": "^1.2.0",

data/import/common/common/glossary.csv

@@ -4109,3 +4109,5 @@ service_points_rest_api.error.endpoint_not_found,The endpoint is not found.,en_U
 service_points_rest_api.error.endpoint_not_found,Der Endpunkt wurde nicht gefunden.,de_DE
 service_points_rest_api.error.service_point_identifier_is_not_specified,The service point identifier is not specified.,en_US
 service_points_rest_api.error.service_point_identifier_is_not_specified,Der Servicestellen-Identifikator ist ungültig.,de_DE
+shipment_type_cart.checkout.validation.error,Selected delivery type "%name%" is not available,en_US
+shipment_type_cart.checkout.validation.error,Die ausgewählte Lieferart "%name%" ist nicht verfügbar,de_DE

src/Orm/Zed/SalesShipmentType/Persistence/SpySalesShipmentType.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\SalesShipmentType\Persistence;
+
+use Spryker\Zed\SalesShipmentType\Persistence\Propel\AbstractSpySalesShipmentType as BaseSpySalesShipmentType;
+
+/**
+ * Skeleton subclass for representing a row from the 'spy_sales_shipment_type' 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 SpySalesShipmentType extends BaseSpySalesShipmentType
+{
+}

src/Orm/Zed/SalesShipmentType/Persistence/SpySalesShipmentTypeQuery.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\SalesShipmentType\Persistence;
+
+use Spryker\Zed\SalesShipmentType\Persistence\Propel\AbstractSpySalesShipmentTypeQuery as BaseSpySalesShipmentTypeQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'spy_sales_shipment_type' 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 SpySalesShipmentTypeQuery extends BaseSpySalesShipmentTypeQuery
+{
+}

src/Pyz/Zed/Checkout/CheckoutDependencyProvider.php

@@ -48,8 +48,10 @@
 use Spryker\Zed\SalesOrderThreshold\Communication\Plugin\Checkout\SalesOrderThresholdCheckoutPreConditionPlugin;
 use Spryker\Zed\SalesOrderThreshold\Communication\Plugin\Checkout\SalesOrderThresholdExpenseSavePlugin;
 use Spryker\Zed\SalesPayment\Communication\Plugin\Checkout\SalesPaymentCheckoutDoSaveOrderPlugin;
+use Spryker\Zed\SalesShipmentType\Communication\Plugin\Checkout\ShipmentTypeCheckoutDoSaveOrderPlugin;
 use Spryker\Zed\Shipment\Communication\Plugin\Checkout\SalesOrderShipmentSavePlugin;
 use Spryker\Zed\ShipmentCheckoutConnector\Communication\Plugin\Checkout\ShipmentCheckoutPreCheckPlugin;
+use Spryker\Zed\ShipmentTypeCart\Communication\Plugin\Checkout\ShipmentTypeCheckoutPreConditionPlugin;
 use SprykerEco\Zed\Payone\Communication\Plugin\Checkout\PayoneCheckoutDoSaveOrderPlugin;
 use SprykerEco\Zed\Payone\Communication\Plugin\Checkout\PayoneCheckoutPostSavePlugin;
 use SprykerEco\Zed\Payone\Communication\Plugin\Checkout\PayoneCheckoutPreConditionPlugin;
@@ -89,6 +91,7 @@ protected function getCheckoutPreConditions(Container $container): array
             new MerchantProductOptionCheckoutPreConditionPlugin(),
             new ProductExistsCheckoutPreConditionPlugin(),
             new ProductApprovalCheckoutPreConditionPlugin(),
+            new ShipmentTypeCheckoutPreConditionPlugin(),
         ];
     }
 
@@ -106,21 +109,23 @@ protected function getCheckoutOrderSavers(Container $container): array
              * `OrderSaverPlugin`,
              * `OrderTotalsSaverPlugin`,
              * `SalesOrderShipmentSavePlugin`,
+             * `ShipmentTypeCheckoutDoSaveOrderPlugin`
              * `OrderItemsSaverPlugin`,
              * must be enabled in the strict order.
              */
             new OrderSaverPlugin(),
             new OrderTotalsSaverPlugin(),
             new SalesOrderShipmentSavePlugin(),
+            new ShipmentTypeCheckoutDoSaveOrderPlugin(),
             new OrderItemsSaverPlugin(),
             new CartNoteSaverPlugin(), #CartNoteFeature
             new ProductOptionOrderSaverPlugin(),
             new DiscountOrderSavePlugin(),
             new ProductBundleOrderSaverPlugin(),
             new SalesPaymentCheckoutDoSaveOrderPlugin(),
             new GiftCardCheckoutDoSaveOrderPlugin(),
-            new PayoneCheckoutDoSaveOrderPlugin(),
             new SalesOrderThresholdExpenseSavePlugin(), #SalesOrderThresholdFeature
+            new PayoneCheckoutDoSaveOrderPlugin(),
         ];
     }