WooCommerce PayPal Powered by Braintree Payment Gateway - Version 2.0.3

Version Description

  • Fix - Add a missing namespace that could cause JavaScript issues with some configurations
Download this release

Release Info

Developer royho
Plugin Icon 128x128 WooCommerce PayPal Powered by Braintree Payment Gateway
Version 2.0.3
Comparing to
See all releases

Code changes from version 2.0.2 to 2.0.3

Files changed (8) hide show
  1. class-wc-braintree.php +1 -1
  2. i18n/languages/woocommerce-gateway-paypal-powered-by-braintree.pot +67 -67
  3. includes/class-wc-gateway-braintree-credit-card.php +6 -0
  4. includes/class-wc-gateway-braintree-paypal.php +1 -0
  5. includes/class-wc-gateway-braintree.php +26 -11
  6. lib/skyverge/woocommerce/payment-gateway/class-sv-wc-payment-gateway.php +1 -1
  7. readme.txt +4 -1
  8. woocommerce-gateway-paypal-powered-by-braintree.php +1 -1
class-wc-braintree.php CHANGED
@@ -88,7 +88,7 @@ class WC_Braintree extends WC_Braintree_Framework\SV_WC_Payment_Gateway_Plugin {
88
 
89
 
90
  /** plugin version number */
91
- const VERSION = '2.0.2';
92
 
93
  /** @var WC_Braintree single instance of this plugin */
94
  protected static $instance;
88
 
89
 
90
  /** plugin version number */
91
+ const VERSION = '2.0.3';
92
 
93
  /** @var WC_Braintree single instance of this plugin */
94
  protected static $instance;
i18n/languages/woocommerce-gateway-paypal-powered-by-braintree.pot CHANGED
@@ -2,7 +2,7 @@
2
  # This file is distributed under the same license as the WooCommerce PayPal Powered by Braintree Gateway package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: WooCommerce PayPal Powered by Braintree Gateway 2.0.2\n"
6
  "Report-Msgid-Bugs-To: "
7
  "https://wordpress.org/support/plugin/woocommerce-gateway-paypal-powered-by-"
8
  "braintree/\n"
@@ -159,27 +159,27 @@ msgstr ""
159
  msgid "Allow customers to securely pay using their credit card via Braintree."
160
  msgstr ""
161
 
162
- #: includes/class-wc-gateway-braintree-credit-card.php:151
163
  msgid "Basic"
164
  msgstr ""
165
 
166
- #: includes/class-wc-gateway-braintree-credit-card.php:152
167
  msgid "Advanced"
168
  msgstr ""
169
 
170
- #: includes/class-wc-gateway-braintree-credit-card.php:157
171
  msgid "Kount Direct"
172
  msgstr ""
173
 
174
- #: includes/class-wc-gateway-braintree-credit-card.php:164
175
  msgid "Fraud Settings"
176
  msgstr ""
177
 
178
- #: includes/class-wc-gateway-braintree-credit-card.php:168
179
  msgid "Fraud Tool"
180
  msgstr ""
181
 
182
- #: includes/class-wc-gateway-braintree-credit-card.php:171
183
  msgid ""
184
  "Select the fraud tool you want to use. Basic is enabled by default and "
185
  "requires no additional configuration. Advanced requires you to enable "
@@ -187,55 +187,55 @@ msgid ""
187
  "you must contact Braintree support."
188
  msgstr ""
189
 
190
- #: includes/class-wc-gateway-braintree-credit-card.php:175
191
  msgid "Kount merchant ID"
192
  msgstr ""
193
 
194
- #: includes/class-wc-gateway-braintree-credit-card.php:178
195
  msgid "Speak with your account management team at Braintree to get this."
196
  msgstr ""
197
 
198
- #: includes/class-wc-gateway-braintree-credit-card.php:183
199
  msgid "3D Secure (Verified by Visa, MasterCard SecureCode)"
200
  msgstr ""
201
 
202
- #: includes/class-wc-gateway-braintree-credit-card.php:185
203
  msgid ""
204
  "3D Secure benefits cardholders and merchants by providing an additional "
205
  "layer of verification. %1$sLearn more about 3D Secure%2$s."
206
  msgstr ""
207
 
208
- #: includes/class-wc-gateway-braintree-credit-card.php:188
209
  msgid "3D Secure"
210
  msgstr ""
211
 
212
- #: includes/class-wc-gateway-braintree-credit-card.php:190
213
  msgid "Enable 3D Secure (Visa and MasterCard cards only)"
214
  msgstr ""
215
 
216
- #: includes/class-wc-gateway-braintree-credit-card.php:191
217
  msgid ""
218
  "You must contact Braintree support to add this feature to your Braintree "
219
  "account before enabling this option."
220
  msgstr ""
221
 
222
- #: includes/class-wc-gateway-braintree-credit-card.php:212
223
  msgid "Card Verification (CSC)"
224
  msgstr ""
225
 
226
- #: includes/class-wc-gateway-braintree-credit-card.php:213
227
  msgid "Display and Require the Card Security Code (CVV/CID) field on checkout"
228
  msgstr ""
229
 
230
- #: includes/class-wc-gateway-braintree-credit-card.php:677
231
  #: includes/payment-forms/class-wc-braintree-hosted-fields-payment-form.php:124
232
  msgid ""
233
  "We cannot process your order with the payment information that you "
234
  "provided. Please use an alternate payment method."
235
  msgstr ""
236
 
237
- #: includes/class-wc-gateway-braintree-credit-card.php:684
238
- #: includes/class-wc-gateway-braintree.php:163
239
  msgid ""
240
  "Oops, there was a temporary payment error. Please try another payment "
241
  "method or contact us to complete your transaction."
@@ -249,60 +249,60 @@ msgstr ""
249
  msgid "Allow customers to securely pay using their PayPal account via Braintree."
250
  msgstr ""
251
 
252
- #: includes/class-wc-gateway-braintree-paypal.php:119
253
  msgid "Token ID"
254
  msgstr ""
255
 
256
- #: includes/class-wc-gateway-braintree-paypal.php:124
257
  msgid "Email"
258
  msgstr ""
259
 
260
- #: includes/class-wc-gateway-braintree-paypal.php:163
261
  msgid "Use a new PayPal account"
262
  msgstr ""
263
 
264
- #: includes/class-wc-gateway-braintree-paypal.php:167
265
  msgid "PayPal Accounts"
266
  msgstr ""
267
 
268
- #: includes/class-wc-gateway-braintree-paypal.php:188
269
  msgid "Unlink"
270
  msgstr ""
271
 
272
- #: includes/class-wc-gateway-braintree-paypal.php:333
273
  #. translators: Placeholders: %1$s - payment method title (e.g. PayPal), %2$s -
274
  #. transaction environment (either Sandbox or blank string), %3$s - type of
275
  #. transaction (either Authorization or Payment)
276
  msgid "%1$s %2$s %3$s Approved"
277
  msgstr ""
278
 
279
- #: includes/class-wc-gateway-braintree-paypal.php:335
280
- #: includes/class-wc-gateway-braintree.php:1348
281
  msgid "Sandbox"
282
  msgstr ""
283
 
284
- #: includes/class-wc-gateway-braintree-paypal.php:336
285
  msgid "Authorization"
286
  msgstr ""
287
 
288
- #: includes/class-wc-gateway-braintree-paypal.php:336
289
  msgid "Payment"
290
  msgstr ""
291
 
292
- #: includes/class-wc-gateway-braintree-paypal.php:342
293
  #. translators: Placeholders: %s - transaction ID
294
  msgid "(Transaction ID %s)"
295
  msgstr ""
296
 
297
- #: includes/class-wc-gateway-braintree-paypal.php:363
298
  msgid "PayPal Account Saved: %s"
299
  msgstr ""
300
 
301
- #: includes/class-wc-gateway-braintree-paypal.php:442
302
  msgid "PayPal"
303
  msgstr ""
304
 
305
- #: includes/class-wc-gateway-braintree-paypal.php:456
306
  msgid ""
307
  "Click the PayPal icon below to sign into your PayPal account and pay "
308
  "securely."
@@ -312,69 +312,69 @@ msgstr ""
312
  msgid "Oops, something went wrong. Please try a different payment method."
313
  msgstr ""
314
 
315
- #: includes/class-wc-gateway-braintree.php:340
316
  msgid "Public Key"
317
  msgstr ""
318
 
319
- #: includes/class-wc-gateway-braintree.php:343
320
  msgid "The Public Key for your Braintree account."
321
  msgstr ""
322
 
323
- #: includes/class-wc-gateway-braintree.php:347
324
  msgid "Private Key"
325
  msgstr ""
326
 
327
- #: includes/class-wc-gateway-braintree.php:350
328
  msgid "The Private Key for your Braintree account."
329
  msgstr ""
330
 
331
- #: includes/class-wc-gateway-braintree.php:354
332
  msgid "Merchant ID"
333
  msgstr ""
334
 
335
- #: includes/class-wc-gateway-braintree.php:357
336
  msgid "The Merchant ID for your Braintree account."
337
  msgstr ""
338
 
339
- #: includes/class-wc-gateway-braintree.php:362
340
  msgid "Sandbox Public Key"
341
  msgstr ""
342
 
343
- #: includes/class-wc-gateway-braintree.php:365
344
  msgid "The Public Key for your Braintree sandbox account."
345
  msgstr ""
346
 
347
- #: includes/class-wc-gateway-braintree.php:369
348
  msgid "Sandbox Private Key"
349
  msgstr ""
350
 
351
- #: includes/class-wc-gateway-braintree.php:372
352
  msgid "The Private Key for your Braintree sandbox account."
353
  msgstr ""
354
 
355
- #: includes/class-wc-gateway-braintree.php:376
356
  msgid "Sandbox Merchant ID"
357
  msgstr ""
358
 
359
- #: includes/class-wc-gateway-braintree.php:379
360
  msgid "The Merchant ID for your Braintree sandbox account."
361
  msgstr ""
362
 
363
- #: includes/class-wc-gateway-braintree.php:384
364
  msgid "Merchant Account IDs"
365
  msgstr ""
366
 
367
- #: includes/class-wc-gateway-braintree.php:387
368
  msgid ""
369
  "Enter additional merchant account IDs if you do not want to use your "
370
  "Braintree account default. %1$sLearn more about merchant account IDs%2$s"
371
  msgstr ""
372
 
373
- #: includes/class-wc-gateway-braintree.php:396
374
  msgid "Dynamic Descriptors"
375
  msgstr ""
376
 
377
- #: includes/class-wc-gateway-braintree.php:399
378
  #. translators: Placeholders: %1$s - <p> tag, %2$s - </p> tag, %3$s - <a> tag,
379
  #. %4$s - </a> tag
380
  msgid ""
@@ -384,11 +384,11 @@ msgid ""
384
  "dynamic descriptors%4$s and are using an accepted format.%2$s"
385
  msgstr ""
386
 
387
- #: includes/class-wc-gateway-braintree.php:403
388
  msgid "Name"
389
  msgstr ""
390
 
391
- #: includes/class-wc-gateway-braintree.php:406
392
  msgid ""
393
  "The value in the business name field of a customer's statement. Company "
394
  "name/DBA section must be either 3, 7 or 12 characters and the product "
@@ -396,77 +396,77 @@ msgid ""
396
  "between for a total descriptor name of 22 characters)."
397
  msgstr ""
398
 
399
- #: includes/class-wc-gateway-braintree.php:411
400
  msgid "Phone"
401
  msgstr ""
402
 
403
- #: includes/class-wc-gateway-braintree.php:414
404
  msgid ""
405
  "The value in the phone number field of a customer's statement. Phone must "
406
  "be exactly 10 characters and can only contain numbers, dashes, parentheses "
407
  "and periods."
408
  msgstr ""
409
 
410
- #: includes/class-wc-gateway-braintree.php:419
411
  msgid "URL"
412
  msgstr ""
413
 
414
- #: includes/class-wc-gateway-braintree.php:422
415
  msgid ""
416
  "The value in the URL/web address field of a customer's statement. The URL "
417
  "must be 13 characters or less."
418
  msgstr ""
419
 
420
- #: includes/class-wc-gateway-braintree.php:455
421
  msgid "Enter connection credentials manually"
422
  msgstr ""
423
 
424
- #: includes/class-wc-gateway-braintree.php:479
425
  msgid "Disabled because the other gateway is not connected manually."
426
  msgstr ""
427
 
428
- #: includes/class-wc-gateway-braintree.php:498
429
  msgid ""
430
  "You just connected your Braintree account to WooCommerce. You can start "
431
  "taking payments now."
432
  msgstr ""
433
 
434
- #: includes/class-wc-gateway-braintree.php:499
435
  msgid ""
436
  "Once you have processed a payment, PayPal will review your application for "
437
  "final approval. Before you ship any goods make sure you have received a "
438
  "final approval for your Braintree account."
439
  msgstr ""
440
 
441
- #: includes/class-wc-gateway-braintree.php:500
442
  msgid "Questions? We are a phone call away: 1-855-489-0345."
443
  msgstr ""
444
 
445
- #: includes/class-wc-gateway-braintree.php:505
446
  msgid "Click button to create an account with Braintree and start transacting."
447
  msgstr ""
448
 
449
- #: includes/class-wc-gateway-braintree.php:620
450
  msgid "Add merchant account ID for %s"
451
  msgstr ""
452
 
453
- #: includes/class-wc-gateway-braintree.php:725
454
  msgid "Add merchant account ID for "
455
  msgstr ""
456
 
457
- #: includes/class-wc-gateway-braintree.php:823
458
  msgid "Merchant Account ID (%s)"
459
  msgstr ""
460
 
461
- #: includes/class-wc-gateway-braintree.php:834
462
  msgid "Enter merchant account ID"
463
  msgstr ""
464
 
465
- #: includes/class-wc-gateway-braintree.php:835
466
  msgid "Remove this merchant account ID"
467
  msgstr ""
468
 
469
- #: includes/class-wc-gateway-braintree.php:1348
470
  msgid "Production"
471
  msgstr ""
472
 
2
  # This file is distributed under the same license as the WooCommerce PayPal Powered by Braintree Gateway package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: WooCommerce PayPal Powered by Braintree Gateway 2.0.3\n"
6
  "Report-Msgid-Bugs-To: "
7
  "https://wordpress.org/support/plugin/woocommerce-gateway-paypal-powered-by-"
8
  "braintree/\n"
159
  msgid "Allow customers to securely pay using their credit card via Braintree."
160
  msgstr ""
161
 
162
+ #: includes/class-wc-gateway-braintree-credit-card.php:157
163
  msgid "Basic"
164
  msgstr ""
165
 
166
+ #: includes/class-wc-gateway-braintree-credit-card.php:158
167
  msgid "Advanced"
168
  msgstr ""
169
 
170
+ #: includes/class-wc-gateway-braintree-credit-card.php:163
171
  msgid "Kount Direct"
172
  msgstr ""
173
 
174
+ #: includes/class-wc-gateway-braintree-credit-card.php:170
175
  msgid "Fraud Settings"
176
  msgstr ""
177
 
178
+ #: includes/class-wc-gateway-braintree-credit-card.php:174
179
  msgid "Fraud Tool"
180
  msgstr ""
181
 
182
+ #: includes/class-wc-gateway-braintree-credit-card.php:177
183
  msgid ""
184
  "Select the fraud tool you want to use. Basic is enabled by default and "
185
  "requires no additional configuration. Advanced requires you to enable "
187
  "you must contact Braintree support."
188
  msgstr ""
189
 
190
+ #: includes/class-wc-gateway-braintree-credit-card.php:181
191
  msgid "Kount merchant ID"
192
  msgstr ""
193
 
194
+ #: includes/class-wc-gateway-braintree-credit-card.php:184
195
  msgid "Speak with your account management team at Braintree to get this."
196
  msgstr ""
197
 
198
+ #: includes/class-wc-gateway-braintree-credit-card.php:189
199
  msgid "3D Secure (Verified by Visa, MasterCard SecureCode)"
200
  msgstr ""
201
 
202
+ #: includes/class-wc-gateway-braintree-credit-card.php:191
203
  msgid ""
204
  "3D Secure benefits cardholders and merchants by providing an additional "
205
  "layer of verification. %1$sLearn more about 3D Secure%2$s."
206
  msgstr ""
207
 
208
+ #: includes/class-wc-gateway-braintree-credit-card.php:194
209
  msgid "3D Secure"
210
  msgstr ""
211
 
212
+ #: includes/class-wc-gateway-braintree-credit-card.php:196
213
  msgid "Enable 3D Secure (Visa and MasterCard cards only)"
214
  msgstr ""
215
 
216
+ #: includes/class-wc-gateway-braintree-credit-card.php:197
217
  msgid ""
218
  "You must contact Braintree support to add this feature to your Braintree "
219
  "account before enabling this option."
220
  msgstr ""
221
 
222
+ #: includes/class-wc-gateway-braintree-credit-card.php:218
223
  msgid "Card Verification (CSC)"
224
  msgstr ""
225
 
226
+ #: includes/class-wc-gateway-braintree-credit-card.php:219
227
  msgid "Display and Require the Card Security Code (CVV/CID) field on checkout"
228
  msgstr ""
229
 
230
+ #: includes/class-wc-gateway-braintree-credit-card.php:683
231
  #: includes/payment-forms/class-wc-braintree-hosted-fields-payment-form.php:124
232
  msgid ""
233
  "We cannot process your order with the payment information that you "
234
  "provided. Please use an alternate payment method."
235
  msgstr ""
236
 
237
+ #: includes/class-wc-gateway-braintree-credit-card.php:690
238
+ #: includes/class-wc-gateway-braintree.php:178
239
  msgid ""
240
  "Oops, there was a temporary payment error. Please try another payment "
241
  "method or contact us to complete your transaction."
249
  msgid "Allow customers to securely pay using their PayPal account via Braintree."
250
  msgstr ""
251
 
252
+ #: includes/class-wc-gateway-braintree-paypal.php:120
253
  msgid "Token ID"
254
  msgstr ""
255
 
256
+ #: includes/class-wc-gateway-braintree-paypal.php:125
257
  msgid "Email"
258
  msgstr ""
259
 
260
+ #: includes/class-wc-gateway-braintree-paypal.php:164
261
  msgid "Use a new PayPal account"
262
  msgstr ""
263
 
264
+ #: includes/class-wc-gateway-braintree-paypal.php:168
265
  msgid "PayPal Accounts"
266
  msgstr ""
267
 
268
+ #: includes/class-wc-gateway-braintree-paypal.php:189
269
  msgid "Unlink"
270
  msgstr ""
271
 
272
+ #: includes/class-wc-gateway-braintree-paypal.php:334
273
  #. translators: Placeholders: %1$s - payment method title (e.g. PayPal), %2$s -
274
  #. transaction environment (either Sandbox or blank string), %3$s - type of
275
  #. transaction (either Authorization or Payment)
276
  msgid "%1$s %2$s %3$s Approved"
277
  msgstr ""
278
 
279
+ #: includes/class-wc-gateway-braintree-paypal.php:336
280
+ #: includes/class-wc-gateway-braintree.php:1363
281
  msgid "Sandbox"
282
  msgstr ""
283
 
284
+ #: includes/class-wc-gateway-braintree-paypal.php:337
285
  msgid "Authorization"
286
  msgstr ""
287
 
288
+ #: includes/class-wc-gateway-braintree-paypal.php:337
289
  msgid "Payment"
290
  msgstr ""
291
 
292
+ #: includes/class-wc-gateway-braintree-paypal.php:343
293
  #. translators: Placeholders: %s - transaction ID
294
  msgid "(Transaction ID %s)"
295
  msgstr ""
296
 
297
+ #: includes/class-wc-gateway-braintree-paypal.php:364
298
  msgid "PayPal Account Saved: %s"
299
  msgstr ""
300
 
301
+ #: includes/class-wc-gateway-braintree-paypal.php:443
302
  msgid "PayPal"
303
  msgstr ""
304
 
305
+ #: includes/class-wc-gateway-braintree-paypal.php:457
306
  msgid ""
307
  "Click the PayPal icon below to sign into your PayPal account and pay "
308
  "securely."
312
  msgid "Oops, something went wrong. Please try a different payment method."
313
  msgstr ""
314
 
315
+ #: includes/class-wc-gateway-braintree.php:355
316
  msgid "Public Key"
317
  msgstr ""
318
 
319
+ #: includes/class-wc-gateway-braintree.php:358
320
  msgid "The Public Key for your Braintree account."
321
  msgstr ""
322
 
323
+ #: includes/class-wc-gateway-braintree.php:362
324
  msgid "Private Key"
325
  msgstr ""
326
 
327
+ #: includes/class-wc-gateway-braintree.php:365
328
  msgid "The Private Key for your Braintree account."
329
  msgstr ""
330
 
331
+ #: includes/class-wc-gateway-braintree.php:369
332
  msgid "Merchant ID"
333
  msgstr ""
334
 
335
+ #: includes/class-wc-gateway-braintree.php:372
336
  msgid "The Merchant ID for your Braintree account."
337
  msgstr ""
338
 
339
+ #: includes/class-wc-gateway-braintree.php:377
340
  msgid "Sandbox Public Key"
341
  msgstr ""
342
 
343
+ #: includes/class-wc-gateway-braintree.php:380
344
  msgid "The Public Key for your Braintree sandbox account."
345
  msgstr ""
346
 
347
+ #: includes/class-wc-gateway-braintree.php:384
348
  msgid "Sandbox Private Key"
349
  msgstr ""
350
 
351
+ #: includes/class-wc-gateway-braintree.php:387
352
  msgid "The Private Key for your Braintree sandbox account."
353
  msgstr ""
354
 
355
+ #: includes/class-wc-gateway-braintree.php:391
356
  msgid "Sandbox Merchant ID"
357
  msgstr ""
358
 
359
+ #: includes/class-wc-gateway-braintree.php:394
360
  msgid "The Merchant ID for your Braintree sandbox account."
361
  msgstr ""
362
 
363
+ #: includes/class-wc-gateway-braintree.php:399
364
  msgid "Merchant Account IDs"
365
  msgstr ""
366
 
367
+ #: includes/class-wc-gateway-braintree.php:402
368
  msgid ""
369
  "Enter additional merchant account IDs if you do not want to use your "
370
  "Braintree account default. %1$sLearn more about merchant account IDs%2$s"
371
  msgstr ""
372
 
373
+ #: includes/class-wc-gateway-braintree.php:411
374
  msgid "Dynamic Descriptors"
375
  msgstr ""
376
 
377
+ #: includes/class-wc-gateway-braintree.php:414
378
  #. translators: Placeholders: %1$s - <p> tag, %2$s - </p> tag, %3$s - <a> tag,
379
  #. %4$s - </a> tag
380
  msgid ""
384
  "dynamic descriptors%4$s and are using an accepted format.%2$s"
385
  msgstr ""
386
 
387
+ #: includes/class-wc-gateway-braintree.php:418
388
  msgid "Name"
389
  msgstr ""
390
 
391
+ #: includes/class-wc-gateway-braintree.php:421
392
  msgid ""
393
  "The value in the business name field of a customer's statement. Company "
394
  "name/DBA section must be either 3, 7 or 12 characters and the product "
396
  "between for a total descriptor name of 22 characters)."
397
  msgstr ""
398
 
399
+ #: includes/class-wc-gateway-braintree.php:426
400
  msgid "Phone"
401
  msgstr ""
402
 
403
+ #: includes/class-wc-gateway-braintree.php:429
404
  msgid ""
405
  "The value in the phone number field of a customer's statement. Phone must "
406
  "be exactly 10 characters and can only contain numbers, dashes, parentheses "
407
  "and periods."
408
  msgstr ""
409
 
410
+ #: includes/class-wc-gateway-braintree.php:434
411
  msgid "URL"
412
  msgstr ""
413
 
414
+ #: includes/class-wc-gateway-braintree.php:437
415
  msgid ""
416
  "The value in the URL/web address field of a customer's statement. The URL "
417
  "must be 13 characters or less."
418
  msgstr ""
419
 
420
+ #: includes/class-wc-gateway-braintree.php:470
421
  msgid "Enter connection credentials manually"
422
  msgstr ""
423
 
424
+ #: includes/class-wc-gateway-braintree.php:494
425
  msgid "Disabled because the other gateway is not connected manually."
426
  msgstr ""
427
 
428
+ #: includes/class-wc-gateway-braintree.php:513
429
  msgid ""
430
  "You just connected your Braintree account to WooCommerce. You can start "
431
  "taking payments now."
432
  msgstr ""
433
 
434
+ #: includes/class-wc-gateway-braintree.php:514
435
  msgid ""
436
  "Once you have processed a payment, PayPal will review your application for "
437
  "final approval. Before you ship any goods make sure you have received a "
438
  "final approval for your Braintree account."
439
  msgstr ""
440
 
441
+ #: includes/class-wc-gateway-braintree.php:515
442
  msgid "Questions? We are a phone call away: 1-855-489-0345."
443
  msgstr ""
444
 
445
+ #: includes/class-wc-gateway-braintree.php:520
446
  msgid "Click button to create an account with Braintree and start transacting."
447
  msgstr ""
448
 
449
+ #: includes/class-wc-gateway-braintree.php:635
450
  msgid "Add merchant account ID for %s"
451
  msgstr ""
452
 
453
+ #: includes/class-wc-gateway-braintree.php:740
454
  msgid "Add merchant account ID for "
455
  msgstr ""
456
 
457
+ #: includes/class-wc-gateway-braintree.php:838
458
  msgid "Merchant Account ID (%s)"
459
  msgstr ""
460
 
461
+ #: includes/class-wc-gateway-braintree.php:849
462
  msgid "Enter merchant account ID"
463
  msgstr ""
464
 
465
+ #: includes/class-wc-gateway-braintree.php:850
466
  msgid "Remove this merchant account ID"
467
  msgstr ""
468
 
469
+ #: includes/class-wc-gateway-braintree.php:1363
470
  msgid "Production"
471
  msgstr ""
472
 
includes/class-wc-gateway-braintree-credit-card.php CHANGED
@@ -107,6 +107,12 @@ class WC_Gateway_Braintree_Credit_Card extends WC_Gateway_Braintree {
107
  */
108
  public function enqueue_gateway_assets() {
109
 
 
 
 
 
 
 
110
  parent::enqueue_gateway_assets();
111
 
112
  // advanced/kount fraud tool
107
  */
108
  public function enqueue_gateway_assets() {
109
 
110
+ // never enqueue the Credit Card assets on the Cart page
111
+ // this prevents them from overwriting the PayPal assets
112
+ if ( is_cart() ) {
113
+ return;
114
+ }
115
+
116
  parent::enqueue_gateway_assets();
117
 
118
  // advanced/kount fraud tool
includes/class-wc-gateway-braintree-paypal.php CHANGED
@@ -98,6 +98,7 @@ class WC_Gateway_Braintree_PayPal extends WC_Gateway_Braintree {
98
  $params = parent::get_gateway_js_localized_script_params();
99
 
100
  if ( is_cart() ) {
 
101
  $params['cart_nonce'] = wp_create_nonce( 'wc_' . $this->get_id() . '_cart_set_payment_method' );
102
  $params['cart_handler_url'] = add_query_arg( 'wc-api', get_class( $this ), home_url() );
103
  }
98
  $params = parent::get_gateway_js_localized_script_params();
99
 
100
  if ( is_cart() ) {
101
+ $params['client_token'] = $this->generate_client_token();
102
  $params['cart_nonce'] = wp_create_nonce( 'wc_' . $this->get_id() . '_cart_set_payment_method' );
103
  $params['cart_handler_url'] = add_query_arg( 'wc-api', get_class( $this ), home_url() );
104
  }
includes/class-wc-gateway-braintree.php CHANGED
@@ -122,21 +122,12 @@ class WC_Gateway_Braintree extends WC_Braintree_Framework\SV_WC_Payment_Gateway_
122
 
123
  $params = $this->get_payment_form_js_localized_script_params();
124
 
125
- if ( $this->is_payment_form_page() || ( is_cart() && $this->is_paypal_gateway() ) ) {
126
 
127
  $params['generic_error_message'] = __( 'Oops, something went wrong. Please try a different payment method.', 'woocommerce-gateway-paypal-powered-by-braintree' );
128
 
129
  // client token
130
- try {
131
-
132
- $result = $this->get_api()->get_client_token( array( 'merchantAccountId' => $this->get_merchant_account_id() ) );
133
-
134
- $params['client_token'] = $result->get_client_token();
135
-
136
- } catch ( WC_Braintree_Framework\SV_WC_Plugin_Exception $e ) {
137
-
138
- $this->add_debug_message( $e->getMessage(), 'error' );
139
- }
140
  }
141
 
142
  // add a cart payment nonce if available
@@ -148,6 +139,30 @@ class WC_Gateway_Braintree extends WC_Braintree_Framework\SV_WC_Payment_Gateway_
148
  }
149
 
150
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
151
  /**
152
  * Validate the payment nonce exists
153
  *
122
 
123
  $params = $this->get_payment_form_js_localized_script_params();
124
 
125
+ if ( $this->is_payment_form_page() ) {
126
 
127
  $params['generic_error_message'] = __( 'Oops, something went wrong. Please try a different payment method.', 'woocommerce-gateway-paypal-powered-by-braintree' );
128
 
129
  // client token
130
+ $params['client_token'] = $this->generate_client_token();
 
 
 
 
 
 
 
 
 
131
  }
132
 
133
  // add a cart payment nonce if available
139
  }
140
 
141
 
142
+ /**
143
+ * Generates a new client token for the payment form JS.
144
+ *
145
+ * @since 2.0.3
146
+ *
147
+ * @return string
148
+ */
149
+ protected function generate_client_token() {
150
+
151
+ try {
152
+
153
+ $result = $this->get_api()->get_client_token( array( 'merchantAccountId' => $this->get_merchant_account_id() ) );
154
+
155
+ return $result->get_client_token();
156
+
157
+ } catch ( WC_Braintree_Framework\SV_WC_Plugin_Exception $e ) {
158
+
159
+ $this->add_debug_message( $e->getMessage(), 'error' );
160
+
161
+ return '';
162
+ }
163
+ }
164
+
165
+
166
  /**
167
  * Validate the payment nonce exists
168
  *
lib/skyverge/woocommerce/payment-gateway/class-sv-wc-payment-gateway.php CHANGED
@@ -547,7 +547,7 @@ abstract class SV_WC_Payment_Gateway extends \WC_Payment_Gateway {
547
  $object_name = str_replace( '-', '_', $handle ) . '_params';
548
 
549
  // If the plugin's JS params already exists in the localized data, bail
550
- if ( $wp_scripts instanceof WP_Scripts && strpos( $wp_scripts->get_data( $handle, 'data' ), $object_name ) ) {
551
  return;
552
  }
553
 
547
  $object_name = str_replace( '-', '_', $handle ) . '_params';
548
 
549
  // If the plugin's JS params already exists in the localized data, bail
550
+ if ( $wp_scripts instanceof \WP_Scripts && strpos( $wp_scripts->get_data( $handle, 'data' ), $object_name ) ) {
551
  return;
552
  }
553
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: automattic, akeda, allendav, royho, slash1andy, woosteve, spraveen
3
  Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, sales, sell, shop, shopping, cart, checkout, configurable, paypal, braintree
4
  Requires at least: 4.4
5
  Tested up to: 4.7.5
6
- Stable tag: 2.0.2
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
@@ -122,6 +122,9 @@ New feature requests and bugs reports can be made in the plugin forum.
122
 
123
  == Changelog ==
124
 
 
 
 
125
  = 2.0.2 =
126
  * Fix - Ensure refunds succeed for legacy orders that are missing the necessary meta data
127
  * Fix - Add fallbacks for certain subscriptions upgrades after WooCommerce 3.0 compatibility issues
3
  Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, sales, sell, shop, shopping, cart, checkout, configurable, paypal, braintree
4
  Requires at least: 4.4
5
  Tested up to: 4.7.5
6
+ Stable tag: 2.0.3
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
122
 
123
  == Changelog ==
124
 
125
+ = 2.0.3 =
126
+ * Fix - Add a missing namespace that could cause JavaScript issues with some configurations
127
+
128
  = 2.0.2 =
129
  * Fix - Ensure refunds succeed for legacy orders that are missing the necessary meta data
130
  * Fix - Add fallbacks for certain subscriptions upgrades after WooCommerce 3.0 compatibility issues
woocommerce-gateway-paypal-powered-by-braintree.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: Receive credit card or PayPal payments using Paypal Powered by Braintree. A server with cURL, SSL support, and a valid SSL certificate is required (for security reasons) for this gateway to function. Requires PHP 5.4+
6
  * Author: WooCommerce
7
  * Author URI: http://woocommerce.com/
8
- * Version: 2.0.2
9
  *
10
  * Copyright (c) 2016-2017, Automattic, Inc.
11
  *
5
  * Description: Receive credit card or PayPal payments using Paypal Powered by Braintree. A server with cURL, SSL support, and a valid SSL certificate is required (for security reasons) for this gateway to function. Requires PHP 5.4+
6
  * Author: WooCommerce
7
  * Author URI: http://woocommerce.com/
8
+ * Version: 2.0.3
9
  *
10
  * Copyright (c) 2016-2017, Automattic, Inc.
11
  *