⏫ Forwardport of #11165 to 2.3-develop branch

magento-engcom-team · magento-engcom-team · commit b9df95d3e281 · 2018-01-23T10:50:41.000-06:00
Applied pull request patch https://github.com/magento/magento2/pull/11165.patch (created by @bka) based on commit(s): 1. 33dcc36 Fixed GitHub Issues in 2.3-develop branch: - #7582: Payment methods in payments title in wrong language (reported by @Bartlomiejsz)
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -212,7 +212,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
         if ($sharedStoreIds) {
             $quote->setSharedStoreIds($sharedStoreIds);
         }
-        $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);
+        $quote->$loadMethod($identifier)->setStoreId($this->storeManager->getStore()->getId());
         if (!$quote->getId()) {
             throw NoSuchEntityException::singleField($loadField, $identifier);
         }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared`
`212`	`212`	`if ($sharedStoreIds) {`
`213`	`213`	`$quote->setSharedStoreIds($sharedStoreIds);`
`214`	`214`	`}`
`215`		`- $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);`
	`215`	`+ $quote->$loadMethod($identifier)->setStoreId($this->storeManager->getStore()->getId());`
`216`	`216`	`if (!$quote->getId()) {`
`217`	`217`	`throw NoSuchEntityException::singleField($loadField, $identifier);`
`218`	`218`	`}`