Merge pull request #1675 from spryker-shop/feature/cc-34502/dev-order…

…-amendment-finalisation

Auto-merge based on green CI result.

composer.json

@@ -160,7 +160,7 @@
         "spryker-shop/resource-share-page": "^1.2.0",
         "spryker-shop/resource-share-page-extension": "^1.0.0",
         "spryker-shop/sales-configurable-bundle-widget": "^1.4.1",
-        "spryker-shop/sales-order-amendment-widget": "^0.2.0",
+        "spryker-shop/sales-order-amendment-widget": "^0.3.0",
         "spryker-shop/sales-order-threshold-widget": "^1.1.4",
         "spryker-shop/sales-product-bundle-widget": "^1.0.0",
         "spryker-shop/sales-product-configuration-widget": "^1.0.0",
@@ -745,7 +745,7 @@
         "spryker/oms-multi-thread": "^1.0.0",
         "spryker/oms-product-offer-reservation": "^1.0.0",
         "spryker/oms-rest-api": "^0.1.0",
-        "spryker/order-amendments-rest-api": "^0.2.0",
+        "spryker/order-amendments-rest-api": "^0.3.0",
         "spryker/order-custom-reference": "^1.0.0",
         "spryker/order-custom-reference-gui": "^1.0.0",
         "spryker/order-matrix": "^1.0.0",
@@ -1061,9 +1061,9 @@
         "spryker/sales-merchant-portal-gui": "^3.0.0",
         "spryker/sales-merchant-portal-gui-extension": "^1.0.0",
         "spryker/sales-oms": "^0.1.0",
-        "spryker/sales-order-amendment": "^0.2.0",
+        "spryker/sales-order-amendment": "^0.3.0",
         "spryker/sales-order-amendment-extension": "^1.0.0",
-        "spryker/sales-order-amendment-oms": "^0.2.0",
+        "spryker/sales-order-amendment-oms": "^0.3.0",
         "spryker/sales-order-threshold": "^1.0.0",
         "spryker/sales-order-threshold-data-import": "^0.1.0",
         "spryker/sales-order-threshold-extension": "^1.0.0",

config/Zed/oms/DummyPayment01.xml

@@ -21,10 +21,16 @@
             <state name="new" display="oms.state.new">
                 <flag>cancellable</flag>
             </state>
-            <state name="payment pending" reserved="true" display="oms.state.payment-pending">
+            <state name="grace period started" reserved="true" display="oms.state.new">
                 <flag>cancellable</flag>
                 <flag>amendable</flag>
             </state>
+            <state name="grace period finished" reserved="true" display="oms.state.new">
+                <flag>cancellable</flag>
+            </state>
+            <state name="payment pending" reserved="true" display="oms.state.payment-pending">
+                <flag>cancellable</flag>
+            </state>
             <state name="invalid" display="oms.state.invalid">
                 <flag>exclude from customer</flag>
             </state>
@@ -46,6 +52,18 @@
         <transitions>
             <transition happy="true">
                 <source>new</source>
+                <target>grace period started</target>
+                <event>start grace period</event>
+            </transition>
+
+            <transition happy="true">
+                <source>grace period started</source>
+                <target>grace period finished</target>
+                <event>skip grace period</event>
+            </transition>
+
+            <transition happy="true">
+                <source>grace period finished</source>
                 <target>warehouse allocated</target>
                 <event>allocate warehouse</event>
             </transition>
@@ -162,6 +180,8 @@
 
         <events>
             <event name="authorize" timeout="1 second"/>
+            <event name="start grace period" onEnter="true"/>
+            <event name="skip grace period" manual="true" timeout="2 hour"/>
             <event name="pay" manual="true" timeout="1 hour" timeoutProcessor="OmsTimeout/Initiation" command="DummyPayment/Pay"/>
             <event name="submit tax invoice" onEnter="true" command="TaxApp/SubmitPaymentTaxInvoice"/>
             <event name="request product review" onEnter="true" command="Order/RequestProductReviews"/>

