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 11

Fix sandbox checkbox

Browse source 
Sometimes the state of UI may get restored after page reload and will not match the server settings
This commit is contained in:
Alex P 2022-02-08 10:25:01 +02:00
parent cb2adfd044
commit 44cb17107c
3 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/ppcp-onboarding/assets/js/onboarding.js
View file

@ -257,6 +257,11 @@ function ppcp_onboarding_productionCallback(...args) {
} }
); );
const isSandboxInBackend = PayPalCommerceGatewayOnboarding.current_env === 'sandbox';
if (sandboxSwitchElement.checked !== isSandboxInBackend) {
sandboxSwitchElement.checked = isSandboxInBackend;
}
updateOptionsState(); updateOptionsState();
const settingsContainer = document.querySelector('#mainform .form-table'); const settingsContainer = document.querySelector('#mainform .form-table');

1
modules/ppcp-onboarding/services.php
View file

@ -132,6 +132,7 @@ return array(
return new OnboardingAssets( return new OnboardingAssets(
$container->get( 'onboarding.url' ), $container->get( 'onboarding.url' ),
$state, $state,
$container->get( 'onboarding.environment' ),
$login_seller_endpoint $login_seller_endpoint
); );
}, },

12
modules/ppcp-onboarding/src/Assets/OnboardingAssets.php
View file

@ -10,6 +10,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Onboarding\Assets; namespace WooCommerce\PayPalCommerce\Onboarding\Assets;
use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint; use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\Onboarding\State;
/** /**
@ -31,6 +32,13 @@ class OnboardingAssets {
*/ */
private $state; private $state;
/**
* The Environment.
*
* @var Environment
*/
private $environment;
/** /**
* The LoginSeller Endpoint. * The LoginSeller Endpoint.
* *
@ -43,16 +51,19 @@ class OnboardingAssets {
* *
* @param string $module_url The URL to the module. * @param string $module_url The URL to the module.
* @param State $state The State object. * @param State $state The State object.
* @param Environment $environment The Environment.
* @param LoginSellerEndpoint $login_seller_endpoint The LoginSeller endpoint. * @param LoginSellerEndpoint $login_seller_endpoint The LoginSeller endpoint.
*/ */
public function __construct( public function __construct(
string $module_url, string $module_url,
State $state, State $state,
Environment $environment,
LoginSellerEndpoint $login_seller_endpoint LoginSellerEndpoint $login_seller_endpoint
) { ) {
$this->module_url = untrailingslashit( $module_url ); $this->module_url = untrailingslashit( $module_url );
$this->state = $state; $this->state = $state;
$this->environment = $environment;
$this->login_seller_endpoint = $login_seller_endpoint; $this->login_seller_endpoint = $login_seller_endpoint;
} }
@ -109,6 +120,7 @@ class OnboardingAssets {
'sandbox_state' => State::get_state_name( $this->state->sandbox_state() ), 'sandbox_state' => State::get_state_name( $this->state->sandbox_state() ),
'production_state' => State::get_state_name( $this->state->production_state() ), 'production_state' => State::get_state_name( $this->state->production_state() ),
'current_state' => State::get_state_name( $this->state->current_state() ), 'current_state' => State::get_state_name( $this->state->current_state() ),
'current_env' => $this->environment->current_environment(),
'error_messages' => array( 'error_messages' => array(
'no_credentials' => __( 'Enter the credentials.', 'woocommerce-paypal-payments' ), 'no_credentials' => __( 'Enter the credentials.', 'woocommerce-paypal-payments' ),
), ),