Fix url for back button on multishipping new shipping address

magento · Oct 2, 2019 · 7c5e717 · 7c5e717
1 parent 3cbe632
commit 7c5e717
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
@@ -35,7 +35,7 @@ public function execute()
             if ($this->_getCheckout()->getCustomerDefaultShippingAddress()) {
                 $addressForm->setBackUrl($this->_url->getUrl('*/checkout/addresses'));
             } else {
-                $addressForm->setBackUrl($this->_url->getUrl('*/cart/'));
+                $addressForm->setBackUrl($this->_url->getUrl('checkout/cart/'));
             }
         }
         $this->_view->renderLayout();

diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
@@ -170,7 +170,7 @@ public function executeDataProvider()
     {
         return [
             'shipping_address_exists' => ['*/checkout/addresses', 'shipping_address', 'back/address'],
-            'shipping_address_not_exist' => ['*/cart/', null, 'back/cart']
+            'shipping_address_not_exist' => ['checkout/cart/', null, 'back/cart']
         ];
     }