Merge branch '5.x' of github.com:craftcms/commerce into 5.x

# Conflicts: # CHANGELOG.md
craftcms · May 29, 2024 · 2d4e975 · 2d4e975
2 parents 9c718b2 + 8d7faed
commit 2d4e975
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fixed missing validation for Inventory Location handles. ([#3511](https://github.com/craftcms/commerce/issues/3511))
 - Fixed a bug where an Order’s shipping method name could be cleared when saving a completed order with a shipping method provided by a plugin. ([#3519](https://github.com/craftcms/commerce/issues/3519))
 - Fixed a PHP error that could occur when initializing Craft Commerce.
+- Fixed a SQL error that could occur when switching sites with a cart cookie set. ([#3522](https://github.com/craftcms/commerce/issues/3522))
 - Fixed an error that could occur when attempting to save a variant with special characters. ([#3516](https://github.com/craftcms/commerce/issues/3516))
 
 ## 5.0.7 - 2024-05-22

diff --git a/src/services/Carts.php b/src/services/Carts.php
@@ -78,9 +78,11 @@ public function init()
     {
         parent::init();
 
+        $currentStore = Plugin::getInstance()->getStores()->getCurrentStore();
+
         // Complete the cart cookie config
         if (!isset($this->cartCookie['name'])) {
-            $this->cartCookie['name'] = md5(sprintf('Craft.%s.%s', self::class, Craft::$app->id)) . '_commerce_cart';
+            $this->cartCookie['name'] = md5(sprintf('Craft.%s.%s.%s', self::class, Craft::$app->id, $currentStore->handle)) . '_commerce_cart';
         }
 
         $request = Craft::$app->getRequest();