From 05d3f267b3da256bce373730bfae66b6ab5afdb0 Mon Sep 17 00:00:00 2001 From: David Remer Date: Fri, 18 Sep 2020 13:06:48 +0300 Subject: [PATCH 1/4] enable merchant to hide credentials after showing them --- modules/ppcp-onboarding/assets/css/onboarding.css | 15 ++++++++++++++- modules/ppcp-onboarding/assets/js/settings.js | 8 ++++---- modules/ppcp-wc-gateway/services.php | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/ppcp-onboarding/assets/css/onboarding.css b/modules/ppcp-onboarding/assets/css/onboarding.css index 878a8715d..8d49b4ecf 100644 --- a/modules/ppcp-onboarding/assets/css/onboarding.css +++ b/modules/ppcp-onboarding/assets/css/onboarding.css @@ -4,9 +4,22 @@ #field-client_secret, #field-client_id, -#field-merchant_id { +#field-merchant_id{ display: none; } +#field-client_secret.show, +#field-client_id.show, +#field-merchant_id.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: inherit; +} #field-toggle_manual_input button { color: #0073aa; diff --git a/modules/ppcp-onboarding/assets/js/settings.js b/modules/ppcp-onboarding/assets/js/settings.js index e2ad199e0..4fdb5203b 100644 --- a/modules/ppcp-onboarding/assets/js/settings.js +++ b/modules/ppcp-onboarding/assets/js/settings.js @@ -64,10 +64,10 @@ const groupToggleSelect = (selector, group) => { 'click', (event) => { event.preventDefault(); - document.querySelector('#field-toggle_manual_input').style.display = 'none'; - 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-client_id').classList.toggle('show'); + document.querySelector('#field-client_secret').classList.toggle('show'); } ) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 0dba777cd..db28f5421 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -236,7 +236,7 @@ return array( 'toggle_manual_input' => array( 'type' => 'ppcp-text', 'title' => __( 'Manual mode', 'paypal-payments-for-woocommerce' ), - 'text' => '', + 'text' => '', 'screens' => array( State::STATE_START, State::STATE_PROGRESSIVE, From de28575d590479b0790015155a8961de24fc6795 Mon Sep 17 00:00:00 2001 From: David Remer Date: Wed, 23 Sep 2020 12:28:44 +0300 Subject: [PATCH 2/4] use display:unset to avoid the underline disappearing --- modules/ppcp-onboarding/assets/css/onboarding.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-onboarding/assets/css/onboarding.css b/modules/ppcp-onboarding/assets/css/onboarding.css index 8d49b4ecf..ae1f080b2 100644 --- a/modules/ppcp-onboarding/assets/css/onboarding.css +++ b/modules/ppcp-onboarding/assets/css/onboarding.css @@ -18,7 +18,7 @@ display: none; } #field-toggle_manual_input.show span.hide { - display: inherit; + display: unset; } #field-toggle_manual_input button { From b01f03663ecab1b1ae88a05aa4981275707169d5 Mon Sep 17 00:00:00 2001 From: David Remer Date: Thu, 24 Sep 2020 07:59:01 +0300 Subject: [PATCH 3/4] add heading for checkout settings --- modules/ppcp-wc-gateway/services.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index db28f5421..51fd161c0 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -287,6 +287,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', From 6ee4ca0b2a992a49d34086ce479c6ed2a35f8b8d Mon Sep 17 00:00:00 2001 From: David Remer Date: Thu, 24 Sep 2020 08:02:32 +0300 Subject: [PATCH 4/4] rename installation prefix to invoice prefix --- modules/ppcp-wc-gateway/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 0dba777cd..04aa0172a 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -503,7 +503,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' ),