MC-37109: Session Cache Local Storage | Checkout Issue

serhii-balko · serhii-balko · commit 7d6fb95f33ed · 2020-09-16T12:13:24.000+03:00
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -108,6 +108,9 @@ public function __construct(
      */
     public function setGuest($checkQuote = false)
     {
+        $this->persistentSession->getSession()->removePersistentCookie();
+        $this->persistentSession->setSession(null);
+
         /** @var $quote Quote */
         $quote = $this->checkoutSession->getQuote();
         if ($quote && $quote->getId()) {
@@ -131,9 +134,6 @@ public function setGuest($checkQuote = false)
             $quote->collectTotals();
             $this->quoteRepository->save($quote);
         }
-
-        $this->persistentSession->getSession()->removePersistentCookie();
-        $this->persistentSession->setSession(null);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ public function __construct(`
`108`	`108`	`*/`
`109`	`109`	`public function setGuest($checkQuote = false)`
`110`	`110`	`{`
	`111`	`+ $this->persistentSession->getSession()->removePersistentCookie();`
	`112`	`+ $this->persistentSession->setSession(null);`
	`113`	`+`
`111`	`114`	`/** @var $quote Quote */`
`112`	`115`	`$quote = $this->checkoutSession->getQuote();`
`113`	`116`	`if ($quote && $quote->getId()) {`
`@@ -131,9 +134,6 @@ public function setGuest($checkQuote = false)`
`131`	`134`	`$quote->collectTotals();`
`132`	`135`	`$this->quoteRepository->save($quote);`
`133`	`136`	`}`
`134`		`-`
`135`		`- $this->persistentSession->getSession()->removePersistentCookie();`
`136`		`- $this->persistentSession->setSession(null);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/**`