Merge branch 'ACP2E-172' of https://github.com/magento-l3/magento2ce into PR-2021-20-08

Author: chittima

app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php

@@ -96,7 +96,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
             throw new GraphQlNoSuchEntityException(__('The cart isn\'t active.'));
         }
 
-        $this->updateCartCurrency($cart, $storeId);
+        $cart = $this->updateCartCurrency($cart, $storeId);
 
         $cartCustomerId = (int)$cart->getCustomerId();
 
@@ -151,10 +151,11 @@ public function getCartForCheckout(string $cartHash, ?int $customerId, int $stor
      *
      * @param Quote $cart
      * @param int $storeId
+     * @return Quote
      * @throws GraphQlInputException
      * @throws NoSuchEntityException
      */
-    private function updateCartCurrency(Quote $cart, int $storeId)
+    private function updateCartCurrency(Quote $cart, int $storeId): Quote
     {
         $cartStore = $this->storeRepository->getById($cart->getStoreId());
         $currentCartCurrencyCode = $cartStore->getCurrentCurrency()->getCode();
@@ -171,8 +172,11 @@ private function updateCartCurrency(Quote $cart, int $storeId)
         } elseif ($cart->getQuoteCurrencyCode() !== $currentCartCurrencyCode) {
             $cart->setQuoteCurrencyCode($cartStore->getCurrentCurrency());
         } else {
-            return;
+            return $cart;
         }
         $this->cartRepository->save($cart);
+        $cart = $this->cartRepository->get($cart->getId());
+
+        return $cart;
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php

@@ -570,6 +570,29 @@ public function testAddConfigurableProductWithImageToCartParentImage(): void
         self::assertEquals($sku, $variant['sku']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testAddMoreProductsFromAnotherStore()
+    {
+        $parentSku = 'configurable';
+        $sku = 'simple_20';
+        $quantity = 400; // the number should be greater than the available qty / 3
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $query = $this->getQuery($maskedQuoteId, $parentSku, $sku, $quantity);
+
+        $headerMap = ['Store' => 'default'];
+        $this->graphQlMutation($query, [], '', $headerMap);
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlMutation($query, [], '', $headerMap);
+        self::assertEquals($maskedQuoteId, $response['addConfigurableProductsToCart']['cart']['id']);
+        $cartItem = current($response['addConfigurableProductsToCart']['cart']['items']);
+        self::assertEquals($parentSku, $cartItem['product']['sku']);
+        self::assertEquals($quantity * 2, $cartItem['quantity']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $parentSku
@@ -594,6 +617,7 @@ private function getQuery(string $maskedQuoteId, string $parentSku, string $sku,
     }
   ) {
     cart {
+      id
       items {
         id
         quantity