Issue #2808813: New user account should own previous guest checkout order(s).

.travis.yml

@@ -41,7 +41,7 @@ env:
 
     # The environment to use, supported are: drupal-7, drupal-8
     - DRUPAL_TI_ENVIRONMENT="drupal-8"
-    - DRUPAL_TI_CORE_BRANCH="8.4.x"
+    - DRUPAL_TI_CORE_BRANCH="8.5.x"
 
     # Drupal specific variables.
     - DRUPAL_TI_DB="drupal_travis_db"
@@ -51,8 +51,8 @@ env:
     - DRUPAL_TI_WEBSERVER_PORT="8080"
 
     # Simpletest specific commandline arguments, the DRUPAL_TI_SIMPLETEST_GROUP is appended at the end.
-    - DRUPAL_TI_SIMPLETEST_ARGS="--verbose --color --concurrency 20 --url $DRUPAL_TI_WEBSERVER_URL:$DRUPAL_TI_WEBSERVER_PORT --types Simpletest,PHPUnit-Unit,PHPUnit-Kernel,PHPUnit-Functional"
-    - DRUPAL_TI_SIMPLETEST_JS_ARGS="--verbose --color --concurrency 1 --url $DRUPAL_TI_WEBSERVER_URL:$DRUPAL_TI_WEBSERVER_PORT --types PHPUnit-FunctionalJavascript"
+    - DRUPAL_TI_SIMPLETEST_ARGS="--verbose --color --concurrency 20 --url $DRUPAL_TI_WEBSERVER_URL:$DRUPAL_TI_WEBSERVER_PORT --types Simpletest,PHPUnit-Unit,PHPUnit-Kernel,PHPUnit-Functional --suppress-deprecations"
+    - DRUPAL_TI_SIMPLETEST_JS_ARGS="--verbose --color --concurrency 1 --url $DRUPAL_TI_WEBSERVER_URL:$DRUPAL_TI_WEBSERVER_PORT --types PHPUnit-FunctionalJavascript --suppress-deprecations"
 
     # === Behat specific variables.
     # This is relative to $TRAVIS_BUILD_DIR
@@ -107,8 +107,6 @@ before_install:
   - composer global require "hirak/prestissimo:^0.3"
   - composer global require "lionsad/drupal_ti:dev-master#396d11d200005eb68491d24170da0a98ae7f51b3"
   - composer global require "squizlabs/php_codesniffer:2.*"
-  - composer global require "drupal/coder:8.2.*"
-  - phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer
   - drupal-ti before_install
 
 install:
@@ -118,6 +116,9 @@ install:
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
   - export PATH=$PWD/travis-phantomjs:$PATH
   - phantomjs --version
+  # Installed after Drush to prevent Composer conflicts around symfony/yaml.
+  - composer global require "drupal/coder:8.2.*"
+  - phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer
 
 before_script:
   - drupal-ti --include ".travis-before-script.sh"

README.md

@@ -5,8 +5,6 @@ Drupal Commerce
 Drupal Commerce is the leading flexible eCommerce solution for Drupal,
 powering over 60,000 online stores of all sizes.
 
