diff --git a/modules/ppcp-onboarding/assets/js/onboarding.js b/modules/ppcp-onboarding/assets/js/onboarding.js index 9a1894c0a..4db2ad4ec 100644 --- a/modules/ppcp-onboarding/assets/js/onboarding.js +++ b/modules/ppcp-onboarding/assets/js/onboarding.js @@ -257,6 +257,11 @@ function ppcp_onboarding_productionCallback(...args) { } ); + const isSandboxInBackend = PayPalCommerceGatewayOnboarding.current_env === 'sandbox'; + if (sandboxSwitchElement.checked !== isSandboxInBackend) { + sandboxSwitchElement.checked = isSandboxInBackend; + } + updateOptionsState(); const settingsContainer = document.querySelector('#mainform .form-table'); diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php index e12cbb0cf..81e25ad31 100644 --- a/modules/ppcp-onboarding/services.php +++ b/modules/ppcp-onboarding/services.php @@ -132,6 +132,7 @@ return array( return new OnboardingAssets( $container->get( 'onboarding.url' ), $state, + $container->get( 'onboarding.environment' ), $login_seller_endpoint ); }, diff --git a/modules/ppcp-onboarding/src/Assets/OnboardingAssets.php b/modules/ppcp-onboarding/src/Assets/OnboardingAssets.php index fbacf3cc1..b05bd3023 100644 --- a/modules/ppcp-onboarding/src/Assets/OnboardingAssets.php +++ b/modules/ppcp-onboarding/src/Assets/OnboardingAssets.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Onboarding\Assets; use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint; +use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\State; /** @@ -31,6 +32,13 @@ class OnboardingAssets { */ private $state; + /** + * The Environment. + * + * @var Environment + */ + private $environment; + /** * The LoginSeller Endpoint. * @@ -43,16 +51,19 @@ class OnboardingAssets { * * @param string $module_url The URL to the module. * @param State $state The State object. + * @param Environment $environment The Environment. * @param LoginSellerEndpoint $login_seller_endpoint The LoginSeller endpoint. */ public function __construct( string $module_url, State $state, + Environment $environment, LoginSellerEndpoint $login_seller_endpoint ) { $this->module_url = untrailingslashit( $module_url ); $this->state = $state; + $this->environment = $environment; $this->login_seller_endpoint = $login_seller_endpoint; } @@ -109,6 +120,7 @@ class OnboardingAssets { 'sandbox_state' => State::get_state_name( $this->state->sandbox_state() ), 'production_state' => State::get_state_name( $this->state->production_state() ), 'current_state' => State::get_state_name( $this->state->current_state() ), + 'current_env' => $this->environment->current_environment(), 'error_messages' => array( 'no_credentials' => __( 'Enter the credentials.', 'woocommerce-paypal-payments' ), ),