ACP2E-1007 Compare list redirect to old store

Author: Chhandak.Barua

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Catalog Product Compare Widget
@@ -37,22 +38,30 @@ class CompareProducts implements SectionSourceInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
      * @param ScopeConfigInterface|null $scopeConfig
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
         \Magento\Catalog\Model\Product\Url $productUrl,
         \Magento\Catalog\Helper\Output $outputHelper,
-        ?ScopeConfigInterface $scopeConfig = null
+        ?ScopeConfigInterface $scopeConfig = null,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->helper = $helper;
         $this->productUrl = $productUrl;
         $this->outputHelper = $outputHelper;
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -66,6 +75,7 @@ public function getSectionData()
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
             'listUrl' => $this->helper->getListUrl(),
             'items' => $count ? $this->getItems() : [],
+            'websiteId' => $this->storeManager->getWebsite()->getId()
         ];
     }
 

app/code/Magento/Catalog/Helper/Product/Compare.php

@@ -297,7 +297,12 @@ public function getItemCollection()
             $this->_itemCollection->addAttributeToSelect('name')->addUrlRewrite()->load();
 
             /* update compare items count */
-            $this->_catalogSession->setCatalogCompareItemsCount(count($this->_itemCollection));
+            $this->_catalogSession->setCatalogCompareWebsiteId($this->_storeManager->getWebsite()->getId());
+            $count = count($this->_itemCollection);
+            $counts = $this->_catalogSession->getCatalogCompareItemsCountPerWebsite() ?: [];
+            $counts[$this->_storeManager->getWebsite()->getId()] = $count;
+            $this->_catalogSession->setCatalogCompareItemsCountPerWebsite($counts);
+            $this->_catalogSession->setCatalogCompareItemsCount($count); //deprecated
         }
 
         return $this->_itemCollection;
@@ -327,7 +332,10 @@ public function calculate($logout = false)
             ->setVisibility($this->_catalogProductVisibility->getVisibleInSiteIds());
 
         $count = $collection->getSize();
-        $this->_catalogSession->setCatalogCompareItemsCount($count);
+        $counts = $this->_catalogSession->getCatalogCompareItemsCountPerWebsite() ?: [];
+        $counts[$this->_storeManager->getWebsite()->getId()] = $count;
+        $this->_catalogSession->setCatalogCompareItemsCountPerWebsite($counts);
+        $this->_catalogSession->setCatalogCompareItemsCount($count); //deprecated
 
         return $this;
     }
@@ -339,11 +347,12 @@ public function calculate($logout = false)
      */
     public function getItemCount()
     {
-        if (!$this->_catalogSession->hasCatalogCompareItemsCount()) {
+        $counts = $this->_catalogSession->getCatalogCompareItemsCountPerWebsite() ?: [];
+        if (!isset($counts[$this->_storeManager->getWebsite()->getId()])) {
             $this->calculate();
         }
 
-        return $this->_catalogSession->getCatalogCompareItemsCount();
+        return $counts[$this->_storeManager->getWebsite()->getId()] ?? 0;
     }
 
     /**

app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js

@@ -31,7 +31,15 @@ define([
         initialize: function () {
             this._super();
             this.compareProducts = customerData.get('compare-products');
-
+            if (window.checkout
+                && window.checkout.websiteId
+                && window.checkout.websiteId !== this.compareProducts().websiteId
+                // TODO this code is only needed if websites share same domain (store code in url)
+            ) {
+                //set count to 0 to prevent "compared products" blocks and count to show with wrong count and items
+                this.compareProducts().count = 0;
+                customerData.reload(['compare-products'], false);
+            }
             initSidebar();
         }
     });