-Note: 8.x-2.x is in beta. It is already usable for production websites 
-and upgrades between versions are supported. Bugs are still expected. 
 Please report bugs in the [issue queue](https://www.drupal.org/project/issues/commerce?version=8.x).
 
 [Documentation](http://docs.drupalcommerce.org)

commerce.info.yml

@@ -10,4 +10,4 @@ dependencies:
   - datetime
   - inline_entity_form
   - views
-  - system (>=8.4.0)
+  - system (>=8.5.0)

commerce.module

@@ -123,7 +123,6 @@ function _commerce_entity_theme_suggestions($entity_type_id, array $variables) {
   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
 
   $suggestions = [];
-  $suggestions[] = $original;
   $suggestions[] = $original . '__' . $sanitized_view_mode;
   $suggestions[] = $original . '__' . $entity->bundle();
   $suggestions[] = $original . '__' . $entity->bundle() . '__' . $sanitized_view_mode;

composer.json

@@ -5,9 +5,9 @@
     "homepage": "http://drupal.org/project/commerce",
     "license": "GPL-2.0+",
     "require": {
-        "drupal/core": "~8.4",
+        "drupal/core": "~8.5",
         "drupal/address": "~1.0",
-        "drupal/entity": "~1.0",
+        "drupal/entity": "^1.0-beta3",
         "drupal/entity_reference_revisions": "~1.0",
         "drupal/inline_entity_form": "~1.0",
         "drupal/profile": "~1.0",

config/schema/commerce.schema.yml

@@ -13,6 +13,9 @@ commerce_config_entity_bundle:
       orderby: value
       sequence:
         type: string
+    locked:
+      type: boolean
+      label: 'Locked'
 
 commerce_condition:
   type: mapping

modules/cart/commerce_cart.info.yml

@@ -4,11 +4,9 @@ description: 'Implements the shopping cart system and add to cart features.'
 package: Commerce
 core: 8.x
 dependencies:
-  - commerce
+  - commerce:commerce
   - commerce:commerce_order
-  - commerce:commerce_price
   - commerce:commerce_product
-  - views
 config_devel:
   install:
     - core.entity_form_mode.commerce_order_item.add_to_cart

modules/cart/commerce_cart.module

@@ -10,7 +10,6 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\views\Form\ViewsForm;
 
 /**
  * Implements hook_menu_links_discovered_alter().
@@ -215,34 +214,6 @@ function commerce_cart_form_commerce_order_type_form_alter(array &$form, FormSta
   $form['actions']['submit']['#submit'][] = 'commerce_cart_order_type_form_submit';
 }
 
-/**
- * Implements hook_form_alter().
- */
-function commerce_cart_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  if ($form_state->getFormObject() instanceof ViewsForm) {
-    /** @var \Drupal\views\ViewExecutable $view */
-    $view = reset($form_state->getBuildInfo()['args']);
-    if ($view->storage->get('tag') == 'commerce_cart_form' && !empty($view->result)) {
-      $form['actions']['submit']['#submit'] = array_merge($form['#submit'], ['commerce_cart_order_item_views_form_submit']);
-      $form['actions']['submit']['#order_id'] = $view->argument['order_id']->value[0];
-    }
-  }
-}
-
-/**
- * Form submission handler for 'views_form_commerce_cart_form_'.
- */
-function commerce_cart_order_item_views_form_submit($form, FormStateInterface $form_state) {
-  if (!$form_state->has('quantity_updated')) {
-    return;
-  }
-  $order_id = $form_state->getTriggeringElement()['#order_id'];
-  /** @var \Drupal\commerce_order\Entity\OrderInterface $order */
-  $order = \Drupal::entityTypeManager()->getStorage('commerce_order')->load($order_id);
-  $order->save();
-  drupal_set_message(t('Your shopping cart has been updated.'));
-}
-
 /**
  * Form submission handler for 'commerce_order_type_form'.
  */

modules/cart/commerce_cart.routing.yml

@@ -4,4 +4,4 @@ commerce_cart.page:
     _controller: '\Drupal\commerce_cart\Controller\CartController::cartPage'
     _title: 'Shopping cart'
   requirements:
-    _permission: 'access cart'
+    _access: 'TRUE'

modules/cart/commerce_cart.services.yml

@@ -11,7 +11,7 @@ services:
 
   commerce_cart.cart_provider:
     class: Drupal\commerce_cart\CartProvider
-    arguments: ['@entity_type.manager', '@current_user', '@commerce_cart.cart_session']
+    arguments: ['@entity_type.manager', '@commerce_store.current_store', '@current_user', '@commerce_cart.cart_session']
 
   commerce_cart.cart_manager:
     class: Drupal\commerce_cart\CartManager
@@ -23,7 +23,7 @@ services:
 
   commerce_cart.cart_subscriber:
     class: Drupal\commerce_cart\EventSubscriber\CartEventSubscriber
-    arguments: ['@string_translation']
+    arguments: ['@messenger', '@string_translation']
     tags:
       - { name: event_subscriber }
 

modules/cart/src/CartManager.php

@@ -113,6 +113,7 @@ public function addOrderItem(OrderInterface $cart, OrderItemInterface $order_ite
       $saved_order_item = $matching_order_item;
     }
     else {
+      $order_item->set('order_id', $cart->id());
       $order_item->save();
       $cart->addItem($order_item);
       $saved_order_item = $order_item;

modules/cart/src/CartProvider.php

@@ -4,6 +4,7 @@
 
 use Drupal\commerce_cart\Exception\DuplicateCartException;
 use Drupal\commerce_order\Entity\OrderInterface;
+use Drupal\commerce_store\CurrentStoreInterface;
 use Drupal\commerce_store\Entity\StoreInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -20,6 +21,13 @@ class CartProvider implements CartProviderInterface {
    */
   protected $orderStorage;
 
+  /**
+   * The current store.
+   *
+   * @var \Drupal\commerce_store\CurrentStoreInterface
+   */
+  protected $currentStore;
+
   /**
    * The current user.
    *
@@ -57,21 +65,25 @@ class CartProvider implements CartProviderInterface {
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
+   * @param \Drupal\commerce_store\CurrentStoreInterface $current_store
+   *   The current store.
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
    * @param \Drupal\commerce_cart\CartSessionInterface $cart_session
    *   The cart session.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, AccountInterface $current_user, CartSessionInterface $cart_session) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, CurrentStoreInterface $current_store, AccountInterface $current_user, CartSessionInterface $cart_session) {
     $this->orderStorage = $entity_type_manager->getStorage('commerce_order');
+    $this->currentStore = $current_store;
     $this->currentUser = $current_user;
     $this->cartSession = $cart_session;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createCart($order_type, StoreInterface $store, AccountInterface $account = NULL) {
+  public function createCart($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL) {
+    $store = $store ?: $this->currentStore->getStore();
     $account = $account ?: $this->currentUser;
     $uid = $account->id();
     $store_id = $store->id();
@@ -124,7 +136,7 @@ public function finalizeCart(OrderInterface $cart, $save_cart = TRUE) {
   /**
    * {@inheritdoc}
    */
-  public function getCart($order_type, StoreInterface $store, AccountInterface $account = NULL) {
+  public function getCart($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL) {
     $cart = NULL;
     $cart_id = $this->getCartId($order_type, $store, $account);
     if ($cart_id) {
@@ -137,10 +149,11 @@ public function getCart($order_type, StoreInterface $store, AccountInterface $ac
   /**
    * {@inheritdoc}
    */
-  public function getCartId($order_type, StoreInterface $store, AccountInterface $account = NULL) {
+  public function getCartId($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL) {
     $cart_id = NULL;
     $cart_data = $this->loadCartData($account);
     if ($cart_data) {
+      $store = $store ?: $this->currentStore->getStore();
       $search = [
         'type' => $order_type,
         'store_id' => $store->id(),

modules/cart/src/CartProviderInterface.php

@@ -19,7 +19,7 @@ interface CartProviderInterface {
    * @param string $order_type
    *   The order type ID.
    * @param \Drupal\commerce_store\Entity\StoreInterface $store
-   *   The store.
+   *   The store. If empty, the current store is assumed.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user. If empty, the current user is assumed.
    *
@@ -29,7 +29,7 @@ interface CartProviderInterface {
    * @throws \Drupal\commerce_cart\Exception\DuplicateCartException
    *   When a cart with the given criteria already exists.
    */
-  public function createCart($order_type, StoreInterface $store, AccountInterface $account = NULL);
+  public function createCart($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL);
 
   /**
    * Finalizes the given cart order.
@@ -51,29 +51,29 @@ public function finalizeCart(OrderInterface $cart, $save_cart = TRUE);
    * @param string $order_type
    *   The order type ID.
    * @param \Drupal\commerce_store\Entity\StoreInterface $store
-   *   The store.
+   *   The store. If empty, the current store is assumed.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user. If empty, the current user is assumed.
    *
    * @return \Drupal\commerce_order\Entity\OrderInterface|null
    *   The cart order, or NULL if none found.
    */
-  public function getCart($order_type, StoreInterface $store, AccountInterface $account = NULL);
+  public function getCart($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL);
 
   /**
    * Gets the cart order ID for the given store and user.
    *
    * @param string $order_type
    *   The order type ID.
    * @param \Drupal\commerce_store\Entity\StoreInterface $store
-   *   The store.
+   *   The store. If empty, the current store is assumed.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user. If empty, the current user is assumed.
    *
    * @return int|null
    *   The cart order ID, or NULL if none found.
    */
-  public function getCartId($order_type, StoreInterface $store, AccountInterface $account = NULL);
+  public function getCartId($order_type, StoreInterface $store = NULL, AccountInterface $account = NULL);
 
   /**
    * Gets all cart orders for the given user.

modules/cart/src/EventSubscriber/CartEventSubscriber.php

@@ -2,24 +2,35 @@
 
 namespace Drupal\commerce_cart\EventSubscriber;
 
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Drupal\commerce_cart\Event\CartEntityAddEvent;
 use Drupal\commerce_cart\Event\CartEvents;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\Link;
+use Drupal\Core\Url;
 
 class CartEventSubscriber implements EventSubscriberInterface {
 
   use StringTranslationTrait;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a new CartEventSubscriber object.
    *
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation.
    */
-  public function __construct(TranslationInterface $string_translation) {
+  public function __construct(MessengerInterface $messenger, TranslationInterface $string_translation) {
+    $this->messenger = $messenger;
     $this->stringTranslation = $string_translation;
   }
 
@@ -40,10 +51,9 @@ public static function getSubscribedEvents() {
    *   The add to cart event.
    */
   public function displayAddToCartMessage(CartEntityAddEvent $event) {
-    $purchased_entity = $event->getEntity();
-    drupal_set_message($this->t('@entity added to @cart-link.', [
-      '@entity' => $purchased_entity->label(),
-      '@cart-link' => Link::createFromRoute($this->t('your cart', [], ['context' => 'cart link']), 'commerce_cart.page')->toString(),
+    $this->messenger->addMessage($this->t('@entity added to <a href=":url">your cart</a>.', [
+      '@entity' => $event->getEntity()->label(),
+      ':url' => Url::fromRoute('commerce_cart.page')->toString(),
     ]));
   }
 

modules/cart/src/Form/AddToCartForm.php

@@ -205,7 +205,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     if (!$cart) {
       $cart = $this->cartProvider->createCart($order_type_id, $store);
     }
-    $this->cartManager->addOrderItem($cart, $order_item, $form_state->get(['settings', 'combine']));
+    $this->entity = $this->cartManager->addOrderItem($cart, $order_item, $form_state->get(['settings', 'combine']));
     // Other submit handlers might need the cart ID.
     $form_state->set('cart_id', $cart->id());
   }