MC-41464: Subtotal not being updated if you are back from multishipping to cart

yelahin-serhiy · yelahin-serhiy · commit 6b50d020dce3 · 2021-03-23T14:32:08.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
@@ -73,7 +73,7 @@ public function beforeDispatch(Cart $subject, RequestInterface $request)
     {
         /** @var Quote $quote */
         $quote = $this->checkoutSession->getQuote();
-        if ($quote->isMultipleShippingAddresses()) {
+        if ($quote->isMultipleShippingAddresses() || $quote->getIsMultiShipping()) {
             $this->disableMultishipping->execute($quote);
             foreach ($quote->getAllShippingAddresses() as $address) {
                 $quote->removeAddress($address->getId());

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