From bda83055f7160d0b3c3255b3c8883b7d1a8c1a01 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Tue, 19 Nov 2024 17:34:55 +0400 Subject: [PATCH] Disable the old onboarding assets when the new settings UI is enabled --- .../ppcp-onboarding/src/OnboardingModule.php | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/modules/ppcp-onboarding/src/OnboardingModule.php b/modules/ppcp-onboarding/src/OnboardingModule.php index 40e137832..3ec48fabf 100644 --- a/modules/ppcp-onboarding/src/OnboardingModule.php +++ b/modules/ppcp-onboarding/src/OnboardingModule.php @@ -44,26 +44,33 @@ class OnboardingModule implements ServiceModule, ExtendingModule, ExecutableModu */ public function run( ContainerInterface $c ): bool { - $asset_loader = $c->get( 'onboarding.assets' ); - /** - * The OnboardingAssets. - * - * @var OnboardingAssets $asset_loader - */ - add_action( - 'admin_enqueue_scripts', - array( - $asset_loader, - 'register', - ) - ); - add_action( - 'woocommerce_settings_checkout', - array( - $asset_loader, - 'enqueue', - ) - ); + if ( ! apply_filters( + // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores + 'woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled', + getenv( 'PCP_SETTINGS_ENABLED' ) === '1' + ) ) { + + $asset_loader = $c->get( 'onboarding.assets' ); + /** + * The OnboardingAssets. + * + * @var OnboardingAssets $asset_loader + */ + add_action( + 'admin_enqueue_scripts', + array( + $asset_loader, + 'register', + ) + ); + add_action( + 'woocommerce_settings_checkout', + array( + $asset_loader, + 'enqueue', + ) + ); + } add_filter( 'woocommerce_form_field',