Merge remote-tracking branch 'origin/MC-35755' into 2.4-develop-pr46

serhii-balko · serhii-balko · commit 4930f120a5a0 · 2020-11-19T11:47:44.000+02:00
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -134,8 +134,8 @@ public function get($cartId, array $sharedStoreIds = [])
     {
         if (!isset($this->quotesById[$cartId])) {
             $quote = $this->loadQuote('loadByIdWithoutStore', 'cartId', $cartId, $sharedStoreIds);
-            $this->getLoadHandler()->load($quote);
             $this->quotesById[$cartId] = $quote;
+            $this->getLoadHandler()->load($quote);
         }
         return $this->quotesById[$cartId];
     }

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ public function get($cartId, array $sharedStoreIds = [])`
`134`	`134`	`{`
`135`	`135`	`if (!isset($this->quotesById[$cartId])) {`
`136`	`136`	`$quote = $this->loadQuote('loadByIdWithoutStore', 'cartId', $cartId, $sharedStoreIds);`
`137`		`- $this->getLoadHandler()->load($quote);`
`138`	`137`	`$this->quotesById[$cartId] = $quote;`
	`138`	`+ $this->getLoadHandler()->load($quote);`
`139`	`139`	`}`
`140`	`140`	`return $this->quotesById[$cartId];`
`141`	`141`	`}`