MC-36425: “Select Shipping Method” page of Multishipping Checkout is corrupted if a Customer use “go back” browser button to return to the page

zakdma · zakdma · commit a857a796df15 · 2020-12-09T22:36:07.000+02:00
diff --git a/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php b/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php
@@ -74,6 +74,7 @@ public function beforeDispatch(Cart $subject, RequestInterface $request)
         /** @var Quote $quote */
         $quote = $this->checkoutSession->getQuote();
         if ($quote->isMultipleShippingAddresses() && $this->isCheckoutComplete()) {
+            $this->disableMultishipping->execute($quote);
             foreach ($quote->getAllShippingAddresses() as $address) {
                 $quote->removeAddress($address->getId());
             }

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public function beforeDispatch(Cart $subject, RequestInterface $request)`
`74`	`74`	`/** @var Quote $quote */`
`75`	`75`	`$quote = $this->checkoutSession->getQuote();`
`76`	`76`	`if ($quote->isMultipleShippingAddresses() && $this->isCheckoutComplete()) {`
	`77`	`+ $this->disableMultishipping->execute($quote);`
`77`	`78`	`foreach ($quote->getAllShippingAddresses() as $address) {`
`78`	`79`	`$quote->removeAddress($address->getId());`
`79`	`80`	`}`