Skip to content

Commit e8da763

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-engcom/2.3-develop-prs
2 parents 8cdeb0c + 27985bc commit e8da763

File tree

9 files changed

+152
-15
lines changed

9 files changed

+152
-15
lines changed

‎app/code/Magento/Braintree/Gateway/Request/BillingAddressDataBuilder.php‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Gateway\Request;
7+
8+
use Magento\Payment\Gateway\Request\BuilderInterface;
9+
use Magento\Braintree\Gateway\SubjectReader;
10+
11+
/**
12+
* Class BillingAddressDataBuilder
13+
*/
14+
class BillingAddressDataBuilder implements BuilderInterface
15+
{
16+
/**
17+
* @var SubjectReader
18+
*/
19+
private $subjectReader;
20+
21+
/**
22+
* BillingAddress block name
23+
*/
24+
private const BILLING_ADDRESS = 'billing';
25+
26+
/**
27+
* The customer’s company. 255 character maximum.
28+
*/
29+
private const COMPANY = 'company';
30+
31+
/**
32+
* The first name value must be less than or equal to 255 characters.
33+
*/
34+
private const FIRST_NAME = 'firstName';
35+
36+
/**
37+
* The last name value must be less than or equal to 255 characters.
38+
*/
39+
private const LAST_NAME = 'lastName';
40+
41+
/**
42+
* The street address. Maximum 255 characters, and must contain at least 1 digit.
43+
* Required when AVS rules are configured to require street address.
44+
*/
45+
private const STREET_ADDRESS = 'streetAddress';
46+
47+
/**
48+
* The postal code. Postal code must be a string of 5 or 9 alphanumeric digits,
49+
* optionally separated by a dash or a space. Spaces, hyphens,
50+
* and all other special characters are ignored.
51+
*/
52+
private const POSTAL_CODE = 'postalCode';
53+
54+
/**
55+
* The ISO 3166-1 alpha-2 country code specified in an address.
56+
* The gateway only accepts specific alpha-2 values.
57+
*
58+
* @link https://developers.braintreepayments.com/reference/general/countries/php#list-of-countries
59+
*/
60+
private const COUNTRY_CODE = 'countryCodeAlpha2';
61+
62+
/**
63+
* The extended address information—such as apartment or suite number. 255 character maximum.
64+
*/
65+
private const EXTENDED_ADDRESS = 'extendedAddress';
66+
67+
/**
68+
* The locality/city. 255 character maximum.
69+
*/
70+
private const LOCALITY = 'locality';
71+
72+
/**
73+
* The state or province. For PayPal addresses, the region must be a 2-letter abbreviation;
74+
*/
75+
private const REGION = 'region';
76+
77+
/**
78+
* @param SubjectReader $subjectReader
79+
*/
80+
public function __construct(SubjectReader $subjectReader)
81+
{
82+
$this->subjectReader = $subjectReader;
83+
}
84+
85+
/**
86+
* @inheritdoc
87+
*/
88+
public function build(array $buildSubject)
89+
{
90+
$paymentDO = $this->subjectReader->readPayment($buildSubject);
91+
92+
$result = [];
93+
$order = $paymentDO->getOrder();
94+
95+
$billingAddress = $order->getBillingAddress();
96+
if ($billingAddress) {
97+
$result[self::BILLING_ADDRESS] = [
98+
self::REGION => $billingAddress->getRegionCode(),
99+
self::POSTAL_CODE => $billingAddress->getPostcode(),
100+
self::COUNTRY_CODE => $billingAddress->getCountryId(),
101+
self::FIRST_NAME => $billingAddress->getFirstname(),
102+
self::STREET_ADDRESS => $billingAddress->getStreetLine1(),
103+
self::LAST_NAME => $billingAddress->getLastname(),
104+
self::COMPANY => $billingAddress->getCompany(),
105+
self::EXTENDED_ADDRESS => $billingAddress->getStreetLine2(),
106+
self::LOCALITY => $billingAddress->getCity()
107+
];
108+
}
109+
110+
return $result;
111+
}
112+
}

