woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

resolve merge conflict

Browse source
This commit is contained in:
David Remer 2020-09-24 10:54:28 +03:00
commit 16ad8c9cd1
3 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -266,6 +266,17 @@ return array(
'requirements' => array(),
'gateway' => 'paypal',
),
'checkout_settings_heading' => array(
'heading' => __( 'PayPal Checkout Plugin Settings', 'paypal-payments-for-woocommerce' ),
'type' => 'ppcp-heading',
'screens' => array(
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
),
'requirements' => array(),
'gateway' => 'paypal',
),
'title' => array(
'title' => __( 'Title', 'paypal-payments-for-woocommerce' ),
'type' => 'text',
@ -481,7 +492,7 @@ return array(
'gateway' => 'paypal',
),
'prefix' => array(
'title' => __( 'Installation prefix', 'paypal-payments-for-woocommerce' ),
'title' => __( 'Invoice prefix', 'paypal-payments-for-woocommerce' ),
'type' => 'text',
'desc_tip' => true,
'description' => __( 'If you use your PayPal account with more than one installation, please use a distinct prefix to seperate those installations. Please do not use numbers in your prefix.', 'paypal-payments-for-woocommerce' ),