woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge pull request #496 from woocommerce/fix-560-merge-conflict

Browse source 
Fix merge conflict on #477
This commit is contained in:
Emili Castells 2022-02-15 12:38:42 +01:00 • committed by GitHub
commit c1cd718ecc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ppcp-wc-gateway/services.php
View file

@ -746,10 +746,15 @@ return array(
'class' => array(), 'class' => array(),
'input_class' => array( 'wc-enhanced-select' ), 'input_class' => array( 'wc-enhanced-select' ),
'default' => array(), 'default' => array(),
'desc_tip' => true, 'desc_tip' => false,
'description' => __( 'description' => sprintf(
'By default all possible funding sources will be shown. You can disable some sources, if you wish.', // translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
'woocommerce-paypal-payments' __( 'By default, all possible funding sources will be shown. This setting can disable funding sources such as Credit Cards, Pay Later, Venmo, or other %1$sAlternative Payment Methods%2$s.', 'woocommerce-paypal-payments' ),
'<a
href="https://developer.paypal.com/docs/checkout/apm/"
target="_blank"
>',
'</a>'
), ),
'options' => array( 'options' => array(
'card' => _x( 'Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-payments' ), 'card' => _x( 'Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-payments' ),
@ -1989,7 +1994,7 @@ return array(
'options' => array( 'options' => array(
'NO_3D_SECURE' => __( 'No 3D Secure (transaction will be denied if 3D Secure is required)', 'woocommerce-paypal-payments' ), 'NO_3D_SECURE' => __( 'No 3D Secure (transaction will be denied if 3D Secure is required)', 'woocommerce-paypal-payments' ),
'SCA_WHEN_REQUIRED' => __( '3D Secure when required', 'woocommerce-paypal-payments' ), 'SCA_WHEN_REQUIRED' => __( '3D Secure when required', 'woocommerce-paypal-payments' ),
'SCA_ALWAYS' => __( 'Always trigger 3D Secure', 'woocommerce-paypal-payments' ), 'SCA_ALWAYS' => __( 'Always trigger 3D Secure', 'woocommerce-paypal-payments' ),
), ),
'screens' => array( 'screens' => array(
State::STATE_ONBOARDED, State::STATE_ONBOARDED,