‎app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ErrorCodeProviderTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ public function getErrorCodeDataProvider(): array
7474
'errors' => [],
7575
'transaction' => [
7676
'status' => 'processor_declined',
77-
'processorResponseCode' => '1000'
77+
'processorResponseCode' => '2059'
7878
],
79-
'expectedResult' => ['1000']
79+
'expectedResult' => ['2059']
8080
],
8181
[
8282
'errors' => [

‎app/code/Magento/Braintree/etc/braintree_error_mapping.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<message code="81723" translate="true">Cardholder name is too long.</message>
2222
<message code="81736" translate="true">CVV verification failed.</message>
2323
<message code="cvv" translate="true">CVV verification failed.</message>
24+
<message code="2059" translate="true">Address Verification Failed.</message>
2425
<message code="81737" translate="true">Postal code verification failed.</message>
2526
<message code="81750" translate="true">Credit card number is prohibited.</message>
2627
<message code="81801" translate="true">Addresses must have at least one field filled in.</message>

‎app/code/Magento/Braintree/etc/di.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
<item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
382382
<item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
383383
<item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
384-
<item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
384+
<item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\BillingAddressDataBuilder</item>
385385
<item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
386386
<item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
387387
<item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ define([
1717
'Magento_Vault/js/view/payment/vault-enabler',
1818
'Magento_Checkout/js/action/create-billing-address',
1919
'Magento_Braintree/js/view/payment/kount',
20-
'mage/translate'
20+
'mage/translate',
21+
'Magento_Ui/js/model/messageList'
2122
], function (
2223
$,
2324
_,
@@ -31,7 +32,8 @@ define([
3132
VaultEnabler,
3233
createBillingAddress,
3334
kount,
34-
$t
35+
$t,
36+
globalMessageList
3537
) {
3638
'use strict';
3739

@@ -415,6 +417,18 @@ define([
415417
*/
416418
onVaultPaymentTokenEnablerChange: function () {
417419
this.reInitPayPal();
420+
},
421+
422+
/**
423+
* Show error message
424+
*
425+
* @param {String} errorMessage
426+
* @private
427+
*/
428+
showError: function (errorMessage) {
429+
globalMessageList.addErrorMessage({
430+
message: errorMessage
431+
});
418432
}
419433
});
420434
});

‎app/code/Magento/Paypal/Controller/Express/AbstractExpress.php‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use Magento\Framework\App\Action\Action as AppAction;
1010
use Magento\Framework\App\Action\HttpGetActionInterface;
1111
use Magento\Framework\App\Action\HttpPostActionInterface;
12+
use Magento\Framework\App\ObjectManager;
13+
use Magento\Quote\Api\CartRepositoryInterface;
1214
use Magento\Quote\Api\Data\CartInterface;
1315

1416
/**
@@ -98,6 +100,11 @@ abstract class AbstractExpress extends AppAction implements
98100
*/
99101
protected $_customerUrl;
100102

103+
/**
104+
* @var CartRepositoryInterface
105+
*/
106+
private $quoteRepository;
107+
101108
/**
102109
* @param \Magento\Framework\App\Action\Context $context
103110
* @param \Magento\Customer\Model\Session $customerSession
@@ -107,6 +114,7 @@ abstract class AbstractExpress extends AppAction implements
107114
* @param \Magento\Framework\Session\Generic $paypalSession
108115
* @param \Magento\Framework\Url\Helper\Data $urlHelper
109116
* @param \Magento\Customer\Model\Url $customerUrl
117+
* @param CartRepositoryInterface $quoteRepository
110118
*/
111119
public function __construct(
112120
\Magento\Framework\App\Action\Context $context,
@@ -116,7 +124,8 @@ public function __construct(
116124
\Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
117125
\Magento\Framework\Session\Generic $paypalSession,
118126
\Magento\Framework\Url\Helper\Data $urlHelper,
119-
\Magento\Customer\Model\Url $customerUrl
127+
\Magento\Customer\Model\Url $customerUrl,
128+
CartRepositoryInterface $quoteRepository = null
120129
) {
121130
$this->_customerSession = $customerSession;
122131
$this->_checkoutSession = $checkoutSession;
@@ -128,6 +137,7 @@ public function __construct(
128137
parent::__construct($context);
129138
$parameters = ['params' => [$this->_configMethod]];
130139
$this->_config = $this->_objectManager->create($this->_configType, $parameters);
140+
$this->quoteRepository = $quoteRepository ?: ObjectManager::getInstance()->get(CartRepositoryInterface::class);
131141
}
132142

133143
/**
@@ -233,7 +243,12 @@ protected function _getCheckoutSession()
233243
protected function _getQuote()
234244
{
235245
if (!$this->_quote) {
236-
$this->_quote = $this->_getCheckoutSession()->getQuote();
246+
if ($this->_getSession()->getQuoteId()) {
247+
$this->_quote = $this->quoteRepository->get($this->_getSession()->getQuoteId());
248+
$this->_getCheckoutSession()->replaceQuote($this->_quote);
249+
} else {
250+
$this->_quote = $this->_getCheckoutSession()->getQuote();
251+
}
237252
}
238253
return $this->_quote;
239254
}
@@ -243,7 +258,7 @@ protected function _getQuote()
243258
*/
244259
public function getCustomerBeforeAuthUrl()
245260
{
246-
return;
261+
return null;
247262
}
248263

249264
/**

‎app/code/Magento/Paypal/Controller/Express/OnAuthorization.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public function execute(): ResultInterface
155155
} else {
156156
$responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
157157
$this->_checkoutSession->setQuoteId($quote->getId());
158+
$this->_getSession()->setQuoteId($quote->getId());
158159
}
159160
} catch (ApiProcessableException $e) {
160161
$responseContent['success'] = false;

‎app/code/Magento/Paypal/view/frontend/templates/express/review.phtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@
136136
value="<?= $block->escapeHtml(__('Place Order')) ?>">
137137
<span><?= $block->escapeHtml(__('Place Order')) ?></span>
138138
</button>
139-
<button type="button" id="review-submit" class="action checkout primary"
140-
value="<?= $block->escapeHtml(__('Place Order')) ?>">
141-
<span><?= $block->escapeHtml(__('Place Order')) ?></span>
142-
</button>
143139
</div>
144140
<span class="please-wait load indicator" id="review-please-wait" style="display: none;"
145141
data-text="<?= $block->escapeHtml(__('Submitting order information...')) ?>">

‎app/code/Magento/Paypal/view/frontend/web/js/order-review.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ define([
2626
agreementSelector: 'div.checkout-agreements input',
2727
isAjax: false,
2828
updateShippingMethodSubmitSelector: '#update-shipping-method-submit',
29-
reviewSubmitSelector: '#review-submit',
3029
shippingMethodUpdateUrl: null,
3130
updateOrderSubmitUrl: null,
3231
canEditShippingMethod: false
@@ -57,8 +56,7 @@ define([
5756
this.options.updateContainerSelector
5857
)
5958
).find(this.options.updateOrderSelector).on('click', $.proxy(this._updateOrderHandler, this)).end()
60-
.find(this.options.updateShippingMethodSubmitSelector).hide().end()
61-
.find(this.options.reviewSubmitSelector).hide();
59+
.find(this.options.updateShippingMethodSubmitSelector).hide().end();
6260
this._shippingTobilling();
6361

6462
if ($(this.options.shippingSubmitFormSelector).length && this.options.canEditShippingMethod) {

0 commit comments

Comments
 (0)