ACP2E-778: REST API: Product names in cart always use default store view values

Author: pradeep1819

app/code/Magento/Quote/Model/Quote/Plugin/UpdateQuoteStoreId.php

@@ -39,60 +39,54 @@ public function __construct(
         $this->request = $request;
     }
 
-    /**
-     * Returns store based on web-api request path.
-     *
-     * @param string $requestPath
-     * @return StoreInterface|null
-     */
-    private function getStore(string $requestPath): ?StoreInterface
-    {
-        $pathParts = explode('/', trim($requestPath, '/'));
-        $storeCode = current($pathParts);
-        $stores = $this->storeManager->getStores(false, true);
-
-        return $stores[$storeCode] ?? null;
-    }
-
     /**
      * Update store id in requested quote by store id from request.
      *
-     * @param Quote $quote
+     * @param Quote $subject
+     * @param Quote $result
      * @return Quote
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    private function loadQuote(Quote $quote): Quote
+    public function afterLoadByIdWithoutStore(Quote $subject, Quote $result): Quote
     {
-        $store = $this->getStore($this->request->getPathInfo());
-        if ($store) {
-            $quote->setStoreId($store->getId());
-        }
+        $storeId = $this->storeManager->getStore()
+            ->getId() ?: $this->storeManager->getDefaultStoreView()
+                ->getId();
+        $result->setStoreId($storeId);
 
-        return $quote;
+        return $result;
     }
 
     /**
-     * Update store id in requested quote by store id from guest's request.
+     * Update store id in requested quote by store id from registered customer's request.
      *
      * @param Quote $subject
      * @param Quote $result
      * @return Quote
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterLoadByIdWithoutStore(Quote $subject, Quote $result): Quote
+    public function afterLoadByCustomer(Quote $subject, Quote $result): Quote
     {
-        return $this->loadQuote($result);
+        $store = $this->getStore($this->request->getPathInfo());
+        if ($store) {
+            $result->setStoreId($store->getId());
+        }
+
+        return $result;
     }
 
     /**
-     * Update store id in requested quote by store id from registered customer's request.
+     * Returns store based on web-api request path.
      *
-     * @param Quote $subject
-     * @param Quote $result
-     * @return Quote
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param string $requestPath
+     * @return StoreInterface|null
      */
-    public function afterLoadByCustomer(Quote $subject, Quote $result): Quote
+    private function getStore(string $requestPath): ?StoreInterface
     {
-        return $this->loadQuote($result);
+        $pathParts = explode('/', trim($requestPath, '/'));
+        $storeCode = current($pathParts);
+        $stores = $this->storeManager->getStores(false, true);
+
+        return $stores[$storeCode] ?? null;
     }
 }

app/code/Magento/Quote/etc/webapi_soap/di.xml

@@ -13,9 +13,6 @@
         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
         <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
     </type>
-    <type name="Magento\Quote\Api\GuestCartItemRepositoryInterface">
-        <plugin name="updateCartIdFromRequest" type="Magento\Quote\Plugin\UpdateCartId" />
-    </type>
     <type name="Magento\Quote\Model\Quote">
         <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
     </type>