woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 12:25:15 +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

14
modules/ppcp-onboarding/assets/css/onboarding.css
View file

@ -8,6 +8,20 @@
#field-merchant_email{
display: none;
}
#field-client_secret.show,
#field-client_id.show,
#field-merchant_id.show,
#field-merchant_email.show {
display: table-row;
}
#field-toggle_manual_input span.hide,
#field-toggle_manual_input.show span.show{
display: none;
}
#field-toggle_manual_input.show span.hide {
display: unset;
}
#field-toggle_manual_input button {
color: #0073aa;

10
modules/ppcp-onboarding/assets/js/settings.js
View file

@ -64,11 +64,11 @@ const groupToggleSelect = (selector, group) => {
'click',
(event) => {
event.preventDefault();
document.querySelector('#field-toggle_manual_input').style.display = 'none';
document.querySelector('#field-merchant_email').style.display = 'table-row';
document.querySelector('#field-merchant_id').style.display = 'table-row';
document.querySelector('#field-client_id').style.display = 'table-row';
document.querySelector('#field-client_secret').style.display = 'table-row';
document.querySelector('#field-toggle_manual_input').classList.toggle('show');
document.querySelector('#field-merchant_id').classList.toggle('show');
document.querySelector('#field-merchant_email').classList.toggle('show');
document.querySelector('#field-client_id').classList.toggle('show');
document.querySelector('#field-client_secret').classList.toggle('show');
}
)

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' ),