config/Zed/oms/DummySubprocess/DummyOrderAmendment01.xml

@@ -7,12 +7,14 @@
 
     <process name="DummyOrderAmendment">
         <states>
-            <state name="order amendment" display="oms.state.order-amendment"/>
+            <state name="order amendment" display="oms.state.order-amendment">
+                <flag>amendment in progress</flag>
+            </state>
         </states>
 
         <transitions>
             <transition>
-                <source>payment pending</source>
+                <source>grace period started</source>
                 <target>order amendment</target>
                 <event>start-order-amendment</event>
             </transition>
@@ -25,12 +27,19 @@
 
             <transition>
                 <source>order amendment</source>
-                <target>payment pending</target>
+                <target>grace period started</target>
                 <event>cancel-order-amendment</event>
             </transition>
+
+            <transition>
+                <source>order amendment</source>
+                <target>grace period finished</target>
+                <event>skip-order-amendment</event>
+            </transition>
         </transitions>
 
         <events>
+            <event name="skip-order-amendment"/>
             <event name="start-order-amendment"/>
             <event name="finish-order-amendment"/>
             <event name="cancel-order-amendment"/>

data/import/common/common/glossary.csv

@@ -4465,6 +4465,8 @@ sales_order_amendment_oms.validation.order_not_amendable,The order cannot be ame
 sales_order_amendment_oms.validation.order_not_amendable,Die Bestellung kann nicht geändert werden.,de_DE
 sales_order_amendment_oms.validation.order_does_not_exist,Order with reference %order_reference% could not be found.,en_US
 sales_order_amendment_oms.validation.order_does_not_exist,Bestellnummer %order_reference% konnte nicht gefunden werden.,de_DE
+sales_order_amendment_oms.validation.order_not_being_amended,This order cannot be edited because the time limit for changes has expired.,en_US
+sales_order_amendment_oms.validation.order_not_being_amended,"Eine Bearbeitung dieser Bestellung ist nicht möglich, da die Änderungsfrist abgelaufen ist.",de_DE
 sales_order_amendment.validation.sales_order_amendment_does_not_exist,Can not update the sales order amendment with ID %uuid%. Please check the ID.,en_US
 sales_order_amendment.validation.sales_order_amendment_does_not_exist,Die Änderung der Bestellung mit der ID %uuid% kann nicht aktualisiert werden. Bitte überprüfen Sie die ID.,de_DE
 sales_order_amendment.validation.cart_reorder.order_reference_not_match,"Another order is currently being amended. Complete or cancel the previous amendment before making changes to this order.",en_US

src/Orm/Zed/SalesOrderAmendment/Persistence/SpySalesOrderAmendmentQuote.php

@@ -0,0 +1,25 @@
+<?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.
+ */
+
+declare(strict_types = 1);
+
+namespace Orm\Zed\SalesOrderAmendment\Persistence;
+
+use Spryker\Zed\SalesOrderAmendment\Persistence\Propel\AbstractSpySalesOrderAmendmentQuote as BaseSpySalesOrderAmendmentQuote;
+
+/**
+ * Skeleton subclass for representing a row from the 'spy_sales_order_amendment_quote' 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 SpySalesOrderAmendmentQuote extends BaseSpySalesOrderAmendmentQuote
+{
+}

src/Orm/Zed/SalesOrderAmendment/Persistence/SpySalesOrderAmendmentQuoteQuery.php

@@ -0,0 +1,25 @@
+<?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.
+ */
+
+declare(strict_types = 1);
+
+namespace Orm\Zed\SalesOrderAmendment\Persistence;
+
+use Spryker\Zed\SalesOrderAmendment\Persistence\Propel\AbstractSpySalesOrderAmendmentQuoteQuery as BaseSpySalesOrderAmendmentQuoteQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'spy_sales_order_amendment_quote' 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 SpySalesOrderAmendmentQuoteQuery extends BaseSpySalesOrderAmendmentQuoteQuery
+{
+}

src/Pyz/Glue/GlueApplication/GlueApplicationDependencyProvider.php

