Skip to content

Commit f676ca5

Browse files
committed
MAGETWO-84587: Multishipping for Cybersource: server side extension point
- Fixed composer dependency version - Updated FAT assert - Updated modules dependencies - Added copyrights - Removed unused dependencies
1 parent 1c09381 commit f676ca5

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

app/code/Magento/Multishipping/Block/Checkout/Results.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66
namespace Magento\Multishipping\Block\Checkout;
77

8+
use Magento\Customer\Model\Address\Config as AddressConfig;
89
use Magento\Framework\Exception\LocalizedException;
10+
use Magento\Framework\Session\SessionManagerInterface;
911
use Magento\Framework\View\Element\Template\Context;
1012
use Magento\Multishipping\Model\Checkout\Type\Multishipping;
11-
use Magento\Sales\Api\OrderRepositoryInterface;
12-
use Magento\Customer\Model\Address\Config as AddressConfig;
1313
use Magento\Quote\Model\Quote\Address as QuoteAddress;
14+
use Magento\Sales\Api\OrderRepositoryInterface;
1415
use Magento\Sales\Model\Order\Address as OrderAddress;
15-
use Magento\Framework\Session\SessionManagerInterface;
16+
use Magento\Theme\Block\Html\Title;
1617

1718
/**
1819
* Multi-shipping checkout results information
@@ -177,6 +178,7 @@ public function getAddressError(QuoteAddress $address): string
177178
*/
178179
protected function _prepareLayout(): Success
179180
{
181+
/** @var Title $pageTitle */
180182
$pageTitle = $this->getLayout()->getBlock('page.main.title');
181183
if ($pageTitle) {
182184
$title = $this->getOrderIds() ? $pageTitle->getPartlySuccessTitle() : $pageTitle->getFailedTitle();

app/code/Magento/Multishipping/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6+
"magento/framework": "101.0.*",
67
"magento/module-store": "100.2.*",
78
"magento/module-checkout": "100.2.*",
89
"magento/module-sales": "101.0.*",
910
"magento/module-payment": "100.2.*",
1011
"magento/module-tax": "100.2.*",
1112
"magento/module-customer": "101.0.*",
1213
"magento/module-quote": "101.0.*",
13-
"magento/framework": "101.0.*",
14-
"magento/module-directory": "100.2.*"
15-
},
16-
"suggest": {
14+
"magento/module-directory": "100.2.*",
1715
"magento/module-theme": "100.2.*"
1816
},
1917
"type": "magento2-module",

dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AssertMultishippingOrderSuccessPlacedMessage extends AbstractConstraint
2121
/**
2222
* Expected success message
2323
*/
24-
const SUCCESS_MESSAGE = 'We received your order!';
24+
const SUCCESS_MESSAGE = 'Thank you for your purchase!';
2525

2626
/**
2727
* Assert that success message is correct.

dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
/**
2727
* @magentoAppArea frontend
28+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2829
*/
2930
class MultishippingTest extends \PHPUnit\Framework\TestCase
3031
{

0 commit comments

Comments
 (0)