MAGETWO-57062: [Backport] - Issues with minicart in multiwebsite - for 2.1

Author: Stanislav Idolov

app/code/Magento/Checkout/Block/Cart/Sidebar.php

@@ -69,7 +69,8 @@ public function getConfig()
             'removeItemUrl' => $this->getRemoveItemUrl(),
             'imageTemplate' => $this->getImageHtmlTemplate(),
             'baseUrl' => $this->getBaseUrl(),
-            'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount()
+            'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount(),
+            'websiteId' => $this->_storeManager->getStore()->getWebsiteId()
         ];
     }
 

app/code/Magento/Checkout/CustomerData/Cart.php

@@ -96,6 +96,7 @@ public function getSectionData()
             'items' => $this->getRecentItems(),
             'extra_actions' => $this->layout->createBlock('Magento\Catalog\Block\ShortcutButtons')->toHtml(),
             'isGuestCheckoutAllowed' => $this->isGuestCheckoutAllowed(),
+            'website_id' => $this->getQuote()->getStore()->getWebsiteId()
         ];
     }
 

app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php

@@ -124,6 +124,7 @@ public function testGetTotalsHtml()
     public function testGetConfig()
     {
         $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+        $websiteId = 100;
 
         $shoppingCartUrl = 'http://url.com/cart';
         $checkoutUrl = 'http://url.com/checkout';
@@ -139,7 +140,8 @@ public function testGetConfig()
             'removeItemUrl' => $removeItemUrl,
             'imageTemplate' => $imageTemplate,
             'baseUrl' => $baseUrl,
-            'minicartMaxItemsVisible' => 3
+            'minicartMaxItemsVisible' => 3,
+            'websiteId' => $websiteId
         ];
 
         $valueMap = [
@@ -156,8 +158,9 @@ public function testGetConfig()
         $this->urlBuilderMock->expects($this->exactly(4))
             ->method('getUrl')
             ->willReturnMap($valueMap);
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
         $storeMock->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
         $this->imageHelper->expects($this->once())->method('getFrame')->willReturn(false);
 
         $this->scopeConfigMock->expects($this->once())

app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php

@@ -90,6 +90,7 @@ public function testGetSectionData()
         $subtotalValue = 200;
         $productId = 10;
         $storeId = 20;
+        $websiteId = 100;
         $productRewrite = [$productId => ['rewrite' => 'product']];
         $itemData = ['item' => 'data'];
         $shortcutButtonsHtml = '<span>Buttons</span>';
@@ -100,7 +101,7 @@ public function testGetSectionData()
 
         $quoteMock = $this->getMock(
             '\Magento\Quote\Model\Quote',
-            ['getTotals', 'getHasError', 'getAllVisibleItems'],
+            ['getTotals', 'getHasError', 'getAllVisibleItems', 'getStore'],
             [],
             '',
             false
@@ -109,6 +110,10 @@ public function testGetSectionData()
         $quoteMock->expects($this->once())->method('getTotals')->willReturn($totals);
         $quoteMock->expects($this->once())->method('getHasError')->willReturn(false);
 
+        $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+ 	 	$quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
         $this->checkoutCartMock->expects($this->once())->method('getSummaryQty')->willReturn($summaryQty);
         $this->checkoutHelperMock->expects($this->once())
             ->method('formatPrice')
@@ -166,7 +171,8 @@ public function testGetSectionData()
                 ['item' => 'data']
             ],
             'extra_actions' => '<span>Buttons</span>',
-            'isGuestCheckoutAllowed' => 1
+            'isGuestCheckoutAllowed' => 1,
+            'website_id' => $websiteId
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }
@@ -180,6 +186,7 @@ public function testGetSectionDataWithCompositeProduct()
         $subtotalValue = 200;
         $productId = 10;
         $storeId = 20;
+        $websiteId = 100;
 
         $productRewrite = [$productId => ['rewrite' => 'product']];
         $itemData = ['item' => 'data'];
@@ -190,7 +197,7 @@ public function testGetSectionDataWithCompositeProduct()
 
         $quoteMock = $this->getMock(
             '\Magento\Quote\Model\Quote',
-            ['getTotals', 'getHasError', 'getAllVisibleItems'],
+            ['getTotals', 'getHasError', 'getAllVisibleItems', 'getStore'],
             [],
             '',
             false
@@ -216,6 +223,10 @@ public function testGetSectionDataWithCompositeProduct()
 
         $quoteMock->expects($this->once())->method('getAllVisibleItems')->willReturn([$quoteItemMock]);
 
+        $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
         $productMock = $this->getMock(
             '\Magento\Catalog\Model\Product',
             ['isVisibleInSiteVisibility', 'getId', 'setUrlDataObject'],
@@ -271,7 +282,8 @@ public function testGetSectionDataWithCompositeProduct()
                 ['item' => 'data']
             ],
             'extra_actions' => '<span>Buttons</span>',
-            'isGuestCheckoutAllowed' => 1
+            'isGuestCheckoutAllowed' => 1,
+            'website_id' => $websiteId
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -97,6 +97,9 @@ define([
                 addToCartCalls++;
                 self.isLoading(true);
             });
+            if (cartData().website_id !== window.checkout.websiteId) {
+                customerData.reload(['cart'], false);
+            }
 
             return this._super();
         },