From 7e684525f5b18ef370776ee82c3eb74fc62f3868 Mon Sep 17 00:00:00 2001
From: Luke Holder <lukemh@gmail.com>
Date: Mon, 13 Nov 2023 12:40:11 +0800
Subject: [PATCH] First pass at not setting the cookie unless cart interaction
 occurrs

---
 src/services/Carts.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/services/Carts.php b/src/services/Carts.php
index 6a5f763582..51e00301bc 100644
--- a/src/services/Carts.php
+++ b/src/services/Carts.php
@@ -92,7 +92,10 @@ public function init()
             // If we have a cart cookie, assign it to the cart number.
             // Also check pre Commerce 4.0 for a cart number in the session just in case.
             if ($requestCookies->has($this->cartCookie['name'])) {
-                $this->setSessionCartNumber($requestCookies->getValue($this->cartCookie['name']));
+                $this->_cartNumber = $requestCookies->getValue($this->cartCookie['name']);
+                if($this->_cart && $this->_cart->number != $this->_cartNumber) {
+                    $this->_cart = null;
+                }
             } elseif (($session->getHasSessionId() || $session->getIsActive()) && $session->has('commerce_cart')) {
                 $this->setSessionCartNumber($session->get('commerce_cart'));
                 $session->remove('commerce_cart');