Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix url for back button on multishipping new shipping address #24827

Merged
merged 5 commits into from
Oct 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
<?php
/**
*
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Multishipping\Controller\Checkout\Address;

class NewShipping extends \Magento\Multishipping\Controller\Checkout\Address
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Multishipping\Controller\Checkout\Address;

/**
* Class NewShipping
*
* @package Address
*/
class NewShipping extends Address implements HttpGetActionInterface
{
/**
* Create New Shipping address Form
Expand Down Expand Up @@ -35,7 +42,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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']
];
}

Expand Down