@@ -160,6 +160,7 @@
 use Spryker\Glue\NavigationsCategoryNodesResourceRelationship\Plugin\GlueApplication\CategoryNodeByResourceIdResourceRelationshipPlugin;
 use Spryker\Glue\NavigationsRestApi\NavigationsRestApiConfig;
 use Spryker\Glue\NavigationsRestApi\Plugin\ResourceRoute\NavigationsResourceRoutePlugin;
+use Spryker\Glue\OrderAmendmentsRestApi\Plugin\GlueApplication\OrderAmendmentsByOrderResourceRelationshipPlugin;
 use Spryker\Glue\OrderPaymentsRestApi\Plugin\OrderPaymentsResourceRoutePlugin;
 use Spryker\Glue\OrdersRestApi\OrdersRestApiConfig;
 use Spryker\Glue\OrdersRestApi\Plugin\CustomerOrdersResourceRoutePlugin;
@@ -980,6 +981,11 @@ protected function getResourceRelationshipPlugins(
             new ShipmentTypesByShipmentMethodsResourceRelationshipPlugin(),
         );
 
+        $resourceRelationshipCollection->addRelationship(
+            OrdersRestApiConfig::RESOURCE_ORDERS,
+            new OrderAmendmentsByOrderResourceRelationshipPlugin(),
+        );
+
         return $resourceRelationshipCollection;
     }
 

src/Pyz/Zed/CartReorder/CartReorderDependencyProvider.php

@@ -39,12 +39,27 @@
 use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\CartReorder\AmendmentOrderReferenceCartPreReorderPlugin;
 use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\CartReorder\AmendmentQuoteNameCartPreReorderPlugin;
 use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\CartReorder\OrderAmendmentCartReorderValidatorPlugin;
+use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\CartReorder\OrderAmendmentQuoteProcessFlowExpanderCartPreReorderPlugin;
 use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\CartReorder\IsAmendableOrderCartReorderValidatorRulePlugin;
 use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\CartReorder\StartOrderAmendmentCartReorderPostCreatePlugin;
 use Spryker\Zed\SalesProductConfiguration\Communication\Plugin\CartReorder\ProductConfigurationCartReorderItemHydratorPlugin;
 
 class CartReorderDependencyProvider extends SprykerCartReorderDependencyProvider
 {
+    /**
+     * @uses \Spryker\Zed\CartReorder\CartReorderConfig::DEFAULT_QUOTE_PROCESS_FLOW_NAME
+     *
+     * @var string
+     */
+    protected const DEFAULT_QUOTE_PROCESS_FLOW_NAME = 'default';
+
+    /**
+     * @uses \Spryker\Zed\SalesOrderAmendment\SalesOrderAmendmentConfig::ORDER_AMENDMENT_QUOTE_PROCESS_FLOW_NAME
+     *
+     * @var string
+     */
+    protected const ORDER_AMENDMENT_QUOTE_PROCESS_FLOW_NAME = 'order-amendment';
+
     /**
      * @return list<\Spryker\Zed\CartReorderExtension\Dependency\Plugin\CartReorderQuoteProviderStrategyPluginInterface>
      */
@@ -56,13 +71,16 @@ protected function getCartReorderQuoteProviderStrategyPlugins(): array
     }
 
     /**
-     * @return list<\Spryker\Zed\CartReorderExtension\Dependency\Plugin\CartReorderValidatorPluginInterface>
+     * @return array<string, list<\Spryker\Zed\CartReorderExtension\Dependency\Plugin\CartReorderValidatorPluginInterface>>
      */
     protected function getCartReorderValidatorPlugins(): array
     {
         return [
-            new OrderAmendmentCartReorderValidatorPlugin(),
-            new IsAmendableOrderCartReorderValidatorRulePlugin(),
+            static::DEFAULT_QUOTE_PROCESS_FLOW_NAME => [],
+            static::ORDER_AMENDMENT_QUOTE_PROCESS_FLOW_NAME => [
+                new OrderAmendmentCartReorderValidatorPlugin(),
+                new IsAmendableOrderCartReorderValidatorRulePlugin(),
+            ],
         ];
     }
 
