Skip to content

Commit f41603d

Browse files
YevSentYevSent
committed
MAGETWO-48463: Braintree implementation fixes
 - Added css class for payment icons - Added tooltip for Braintree settlement report - Fixed credit card validation
1 parent 46dfec8 commit f41603d

File tree

10 files changed

+65
-12
lines changed

10 files changed

+65
-12
lines changed

‎app/code/Magento/BraintreeTwo/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testPlaceRequestWithException()
6969
}
7070

7171
/**
72-
* @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::placeRequest
72+
* @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::process
7373
*/
7474
public function testPlaceRequest()
7575
{

‎app/code/Magento/BraintreeTwo/view/adminhtml/layout/braintreetwo_report_index.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
10+
<referenceContainer name="page.main.actions">
11+
<block class="Magento\Backend\Block\Template" name="adminhtml.report.grid.braintreetwo.tooltip" template="Magento_BraintreeTwo::grid/tooltip.phtml">
12+
<arguments>
13+
<argument name="tooltip_content" xsi:type="string" translate="true">Apply filters in order to get results. Only first 100 records will be displayed in the grid, you will be able to download full version of the report in .csv format.</argument>
14+
</arguments>
15+
</block>
16+
</referenceContainer>
1017
<referenceContainer name="content">
1118
<uiComponent name="braintreetwo_report"/>
1219
</referenceContainer>

‎app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/vault.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $id = $block->escapeHtml($block->getData('id'));
2323
<img src="<?php echo $block->escapeUrl($icon['url']); ?>"
2424
width="<?php echo $block->escapeHtml($icon['width']); ?>"
2525
height="<?php echo $block->escapeHtml($icon['height']); ?>"
26-
>
26+
class="payment-icon" >
2727
<span><?php echo $block->escapeHtml(__('ending'));?></span>
2828
<span><?php echo $block->escapeHtml($details['maskedCC']); ?></span>
2929
(<span><?php echo $block->escapeHtml(__('expires'));?></span>:

‎app/code/Magento/BraintreeTwo/view/adminhtml/templates/grid/tooltip.phtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/**
8+
* @var \Magento\Backend\Block\Template $block
9+
*/
10+
echo $block->escapeHtml($block->getData('tooltip_content'));

‎app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ define([
112112
self.selectedCardType(null);
113113
}
114114

115-
if (!event.isValid) {
116-
return false;
117-
}
118-
119-
if (event.card) {
115+
if (event.target.fieldKey === 'number' && event.card) {
116+
if (event.isValid) {
117+
self.cardNumber = event.card;
118+
} else {
119+
self.cardNumber = null;
120+
}
120121
self.selectedCardType(
121122
validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
122123
);

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ define([
99
'underscore',
1010
'Magento_Checkout/js/view/payment/default',
1111
'Magento_BraintreeTwo/js/view/payment/adapter',
12-
'Magento_Checkout/js/model/quote'
13-
], function ($, _, Component, Braintree, quote) {
12+
'Magento_Checkout/js/model/quote',
13+
'Magento_Checkout/js/model/full-screen-loader'
14+
], function ($, _, Component, Braintree, quote, fullScreenLoader) {
1415
'use strict';
1516

1617
var checkout;
@@ -35,6 +36,7 @@ define([
3536
*/
3637
onReady: function (integration) {
3738
checkout = integration;
39+
this.enableButton();
3840
},
3941

4042
/**
@@ -160,6 +162,7 @@ define([
160162
checkout.teardown(function () {
161163
checkout = null;
162164
});
165+
this.disableButton();
163166
this.clientConfig.paypal.amount = this.grandTotalAmount;
164167

165168
Braintree.setConfig(this.clientConfig);
@@ -267,6 +270,22 @@ define([
267270
getPaymentAcceptanceMarkSrc: function () {
268271

269272
return window.checkoutConfig.payment[this.getCode()].paymentAcceptanceMarkSrc;
273+
},
274+
275+
/**
276+
* Disable submit button
277+
*/
278+
disableButton: function () {
279+
fullScreenLoader.startLoader();
280+
$('[data-button="place"]').attr('disabled', 'disabled');
281+
},
282+
283+
/**
284+
* Enable submit button
285+
*/
286+
enableButton: function () {
287+
$('[data-button="place"]').removeAttr('disabled');
288+
fullScreenLoader.stopLoader();
270289
}
271290
});
272291
});

‎app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/paypal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
<div class="actions-toolbar">
3131
<div class="primary">
32-
<button data-role="review-save"
32+
<button data-button="place" data-role="review-save"
3333
type="submit"
3434
data-bind="attr: {title: $t('Continue to PayPal')}, enable: (isActive()), click: payWithPayPal"
3535
class="action primary checkout"

‎app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $id = $block->escapeHtml($block->getData('id'));
2424
<img src="<?php echo $block->escapeUrl($icon['url']); ?>"
2525
width="<?php echo $block->escapeHtml($icon['width']); ?>"
2626
height="<?php echo $block->escapeHtml($icon['height']); ?>"
27-
>
27+
class="payment-icon" >
2828
<span><?php echo $block->escapeHtml(__('ending'));?></span>
2929
<span><?php echo $block->escapeHtml($details['cc_last_4']); ?></span>
3030
(<span><?php echo $block->escapeHtml(__('expires'));?></span>:

‎app/code/Magento/Vault/view/frontend/web/template/payment/form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
'src': getIcons(getCardType()).url,
2121
'width': getIcons(getCardType()).width,
2222
'height': getIcons(getCardType()).height
23-
}">
23+
}" class="payment-icon">
2424
<span translate="'ending'"></span>
2525
<span text="getMaskedCard()"></span>
2626
(

‎app/design/adminhtml/Magento/backend/Magento_Vault/web/css/source/_module.less

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// /**
2+
// * Copyright © 2016 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Vault General Styles
8+
// ---------------------------------------------
9+
10+
.order-billing-method {
11+
.payment-icon {
12+
display: inline-block;
13+
margin-right: @indent__xs;
14+
vertical-align: middle;
15+
}
16+
}

0 commit comments

Comments
 (0)