ACP2E-4249: Compare Products Count missmatch Issue for different stores

Author: o-iegorov

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

@@ -84,7 +84,7 @@ public function getSectionData()
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
             'listUrl' => $this->urlBuilder->getUrl('catalog/product_compare/index'),
             'items' => $count ? $this->getItems() : [],
-            'websiteId' => $this->storeManager->getWebsite()->getId()
+            'storeId' => $this->storeManager->getStore()->getId()
         ];
     }
 

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

@@ -298,8 +298,8 @@ public function getItemCollection()
 
             /* update compare items count */
             $count = count($this->_itemCollection);
-            $counts[$this->_storeManager->getWebsite()->getId()] = $count;
-            $this->_catalogSession->setCatalogCompareItemsCountPerWebsite($counts);
+            $counts[$this->_storeManager->getStore()->getId()] = $count;
+            $this->_catalogSession->setCatalogCompareItemsCountPerStoreView($counts);
             $this->_catalogSession->setCatalogCompareItemsCount($count); //deprecated
         }
 
@@ -330,8 +330,8 @@ public function calculate($logout = false)
             ->setVisibility($this->_catalogProductVisibility->getVisibleInSiteIds());
 
         $count = $collection->getSize();
-        $counts[$this->_storeManager->getWebsite()->getId()] = $count;
-        $this->_catalogSession->setCatalogCompareItemsCountPerWebsite($counts);
+        $counts[$this->_storeManager->getStore()->getId()] = $count;
+        $this->_catalogSession->setCatalogCompareItemsCountPerStoreView($counts);
         $this->_catalogSession->setCatalogCompareItemsCount($count); //deprecated
 
         return $this;
@@ -344,13 +344,13 @@ public function calculate($logout = false)
      */
     public function getItemCount()
     {
-        $counts = $this->_catalogSession->getCatalogCompareItemsCountPerWebsite() ?: [];
-        if (!isset($counts[$this->_storeManager->getWebsite()->getId()])) {
+        $counts = $this->_catalogSession->getCatalogCompareItemsCountPerStoreView() ?: [];
+        if (!isset($counts[$this->_storeManager->getStore()->getId()])) {
             $this->calculate();
-            $counts = $this->_catalogSession->getCatalogCompareItemsCountPerWebsite() ?: [];
+            $counts = $this->_catalogSession->getCatalogCompareItemsCountPerStoreView() ?: [];
         }
 
-        return $counts[$this->_storeManager->getWebsite()->getId()] ?? 0;
+        return $counts[$this->_storeManager->getStore()->getId()] ?? 0;
     }
 
     /**

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

@@ -38,8 +38,8 @@ define([
                 //Expired section names are reloaded on page load
                 && _.indexOf(customerData.getExpiredSectionNames(), 'compare-products') === -1
                 && window.checkout
-                && window.checkout.websiteId
-                && window.checkout.websiteId !== this.compareProducts().websiteId
+                && window.checkout.storeId
+                && window.checkout.storeId !== this.compareProducts().storeId
             ) {
                 //set count to 0 to prevent "compared products" blocks and count to show with wrong count and items
                 this.compareProducts().count = 0;