@@ -76,6 +94,7 @@ protected function getCartPreReorderPlugins(): array
             new CopyOrderPriceModeCartPreReorderPlugin(),
             new ProductListRestrictedItemsCartPreReorderPlugin(),
             new DefaultReorderQuoteNameCartPreReorderPlugin(),
+            new OrderAmendmentQuoteProcessFlowExpanderCartPreReorderPlugin(),
             new AmendmentOrderReferenceCartPreReorderPlugin(),
             new AmendmentQuoteNameCartPreReorderPlugin(),
             new ReplaceBundledItemsCartPreReorderPlugin(),

src/Pyz/Zed/Checkout/CheckoutDependencyProvider.php

@@ -52,6 +52,7 @@
 use Spryker\Zed\Sales\Communication\Plugin\Checkout\OrderTotalsSaverPlugin;
 use Spryker\Zed\Sales\Communication\Plugin\SalesOrderExpanderPlugin;
 use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\Checkout\FinishOrderAmendmentCheckoutPostSavePlugin;
+use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\Checkout\OrderAmendmentCheckoutPreCheckPlugin;
 use Spryker\Zed\SalesOrderThreshold\Communication\Plugin\Checkout\SalesOrderThresholdCheckoutPreConditionPlugin;
 use Spryker\Zed\SalesOrderThreshold\Communication\Plugin\Checkout\SalesOrderThresholdExpenseSavePlugin;
 use Spryker\Zed\SalesPayment\Communication\Plugin\Checkout\SalesPaymentCheckoutDoSaveOrderPlugin;
@@ -99,6 +100,7 @@ protected function getCheckoutPreConditions(Container $container): array // phpc
             new ShipmentTypeCheckoutPreConditionPlugin(),
             new ServicePointCheckoutPreConditionPlugin(),
             new ProductQuantityRestrictionCheckoutPreConditionPlugin(),
+            new OrderAmendmentCheckoutPreCheckPlugin(),
         ];
     }
 

src/Pyz/Zed/Sales/SalesDependencyProvider.php

@@ -63,6 +63,8 @@
 use Spryker\Zed\SalesOms\Communication\Plugin\OrderItemReferenceExpanderPreSavePlugin;
 use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\Sales\CreateSalesOrderAmendmentOrderPostSavePlugin;
 use Spryker\Zed\SalesOrderAmendment\Communication\Plugin\Sales\SalesOrderAmendmentOrderExpanderPlugin;
+use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\Sales\IsAmendableOrderExpanderPlugin;
+use Spryker\Zed\SalesOrderAmendmentOms\Communication\Plugin\Sales\IsAmendableOrderSearchOrderExpanderPlugin;
 use Spryker\Zed\SalesPayment\Communication\Plugin\Sales\SalesPaymentOrderExpanderPlugin;
 use Spryker\Zed\SalesProductConfiguration\Communication\Plugin\Sales\ProductConfigurationOrderItemExpanderPlugin;
 use Spryker\Zed\SalesProductConfiguration\Communication\Plugin\Sales\ProductConfigurationOrderItemsPostSavePlugin;
@@ -118,6 +120,7 @@ protected function getOrderHydrationPlugins(): array
             new CurrencyOrderExpanderPlugin(),
             new MerchantDataOrderHydratePlugin(),
             new SalesOrderAmendmentOrderExpanderPlugin(),
+            new IsAmendableOrderExpanderPlugin(),
         ];
     }
 
@@ -228,6 +231,7 @@ protected function getSearchOrderExpanderPlugins(): array
             new ItemMetadataSearchOrderExpanderPlugin(),
             new OrderAggregatedItemStateSearchOrderExpanderPlugin(),
             new IsCancellableSearchOrderExpanderPlugin(),
+            new IsAmendableOrderSearchOrderExpanderPlugin(),
         ];
     }