MC-37484: Cart query error when trying to switch store view

cspruiell · cspruiell · commit 9bf0265d61d7 · 2020-10-13T16:20:54.000-05:00
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
@@ -60,7 +60,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         return [
             'price' => [
                 'currency' => $currencyCode,
-                'value' => $cartItem->getCalculationPrice(),
+                'value' => $cartItem->getConvertedPrice(),
             ],
             'row_total' => [
                 'currency' => $currencyCode,
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
@@ -51,7 +51,8 @@ public function __construct(
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartItemRepository = $cartItemRepository;
-        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId ?: ObjectManager::getInstance()->get(MaskedQuoteIdToQuoteId::class);
+        $this->maskedQuoteIdToQuoteId =
+            $maskedQuoteIdToQuoteId ?: ObjectManager::getInstance()->get(MaskedQuoteIdToQuoteId::class);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public function __construct(`
`51`	`51`	`) {`
`52`	`52`	`$this->getCartForUser = $getCartForUser;`
`53`	`53`	`$this->cartItemRepository = $cartItemRepository;`
`54`		`- $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId ?: ObjectManager::getInstance()->get(MaskedQuoteIdToQuoteId::class);`
	`54`	`+ $this->maskedQuoteIdToQuoteId =`
	`55`	`+ $maskedQuoteIdToQuoteId ?: ObjectManager::getInstance()->get(MaskedQuoteIdToQuoteId::class);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`/**`