Skip to content

Commit 66cf895

Browse files
rliukshynrliukshyn
committed
Merge remote-tracking branch 'mavericks/MTA-3788' into develop
2 parents e7d6b5a + c3cf732 commit 66cf895

28 files changed

+595
-29
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ define([
296296
getShippingAddress: function () {
297297
var address = quote.shippingAddress();
298298

299-
if (address.postcode === null) {
299+
if (_.isNull(address.postcode) || _.isUndefined(address.postcode)) {
300300

301301
return {};
302302
}

‎dev/tests/functional/credentials.xml.dist

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@
3232
<field path="payment/authorizenet_directpost/trans_key" value="" />
3333
<field path="payment/authorizenet_directpost/trans_md5" value="" />
3434

35-
<field path="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" value="" />
36-
<field path="payment/braintree_section/braintree/braintree_required/merchant_id" value="" />
37-
<field path="payment/braintree_section/braintree/braintree_required/public_key" value="" />
38-
<field path="payment/braintree_section/braintree/braintree_required/private_key" value="" />
35+
<field replace="braintree_enabled_fraud_merchant_account_id" value="" />
36+
<field replace="braintree_enabled_fraud_merchant_id" value="" />
37+
<field replace="braintree_enabled_fraud_public_key" value="" />
38+
<field replace="braintree_enabled_fraud_private_key" value="" />
39+
40+
<field replace="braintree_disabled_fraud_merchant_account_id" value="" />
41+
<field replace="braintree_disabled_fraud_merchant_id" value="" />
42+
<field replace="braintree_disabled_fraud_public_key" value="" />
43+
<field replace="braintree_disabled_fraud_private_key" value="" />
3944

4045
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/business_account" value="" />
4146
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_username" value="" />

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml

Lines changed: 90 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@
1111
<field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
1212
<item name="scope" xsi:type="string">payment</item>
1313
<item name="scope_id" xsi:type="number">1</item>
14-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
15-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
14+
<item name="label" xsi:type="string">Merchant ID</item>
15+
<item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_id%</item>
1616
</field>
1717
<field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
1818
<item name="scope" xsi:type="string">payment</item>
1919
<item name="scope_id" xsi:type="number">1</item>
20-
<item name="label" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
21-
<item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
20+
<item name="label" xsi:type="string">Public Key</item>
21+
<item name="value" xsi:type="string">%braintree_disabled_fraud_public_key%</item>
2222
</field>
2323
<field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
2424
<item name="scope" xsi:type="string">payment</item>
2525
<item name="scope_id" xsi:type="number">1</item>
26-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
27-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
26+
<item name="label" xsi:type="string">Private Key</item>
27+
<item name="value" xsi:type="string">%braintree_disabled_fraud_private_key%</item>
2828
</field>
2929
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
3030
<item name="scope" xsi:type="string">payment</item>
3131
<item name="scope_id" xsi:type="number">1</item>
32-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
33-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
32+
<item name="label" xsi:type="string">Merchant Account ID</item>
33+
<item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_account_id%</item>
3434
</field>
3535
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
3636
<item name="scope" xsi:type="string">payment</item>
@@ -51,6 +51,7 @@
5151
<item name="value" xsi:type="number">1</item>
5252
</field>
5353
</dataset>
54+
5455
<dataset name="braintree_rollback">
5556
<field name="payment/braintree/active" xsi:type="array">
5657
<item name="scope" xsi:type="string">payment</item>
@@ -59,6 +60,16 @@
5960
<item name="value" xsi:type="number">0</item>
6061
</field>
6162
</dataset>
63+
64+
<dataset name="braintree_incorrect_merchant_account_id">
65+
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
66+
<item name="scope" xsi:type="string">payment</item>
67+
<item name="scope_id" xsi:type="number">1</item>
68+
<item name="label" xsi:type="string">Merchant Account ID</item>
69+
<item name="value" xsi:type="string">incorrect</item>
70+
</field>
71+
</dataset>
72+
6273
<dataset name="braintree_sale">
6374
<field name="payment/braintree/payment_action" xsi:type="array">
6475
<item name="scope" xsi:type="string">payment</item>
@@ -67,6 +78,7 @@
6778
<item name="value" xsi:type="string">authorize_capture</item>
6879
</field>
6980
</dataset>
81+
7082
<dataset name="braintree_3d_secure">
7183
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
7284
<item name="scope" xsi:type="string">payment</item>
@@ -75,6 +87,7 @@
7587
<item name="value" xsi:type="number">1</item>
7688
</field>
7789
</dataset>
90+
7891
<dataset name="braintree_3d_secure_rollback">
7992
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
8093
<item name="scope" xsi:type="string">payment</item>
@@ -83,6 +96,7 @@
8396
<item name="value" xsi:type="number">0</item>
8497
</field>
8598
</dataset>
99+
86100
<dataset name="braintree_3d_secure_uk">
87101
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
88102
<item name="scope" xsi:type="string">payment</item>
@@ -107,6 +121,7 @@
107121
</item>
108122
</field>
109123
</dataset>
124+
110125
<dataset name="braintree_3d_secure_uk_rollback">
111126
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
112127
<item name="scope" xsi:type="string">payment</item>
@@ -121,6 +136,7 @@
121136
<item name="value" xsi:type="number">0</item>
122137
</field>
123138
</dataset>
139+
124140
<dataset name="braintree_3d_secure_not_triggered_due_threshold">
125141
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
126142
<item name="scope" xsi:type="string">payment</item>
@@ -135,6 +151,7 @@
135151
<item name="value" xsi:type="number">300</item>
136152
</field>
137153
</dataset>
154+
138155
<dataset name="braintree_3d_secure_not_triggered_due_threshold_rollback">
139156
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
140157
<item name="scope" xsi:type="string">payment</item>
@@ -143,6 +160,7 @@
143160
<item name="value" xsi:type="number">0</item>
144161
</field>
145162
</dataset>
163+
146164
<dataset name="braintree_use_vault">
147165
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
148166
<item name="scope" xsi:type="string">payment</item>
@@ -151,6 +169,7 @@
151169
<item name="value" xsi:type="number">1</item>
152170
</field>
153171
</dataset>
172+
154173
<dataset name="braintree_use_vault_rollback">
155174
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
156175
<item name="scope" xsi:type="string">payment</item>
@@ -159,6 +178,7 @@
159178
<item name="value" xsi:type="number">0</item>
160179
</field>
161180
</dataset>
181+
162182
<dataset name="braintree_paypal">
163183
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
164184
<item name="scope" xsi:type="string">payment</item>
@@ -173,6 +193,7 @@
173193
<item name="value" xsi:type="string">authorize</item>
174194
</field>
175195
</dataset>
196+
176197
<dataset name="braintree_paypal_rollback">
177198
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
178199
<item name="scope" xsi:type="string">payment</item>
@@ -181,6 +202,7 @@
181202
<item name="value" xsi:type="number">0</item>
182203
</field>
183204
</dataset>
205+
184206
<dataset name="braintree_paypal_sale">
185207
<field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
186208
<item name="scope" xsi:type="string">payment</item>
@@ -189,6 +211,7 @@
189211
<item name="value" xsi:type="string">authorize_capture</item>
190212
</field>
191213
</dataset>
214+
192215
<dataset name="braintree_paypal_skip_order_review">
193216
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
194217
<item name="scope" xsi:type="string">payment</item>
@@ -197,6 +220,7 @@
197220
<item name="value" xsi:type="number">1</item>
198221
</field>
199222
</dataset>
223+
200224
<dataset name="braintree_paypal_skip_order_review_rollback">
201225
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
202226
<item name="scope" xsi:type="string">payment</item>
@@ -205,6 +229,7 @@
205229
<item name="value" xsi:type="number">0</item>
206230
</field>
207231
</dataset>
232+
208233
<dataset name="braintree_paypal_use_vault">
209234
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
210235
<item name="scope" xsi:type="string">payment</item>
@@ -213,6 +238,7 @@
213238
<item name="value" xsi:type="number">1</item>
214239
</field>
215240
</dataset>
241+
216242
<dataset name="braintree_paypal_use_vault_rollback">
217243
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
218244
<item name="scope" xsi:type="string">payment</item>
@@ -221,6 +247,7 @@
221247
<item name="value" xsi:type="number">0</item>
222248
</field>
223249
</dataset>
250+
224251
<dataset name="braintree_fraudprotection">
225252
<field name="payment/braintree/fraudprotection" xsi:type="array">
226253
<item name="scope" xsi:type="string">payment</item>
@@ -229,6 +256,7 @@
229256
<item name="value" xsi:type="number">1</item>
230257
</field>
231258
</dataset>
259+
232260
<dataset name="braintree_fraudprotection_rollback">
233261
<field name="payment/braintree/fraudprotection" xsi:type="array">
234262
<item name="scope" xsi:type="string">payment</item>
@@ -237,5 +265,59 @@
237265
<item name="value" xsi:type="number">0</item>
238266
</field>
239267
</dataset>
268+
269+
<dataset name="braintree_fraud_tool_enabled_account">
270+
<field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
271+
<item name="scope" xsi:type="string">payment</item>
272+
<item name="scope_id" xsi:type="number">1</item>
273+
<item name="label" xsi:type="string">Merchant ID</item>
274+
<item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_id%</item>
275+
</field>
276+
<field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
277+
<item name="scope" xsi:type="string">payment</item>
278+
<item name="scope_id" xsi:type="number">1</item>
279+
<item name="label" xsi:type="string">Public Key</item>
280+
<item name="value" xsi:type="string">%braintree_enabled_fraud_public_key%</item>
281+
</field>
282+
<field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
283+
<item name="scope" xsi:type="string">payment</item>
284+
<item name="scope_id" xsi:type="number">1</item>
285+
<item name="label" xsi:type="string">Private Key</item>
286+
<item name="value" xsi:type="string">%braintree_enabled_fraud_private_key%</item>
287+
</field>
288+
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
289+
<item name="scope" xsi:type="string">payment</item>
290+
<item name="scope_id" xsi:type="number">1</item>
291+
<item name="label" xsi:type="string">Merchant Account ID</item>
292+
<item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_account_id%</item>
293+
</field>
294+
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
295+
<item name="scope" xsi:type="string">payment</item>
296+
<item name="scope_id" xsi:type="number">1</item>
297+
<item name="label" xsi:type="string">Authorize</item>
298+
<item name="value" xsi:type="string">authorize</item>
299+
</field>
300+
<field name="payment/braintree_section/braintree/braintree_advanced/debug" xsi:type="array">
301+
<item name="scope" xsi:type="string">payment</item>
302+
<item name="scope_id" xsi:type="number">1</item>
303+
<item name="label" xsi:type="string">Yes</item>
304+
<item name="value" xsi:type="number">1</item>
305+
</field>
306+
<field name="payment/braintree_section/braintree/active" xsi:type="array">
307+
<item name="scope" xsi:type="string">payment</item>
308+
<item name="scope_id" xsi:type="number">1</item>
309+
<item name="label" xsi:type="string">Yes</item>
310+
<item name="value" xsi:type="number">1</item>
311+
</field>
312+
</dataset>
313+
314+
<dataset name="braintree_fraud_tool_enabled_account_rollback">
315+
<field name="payment/braintree/active" xsi:type="array">
316+
<item name="scope" xsi:type="string">payment</item>
317+
<item name="scope_id" xsi:type="number">1</item>
318+
<item name="label" xsi:type="string">No</item>
319+
<item name="value" xsi:type="number">0</item>
320+
</field>
321+
</dataset>
240322
</repository>
241323
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,26 @@
1313
<field name="credit_card_exp_year" xsi:type="string">2020</field>
1414
<field name="cvv" xsi:type="string">123</field>
1515
</dataset>
16+
1617
<dataset name="visa_braintree_3dsecure">
1718
<field name="credit_card_number" xsi:type="string">4000000000000002</field>
1819
<field name="credit_card_exp_month" xsi:type="string">01</field>
1920
<field name="credit_card_exp_year" xsi:type="string">20</field>
2021
<field name="cvv" xsi:type="string">123</field>
2122
</dataset>
23+
2224
<dataset name="visa_braintree_3dsecure_failed">
2325
<field name="credit_card_number" xsi:type="string">4000000000000028</field>
2426
<field name="credit_card_exp_month" xsi:type="string">01</field>
2527
<field name="credit_card_exp_year" xsi:type="string">2020</field>
2628
<field name="cvv" xsi:type="string">123</field>
2729
</dataset>
30+
31+
<dataset name="visa_braintree_fraud_rejected">
32+
<field name="credit_card_number" xsi:type="string">4000111111111511</field>
33+
<field name="credit_card_exp_month" xsi:type="string">01</field>
34+
<field name="credit_card_exp_year" xsi:type="string">2020</field>
35+
<field name="cvv" xsi:type="string">123</field>
36+
</dataset>
2837
</repository>
2938
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,28 @@
6464
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
6565
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
6666
</variation>
67+
<variation name="CreateOrderBackendTestBraintreeVariation3" summary="Checkout with Braintree Credit Card from Admin (Basic Fraud Protection)" ticketId="MAGETWO-46470">
68+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
69+
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
70+
<data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
71+
<data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
72+
<data name="customer/dataset" xsi:type="string">default</data>
73+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
74+
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
75+
<data name="saveAddress" xsi:type="string">No</data>
76+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
77+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
78+
<data name="prices" xsi:type="array">
79+
<item name="grandTotal" xsi:type="string">145.98</item>
80+
</data>
81+
<data name="payment/method" xsi:type="string">braintree</data>
82+
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
83+
<data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
84+
<data name="configData" xsi:type="string">braintree</data>
85+
<data name="status" xsi:type="string">Processing</data>
86+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
87+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
88+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
89+
</variation>
6790
</testCase>
6891
</config>

0 commit comments

Comments
 (0)