diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index 5f62a9d7cf1920ebdfc8020befa0f78f00c396bc..e4f4e11983892f98cfc8945ee2a541c428b441dd 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -33,7 +33,7 @@
</requires>
</field>
<field id="braintree_cc_vault_active" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Vault enabled</label>
+ <label>Vault Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree_cc_vault/active</config_path>
<requires>
@@ -155,7 +155,7 @@
<comment>It is recommended to set this value to "PayPal" per store views.</comment>
</field>
<field id="braintree_paypal_vault_active" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Vault enabled</label>
+ <label>Vault Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree_paypal_vault/active</config_path>
<requires>
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/styles.css b/app/code/Magento/Braintree/view/adminhtml/web/styles.css
index 31f48cd0b28df1d8235b9ccc9d6b46b13b410bd4..81378f636eb61362ad2840bc859161c91ee8add1 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Braintree/view/adminhtml/web/styles.css
@@ -3,6 +3,6 @@
* See COPYING.txt for license details.
*/
-.braintree-section .heading {display: inline-block; background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
-.braintree-section .button-container {display: inline-block; float: right;}
+.braintree-section .heading {background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
+.braintree-section .button-container {float: right;}
.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;}
\ No newline at end of file
diff --git a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
index c8a6fef58d31ea24dcb930b5e63c6912f8738eff..7d01c195791e482618ae2073a82564cb14aaf339 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
+++ b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
@@ -154,6 +154,7 @@ define(
*/
clearTimeout: function () {
clearTimeout(this.timeoutId);
+ this.fail();
return this;
},
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index 4abe12cbc3715d5192a6b1a4f0a2ae44685a368d..725ebb2282418e9e6747c3fc28c72ff600f31e07 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -78,18 +78,10 @@ class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
*/
protected function _getHeaderTitleHtml($element)
{
- $html = '<div class="config-heading" ><div class="heading"><strong>' . $element->getLegend();
+ $html = '<div class="config-heading" >';
$groupConfig = $element->getGroup();
- $html .= '</strong>';
-
- if ($element->getComment()) {
- $html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
- }
- $html .= '<div class="config-alt"></div>';
- $html .= '</div>';
-
$disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
$disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
$htmlId = $element->getHtmlId();
@@ -122,6 +114,13 @@ class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
) . '</a>';
}
+ $html .= '</div>';
+ $html .= '<div class="heading"><strong>' . $element->getLegend() . '</strong>';
+
+ if ($element->getComment()) {
+ $html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
+ }
+ $html .= '<div class="config-alt"></div>';
$html .= '</div></div>';
return $html;
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index e02615d24ad3d2fbd4e90a768ce9594531acc602..0af8b18355ec32b045c4e609137cb0eed7944373 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -866,7 +866,9 @@ class Config extends AbstractConfig
*/
public function getExpressCheckoutStartUrl($token)
{
- return $this->getPaypalUrl(['cmd' => '_express-checkout', 'token' => $token]);
+ return sprintf('https://www.%spaypal.com/checkoutnow/2%s',
+ $this->getValue('sandboxFlag') ? 'sandbox.' : '',
+ '?token=' . urlencode($token));
}
/**
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index d377e8ed626e15a65a3772041bb837328a4942f3..db1ecdf6b33799673cd22926f5d9dd1b7999f965 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -672,19 +672,13 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
$additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
- if (
- !is_array($additionalData)
- || !isset($additionalData[ExpressCheckout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT])
- ) {
+ if (!is_array($additionalData)) {
return $this;
}
- $this->getInfoInstance()
- ->setAdditionalInformation(
- ExpressCheckout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT,
- $additionalData[ExpressCheckout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT]
- );
-
+ foreach ($additionalData as $key => $value) {
+ $this->getInfoInstance()->setAdditionalInformation($key, $value);
+ }
return $this;
}
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index f0383dffc9b2443f96bf903b1b423306ff09b4ea..b5803c5ace3925b75e81df43992f714a74ed9905 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -166,6 +166,9 @@ class Transparent extends Payflowpro implements TransparentInterface
$request->setData('trxtype', self::TRXTYPE_AUTH_ONLY);
$request->setData('origid', $token);
$request->setData('amt', $this->formatPrice($amount));
+ $request->setData('currency', $order->getBaseCurrencyCode());
+ $request->setData('taxamt', $this->formatPrice($order->getBaseTaxAmount()));
+ $request->setData('freightamt', $this->formatPrice($order->getBaseShippingAmount()));
$response = $this->postRequest($request, $this->getConfig());
$this->processErrors($response);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
index 33065cc22713bcb654f8304505717288a9f21e0b..9816c37fa01267fa1e1952af91c76bab1fd4cf5c 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
@@ -182,7 +182,9 @@ class ExpressTest extends \PHPUnit_Framework_TestCase
$data = new DataObject(
[
PaymentInterface::KEY_ADDITIONAL_DATA => [
- Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue
+ Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,
+ Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,
+ Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue
]
]
);
@@ -202,11 +204,12 @@ class ExpressTest extends \PHPUnit_Framework_TestCase
$this->parentAssignDataExpectation($data);
- $paymentInfo->expects(static::once())
+ $paymentInfo->expects(static::exactly(3))
->method('setAdditionalInformation')
- ->with(
- Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT,
- $transportValue
+ ->withConsecutive(
+ [Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT, $transportValue],
+ [Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID, $transportValue],
+ [Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN, $transportValue]
);
$this->_model->assignData($data);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index a107918d16513b2fdce133e43aef00c5109798c8..2d757147cec6a89dc1b6b6b28f283fd29b98f640 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
@@ -122,7 +122,7 @@ class TransparentTest extends \PHPUnit_Framework_TestCase
$this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->setMethods([
'getCustomerId', 'getBillingAddress', 'getShippingAddress', 'getCustomerEmail',
- 'getId', 'getIncrementId'
+ 'getId', 'getIncrementId', 'getBaseCurrencyCode'
])
->disableOriginalConstructor()
->getMock();
@@ -164,6 +164,9 @@ class TransparentTest extends \PHPUnit_Framework_TestCase
$this->paymentMock->expects($this->once())
->method('getOrder')
->willReturn($this->orderMock);
+ $this->orderMock->expects($this->once())
+ ->method('getBaseCurrencyCode')
+ ->willReturn('USD');
$this->orderMock->expects($this->once())
->method('getBillingAddress')
->willReturn($this->addressBillingMock);
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index b567ac87c4fe253b7b0e6423fb7e25f575521462..98f340f0a271135b241bcdc9a90f2e195f3d76b5 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -84,7 +84,7 @@
</requires>
</field>
<field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Vault enabled</label>
+ <label>Vault Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/payflowpro_cc_vault/active</config_path>
<attribute type="shared">1</attribute>
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/styles.css b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
index 9e7cfb2afc18e570c18fdc3fe96920606cbe255a..9119a2e317fb75062e74a9e6543732645fab76d5 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
@@ -14,12 +14,11 @@
.payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;}
.payflow-settings-notice .important-label {color:#f00;}
.payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
-.paypal-express-section .heading {display: inline-block; background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
-.paypal-express-section .button-container {display: inline-block; float: right;}
-.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: .5rem 0 0; width: 158px;}
+.paypal-express-section .heading {background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
+.paypal-express-section .button-container {float: right;}
+.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;}
.paypal-express-section .link-more {margin-left: 5px;}
-.paypal-other-section .heading {display: inline-block;}
-.paypal-other-section .button-container {display: inline-block; float: right; margin: 1rem 0 0 !important;}
+.paypal-other-section .button-container {float: right; margin: 1rem 0 0 !important;}
.paypal-other-section > .entry-edit-head > a::before {left: auto !important; right: 1.3rem !important;}
.paypal-all-in-one-section > .entry-edit-head {background: url("images/AM_mc_vs_dc_ae.jpg") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
.paypal-gateways-section > .entry-edit-head {background: url("images/pp-payflow-mark.png") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
diff --git a/app/code/Magento/Vault/Model/Method/Vault.php b/app/code/Magento/Vault/Model/Method/Vault.php
index 0e6689461e14b6d8647693aa2dc942a240bc2cc2..ce85936607192b81fcdd9da59fb48704fc92d48e 100644
--- a/app/code/Magento/Vault/Model/Method/Vault.php
+++ b/app/code/Magento/Vault/Model/Method/Vault.php
@@ -579,7 +579,7 @@ final class Vault implements VaultPaymentInterface
public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
{
return $this->getVaultProvider()->isAvailable($quote)
- && $this->config->getValue(self::$activeKey, $this->getStore() ?: $quote->getStoreId());
+ && $this->config->getValue(self::$activeKey, $this->getStore() ?: ($quote ? $quote->getStoreId() : null));
}
/**
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php b/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
index fc6f3e4d2390b58303ff9261b86787fa50b1535a..e5c83911025246d10c56687604d343b233db382b 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
@@ -274,4 +274,32 @@ class VaultTest extends \PHPUnit_Framework_TestCase
['isAvailableProvider' => true, 'isActiveVault' => true, 'expected' => true],
];
}
+
+ /**
+ * @covers \Magento\Vault\Model\Method\Vault::isAvailable
+ */
+ public function testIsAvailableWithoutQuote()
+ {
+ $quote = null;
+
+ $vaultProvider = $this->getMockForAbstractClass(MethodInterface::class);
+ $config = $this->getMockForAbstractClass(ConfigInterface::class);
+
+ $vaultProvider->expects(static::once())
+ ->method('isAvailable')
+ ->with($quote)
+ ->willReturn(true);
+
+ $config->expects(static::once())
+ ->method('getValue')
+ ->with('active', $quote)
+ ->willReturn(false);
+
+ /** @var Vault $model */
+ $model = $this->objectManager->getObject(Vault::class, [
+ 'config' => $config,
+ 'vaultProvider' => $vaultProvider
+ ]);
+ static::assertFalse($model->isAvailable($quote));
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php
index f46f070216c6e59456281af4ae99762898b3da71..c85c857cbeb5450ae39c29bc6658ef920e984f96 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php
@@ -33,7 +33,7 @@ class Braintree extends Block
private $enablers = [
'Enable this Solution' => "#payment_us_braintree_section_braintree_active",
'Enable PayPal through Braintree' => '#payment_us_braintree_section_braintree_active_braintree_paypal',
- 'Vault enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active'
+ 'Vault Enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active'
];
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
index f05092745c7608ca1a83bdc54fba527d116e95cb..e3b01aa3af9a0dfa4517ad3fe4b527eec9d30ad0 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
@@ -42,7 +42,7 @@ class PayflowPro extends Block
'_payflow_required_enable_paypal_payflow',
'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' .
'_payflow_required_enable_express_checkout_bml_payflow',
- 'Vault enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' .
+ 'Vault Enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' .
'payflow_required_payflowpro_cc_vault_active'
];
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
index 709dc4b54b53f275b222a1cc2981bce88f7fb605..cd146aa8f809cf5de0cbddcb02be83a19e59928f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
@@ -42,7 +42,7 @@ class PaymentsPro extends Block
'_payflow',
'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_' .
'express_checkout_bml_payflow',
- 'Vault enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' .
+ 'Vault Enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' .
'_active'
];
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
index a468fbde2f4d252997f1f84973063b397ea074b5..7e0c9d934161eb36d8b16454d8b263978cd6c21a 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
@@ -130,7 +130,7 @@ class CheckPayflowProConfigStep implements TestStepInterface
$this->payflowProConfigBlock->enablePayflowPro();
$this->assertFieldsAreActive->processAssert(
$this->systemConfigEditSectionPayment,
- [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']]
+ [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
);
$this->assertFieldsAreEnabled->processAssert(
$this->systemConfigEditSectionPayment,
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
index 2555eab030720c475f56aa28181607a0be452fac..4c3318d14f9611a7890e8621e29661cafc1ca620 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
@@ -130,7 +130,7 @@ class CheckPaymentsProConfigStep implements TestStepInterface
$this->paymentsProConfigBlock->enablePaymentsPro();
$this->assertFieldsAreActive->processAssert(
$this->systemConfigEditSectionPayment,
- [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']]
+ [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
);
$this->assertFieldsAreEnabled->processAssert(
$this->systemConfigEditSectionPayment,
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 40bf9602edb12ad06b710839876d7af438b5a831..f9f8f1ffba91a55536c9d2221b68dc85b702e7f0 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -115,7 +115,7 @@
</requires>
</field>
<field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Vault enabled</label>
+ <label>Vault Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/payflowpro_cc_vault/active</config_path>
<attribute type="shared">1</attribute>