Merge branch '4.x' into 5.x

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	composer.lock
#	src/elements/Order.php
#	src/services/Carts.php
#	src/templates/products/_variant_matrix.twig

src/behaviors/CustomerAddressBehavior.php

@@ -12,6 +12,7 @@
 use craft\elements\User;
 use craft\events\DefineRulesEvent;
 use yii\base\Behavior;
+use yii\base\InvalidConfigException;
 
 /**
  * Customer address behavior.
@@ -40,6 +41,7 @@ public function events(): array
 
     /**
      * @param DefineRulesEvent $event
+     * @throws InvalidConfigException
      */
     public function defineRules(DefineRulesEvent $event): void
     {

src/services/Carts.php

@@ -342,6 +342,10 @@ public function restorePreviousCartForCurrentUser(): void
         $currentUser = Craft::$app->getUser()->getIdentity();
         $currentStoreId = Plugin::getInstance()->getStores()->getCurrentStore()->id;
 
+        if (!$currentUser) {
+            return;
+        }
+
         // If the current cart is empty see if the logged-in user has a previous cart
         // Get any cart that is not empty, is not trashed or complete, and belongings to the user
         /** @var Order|null $previousCartsWithLineItems */
@@ -370,17 +374,21 @@ public function restorePreviousCartForCurrentUser(): void
             ->storeId($currentStoreId)
             ->one();
 
-        if ($currentUser &&
-            $previousCartsWithLineItems
-        ) {
-            // Restore previous cart that has line items
-            $this->_cart = $previousCartsWithLineItems;
-            $this->setSessionCartNumber($previousCartsWithLineItems->number);
-        } elseif ($currentUser && $currentCartInSession) {
+        /**
+         * Cart restoring preference order:
+         * 1. Give the cart in session to the current customer if they are logging in and there are items in the cart
+         * 2. Restore a previous cart belonging to the customer that has line items
+         * 3. Restore any other previous cart for the customer
+         */
+        if ($currentCartInSession) {
             // Give the cart to the current customer if they are logging in and there are items in the cart
             // Call get cart as this will switch the user and save it if needed
             $this->getCart();
-        } elseif ($currentUser && $anyPreviousCart) {
+        } elseif ($previousCartsWithLineItems) {
+            // Restore previous cart that has line items
+            $this->_cart = $previousCartsWithLineItems;
+            $this->setSessionCartNumber($previousCartsWithLineItems->number);
+        } elseif ($anyPreviousCart) {
             // Finally try to restore any other previous cart for the customer
             $this->_cart = $anyPreviousCart;
             $this->setSessionCartNumber($anyPreviousCart->number);

src/web/assets/variantmatrix/src/VariantMatrix.js

@@ -584,7 +584,7 @@
       // }
 
       this.$container.children('input[name$="[enabled]"]:first').val('');
-      this.$container.addClass('disabled');
+      this.$container.addClass('disabled-entry');
 
       setTimeout(
         $.proxy(function () {
@@ -607,7 +607,7 @@
 
     enable: function () {
       this.$container.children('input[name$="[enabled]"]:first').val('1');
-      this.$container.removeClass('disabled');
+      this.$container.removeClass('disabled-entry');
 
       setTimeout(
         $.proxy(function () {
@@ -645,7 +645,7 @@
       this.$actionMenu
         .find('a[data-action=disable]:first')
         .parent()
-        .removeClass('disabled');
+        .removeClass('disabled-entry');
     },
 
     isDefault: function () {