Issue #2807567 by mglaman: Checkout fails when Editor module enabled (#513)

Author: mglaman

modules/cart/commerce_cart.module

@@ -112,7 +112,7 @@ function commerce_cart_commerce_order_presave(OrderInterface $order) {
     $from_states = $place_transition->getFromStates();
     $to_state = $place_transition->getToState()->getId();
     if (in_array($order->original->state->value, array_keys($from_states)) && $order->state->value == $to_state) {
-      \Drupal::service('commerce_cart.cart_provider')->finalizeCart($order);
+      \Drupal::service('commerce_cart.cart_provider')->finalizeCart($order, FALSE);
     }
   }
 }

modules/cart/src/CartProvider.php

@@ -107,9 +107,11 @@ public function createCart($order_type, StoreInterface $store, AccountInterface
   /**
    * {@inheritdoc}
    */
-  public function finalizeCart(OrderInterface $cart) {
+  public function finalizeCart(OrderInterface $cart, $save_cart = TRUE) {
     $cart->cart = FALSE;
-    $cart->save();
+    if ($save_cart) {
+      $cart->save();
+    }
     // Remove the cart order from the internal cache, if present.
     unset($this->cartData[$cart->getOwnerId()][$cart->id()]);
   }

modules/cart/src/CartProviderInterface.php

@@ -38,8 +38,10 @@ public function createCart($order_type, StoreInterface $store, AccountInterface
    *
    * @param \Drupal\commerce_order\Entity\OrderInterface $cart
    *   The cart order.
+   * @param bool $save_cart
+   *   Whether to immediately save the cart or not.
    */
-  public function finalizeCart(OrderInterface $cart);
+  public function finalizeCart(OrderInterface $cart, $save_cart = TRUE);
 
   /**
    * Gets the cart order for the given store and user.

modules/checkout/tests/src/Functional/CheckoutOrderTest.php

@@ -42,6 +42,8 @@ class CheckoutOrderTest extends CommerceBrowserTestBase {
     'entity', 'views', 'address', 'profile', 'commerce', 'inline_entity_form',
     'commerce_price', 'commerce_store', 'commerce_product', 'commerce_cart',
     'commerce_checkout', 'commerce_order', 'views_ui',
+    // @see https://www.drupal.org/node/2807567
+    'editor',
   ];
 
   /**