Update getHasSessionCartNumber() to make sure it checks carts cookie

craftcms · Feb 27, 2024 · 04bbd83 · 04bbd83
1 parent f4f38c0
commit 04bbd83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where `craft\commerce\services\Carts::getHasSessionCartNumber()` wasn’t checking the cart cookie. ([#3353](https://github.com/craftcms/commerce/issues/3353))
+
 ## 4.5.0 - 2024-02-26
 
 - Removed the Lite edition.

diff --git a/src/services/Carts.php b/src/services/Carts.php
@@ -253,7 +253,18 @@ public function getCartName(): string
      */
     public function getHasSessionCartNumber(): bool
     {
-        return $this->_cartNumber !== null && $this->_cartNumber !== false;
+        if ($this->_cartNumber === false) {
+            return false;
+        }
+
+        if ($this->_cartNumber === null) {
+            $request = Craft::$app->getRequest();
+            $requestCookies = $request->getCookies();
+
+            return $requestCookies->getValue($this->cartCookie['name'], false) !== false;
+        }
+
+        return true;
     }
 
     /**