Merge remote-tracking branch 'origin/ACP2E-4249' into PR_2025_10_21_muntianu

Author: katmoon

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/Test/Unit/CustomerData/CompareProductsTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
+use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -64,9 +65,9 @@ class CompareProductsTest extends TestCase
     private $storeManagerMock;
 
     /**
-     * @var Website|MockObject
+     * @var Store|MockObject
      */
-    private $websiteMock;
+    private $storeMock;
 
     /**
      * @var UrlInterface|MockObject
@@ -106,8 +107,8 @@ protected function setUp(): void
         )->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->websiteMock = $this->getMockBuilder(
-            Website::class
+        $this->storeMock= $this->getMockBuilder(
+            Store::class
         )->onlyMethods(
             ['getId']
         )->disableOriginalConstructor()
@@ -235,8 +236,8 @@ public function testGetSectionData()
             ->method('getUrl')
             ->willReturn('http://list.url');
 
-        $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
-        $this->websiteMock->expects($this->any())->method('getId')->willReturn(1);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())->method('getId')->willReturn(1);
         $this->assertEquals(
             [
                 'count' => $count,
@@ -265,7 +266,7 @@ public function testGetSectionData()
                         'productScope' => null
                     ]
                 ],
-                'websiteId' => 1
+                'storeId' => 1
             ],
             $this->model->getSectionData()
         );
@@ -286,16 +287,16 @@ public function testGetSectionDataNoItems()
             ->method('getUrl')
             ->willReturn('http://list.url');
 
-        $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
-        $this->websiteMock->expects($this->any())->method('getId')->willReturn(1);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())->method('getId')->willReturn(1);
 
         $this->assertEquals(
             [
                 'count' => $count,
                 'countCaption' =>  __('%1 items', $count),
                 'listUrl' => 'http://list.url',
                 'items' => [],
-                'websiteId' => 1
+                'storeId' => 1
             ],
             $this->model->getSectionData()
         );
@@ -309,8 +310,8 @@ public function testGetSectionDataSingleItem()
             ->method('getItemCount')
             ->willReturn($count);
 
-        $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
-        $this->websiteMock->expects($this->any())->method('getId')->willReturn(1);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())->method('getId')->willReturn(1);
 
         $items = $this->prepareProductsWithCorrespondingMocks(
             [
@@ -345,7 +346,7 @@ public function testGetSectionDataSingleItem()
                         'productScope' => null
                     ]
                 ],
-                'websiteId' => 1
+                'storeId' => 1
             ],
             $this->model->getSectionData()
         );

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;

dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\Catalog\Helper\Product;
 
 use Magento\Catalog\Helper\Data;
@@ -142,7 +141,7 @@ public function testCalculate()
             $this->assertTrue($this->_helper->hasItems());
             $compareItems = $this->_helper->getItemCollection();
             $compareItems->clear();
-            $session->unsCatalogCompareItemsCountPerWebsite();
+            $session->unsCatalogCompareItemsCountPerStoreView();
             $this->assertFalse($this->_helper->hasItems());
             $this->assertEquals(0, $session->getCatalogCompareItemsCount());
             $this->storeManager->setCurrentStore(1);