Merge remote-tracking branch 'tier4/ACP2E-3025' into T4-PR-07-02-2024

Author: veloraven

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php

@@ -15,6 +15,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\CollectionFactory;
 use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -32,8 +33,6 @@
 class Cart extends Extended
 {
     /**
-     * Core registry
-     *
      * @var Registry
      */
     protected $_coreRegistry = null;
@@ -266,14 +265,16 @@ public function getRowUrl($row)
     /**
      * Get the quote of the cart
      *
-     * @return \Magento\Quote\Model\Quote
+     * @return Quote
+     * @throws LocalizedException
      */
     protected function getQuote()
     {
         if (null === $this->quote) {
             $customerId = $this->getCustomerId();
-            $storeIds = $this->_storeManager->getWebsite($this->getWebsiteId())->getStoreIds();
-
+            $websiteId = $this->getWebsiteId() ?:
+                $this->_storeManager->getDefaultStoreView()->getWebsiteId();
+            $storeIds = $this->getAssociatedStoreIds((int) $websiteId);
             try {
                 $this->quote = $this->quoteRepository->getForCustomer($customerId, $storeIds);
             } catch (NoSuchEntityException $e) {
@@ -332,4 +333,20 @@ private function getWebsiteFilterHtml(): string
     {
         return $this->getChildHtml('website_filter_block');
     }
+
+    /**
+     * Get website associated store IDs
+     *
+     * @param int $websiteId
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getAssociatedStoreIds(int $websiteId): array
+    {
+        $storeIds = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
+        if (empty($this->getWebsiteId()) && !empty($this->_storeManager->getWebsite()->getStoreIds())) {
+            $storeIds = $this->_storeManager->getWebsite()->getStoreIds();
+        }
+        return $storeIds;
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/CollectionTest.php

@@ -86,6 +86,25 @@ public function testCollectionOnDifferentStores(): void
         $this->assertCollection($collectionSecondWebsite, 'Simple Product on second website');
     }
 
+    /**
+     * Test case to check active quote on non default website
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoDataFixture Magento/Checkout/_files/active_quote_not_default_website.php
+     *
+     * @return void
+     */
+    public function testCollectionOnNonDefaultStores(): void
+    {
+        $this->registry->unregister(RegistryConstants::CURRENT_CUSTOMER_ID);
+        $this->registry->register(RegistryConstants::CURRENT_CUSTOMER_ID, 1);
+        $collection = $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this->layout->createBlock(Cart::class), 'getPreparedCollection']
+        );
+        $this->assertCount(0, $collection);
+    }
+
     /**
      * Check is collection match expected value
      *