From 5917ddae5379c75b767b36e40d179ff27e634cdd Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Wed, 20 Nov 2024 16:00:16 +0400 Subject: [PATCH 1/9] Add an action to hook into "inside the settings page header" --- modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php b/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php index 73bd843d8..43ae398e9 100644 --- a/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php +++ b/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php @@ -76,6 +76,7 @@ class HeaderRenderer { . __( 'Submit a bug', 'woocommerce-paypal-payments' ) . ' + ' . do_action( 'woocommerce_paypal_payments_inside_settings_page_header' ) . '
From a2375ba94a8928b4afce721127ff020cb081a3dd Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Wed, 20 Nov 2024 17:34:58 +0400 Subject: [PATCH 2/9] Create a filter to switch the UI if the flag is enabled --- .../ppcp-onboarding/src/OnboardingModule.php | 4 +++- modules/ppcp-settings/src/SettingsModule.php | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/ppcp-onboarding/src/OnboardingModule.php b/modules/ppcp-onboarding/src/OnboardingModule.php index 3ec48fabf..5c2899491 100644 --- a/modules/ppcp-onboarding/src/OnboardingModule.php +++ b/modules/ppcp-onboarding/src/OnboardingModule.php @@ -13,6 +13,7 @@ use WooCommerce\PayPalCommerce\Onboarding\Endpoint\UpdateSignupLinksEndpoint; use WooCommerce\PayPalCommerce\Onboarding\Assets\OnboardingAssets; use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint; use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingRenderer; +use WooCommerce\PayPalCommerce\Settings\SettingsModule; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ExtendingModule; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait; @@ -48,7 +49,8 @@ class OnboardingModule implements ServiceModule, ExtendingModule, ExecutableModu // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 'woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled', getenv( 'PCP_SETTINGS_ENABLED' ) === '1' - ) ) { + ) || SettingsModule::should_use_the_old_ui() + ) { $asset_loader = $c->get( 'onboarding.assets' ); /** diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index c2e688c7f..86af58454 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -22,10 +22,20 @@ use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; class SettingsModule implements ServiceModule, ExecutableModule { use ModuleClassNameIdTrait; + /** + * Returns whether the old settings UI should be loaded. + */ + public static function should_use_the_old_ui(): bool { + return apply_filters( 'woocommerce_paypal_payments_should_use_the_old_ui', false ); + } + /** * {@inheritDoc} */ public function services() : array { + if ( self::should_use_the_old_ui() ) { + return array(); + } return require __DIR__ . '/../services.php'; } @@ -33,6 +43,20 @@ class SettingsModule implements ServiceModule, ExecutableModule { * {@inheritDoc} */ public function run( ContainerInterface $container ) : bool { + if ( self::should_use_the_old_ui() ) { + add_action( + 'woocommerce_paypal_payments_inside_settings_page_header', + static function () : void { + echo sprintf( + '%s', + esc_html__( 'Switch to new settings UI', 'woocommerce-paypal-payments' ) + ); + } + ); + + return true; + } + add_action( 'admin_enqueue_scripts', /** From d1452c6722ad31b420e94ffc55f7d5812e60bbe2 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Wed, 20 Nov 2024 18:23:36 +0400 Subject: [PATCH 3/9] Create the switchSettingsUi script enqueueing logic --- modules/ppcp-settings/src/SettingsModule.php | 27 +++++++++++++++++--- modules/ppcp-settings/webpack.config.js | 1 + modules/ppcp-wc-gateway/services.php | 3 ++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index 86af58454..16c943b41 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -33,9 +33,6 @@ class SettingsModule implements ServiceModule, ExecutableModule { * {@inheritDoc} */ public function services() : array { - if ( self::should_use_the_old_ui() ) { - return array(); - } return require __DIR__ . '/../services.php'; } @@ -54,6 +51,30 @@ class SettingsModule implements ServiceModule, ExecutableModule { } ); + add_action( + 'admin_enqueue_scripts', + static function () use ( $container ) { + $module_url = $container->get('settings.url'); + $script_asset_file = require dirname( realpath( __FILE__ ) ?: '', 2 ) . '/assets/switchSettingsUi.asset.php'; + + wp_register_script( + 'ppcp-switch-settings-ui', + untrailingslashit( $module_url ) . '/assets/switchSettingsUi.js', + $script_asset_file['dependencies'], + $script_asset_file['version'], + true + ); + + wp_localize_script( + 'ppcp-switch-settings-ui', + 'PayPalCommerceGatewayOrderTrackingInfo', + array() + ); + + wp_enqueue_script( 'ppcp-switch-settings-ui' ); + } + ); + return true; } diff --git a/modules/ppcp-settings/webpack.config.js b/modules/ppcp-settings/webpack.config.js index 93cd4afb5..c37c61c47 100644 --- a/modules/ppcp-settings/webpack.config.js +++ b/modules/ppcp-settings/webpack.config.js @@ -7,6 +7,7 @@ module.exports = { ...{ entry: { index: path.resolve( process.cwd(), 'resources/js', 'index.js' ), + switchSettingsUi: path.resolve( process.cwd(), 'resources/js', 'switchSettingsUi.js' ), style: path.resolve( process.cwd(), 'resources/css', 'style.scss' ), }, }, diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 94f787b4d..ee7b99ff5 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -24,6 +24,7 @@ use WooCommerce\PayPalCommerce\Googlepay\GooglePayGateway; use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingOptionsRenderer; use WooCommerce\PayPalCommerce\Onboarding\State; +use WooCommerce\PayPalCommerce\Settings\SettingsModule; use WooCommerce\PayPalCommerce\WcGateway\Admin\RenderReauthorizeAction; use WooCommerce\PayPalCommerce\WcGateway\Assets\VoidButtonAssets; use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment; @@ -2067,6 +2068,6 @@ return array( }, 'wcgateway.settings.admin-settings-enabled' => static function( ContainerInterface $container ): bool { - return $container->has( 'settings.url' ); + return $container->has( 'settings.url' ) && ! SettingsModule::should_use_the_old_ui(); }, ); From 6d6835c998885136b26043ad272aeee7ffa3b019 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Wed, 20 Nov 2024 20:16:35 +0400 Subject: [PATCH 4/9] Create the switching logic --- .../resources/js/switchSettingsUi.js | 32 ++++++++ modules/ppcp-settings/services.php | 7 ++ .../src/Endpoint/SwitchSettingsUiEndpoint.php | 82 +++++++++++++++++++ modules/ppcp-settings/src/SettingsModule.php | 20 ++++- 4 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 modules/ppcp-settings/resources/js/switchSettingsUi.js create mode 100644 modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php diff --git a/modules/ppcp-settings/resources/js/switchSettingsUi.js b/modules/ppcp-settings/resources/js/switchSettingsUi.js new file mode 100644 index 000000000..55a9e6a01 --- /dev/null +++ b/modules/ppcp-settings/resources/js/switchSettingsUi.js @@ -0,0 +1,32 @@ +document.addEventListener('DOMContentLoaded', () => { + const config = ppcpSwitchSettingsUi; + const button = document.querySelector('.button.button-settings-switch-ui'); + + if ( ! typeof config || !button) { + return; + } + + button.addEventListener('click', () => { + fetch(config.endpoint, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + nonce: config.nonce, + }), + }) + .then((response) => { + if (!response.ok) { + throw new Error('Network response was not ok'); + } + return response.json(); + }) + .then((data) => { + window.location.reload(); + }) + .catch((error) => { + console.error('Error:', error); + }); + }); +}); diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php index 80df22370..76ec8337a 100644 --- a/modules/ppcp-settings/services.php +++ b/modules/ppcp-settings/services.php @@ -10,6 +10,7 @@ declare( strict_types = 1 ); namespace WooCommerce\PayPalCommerce\Settings; use WooCommerce\PayPalCommerce\Settings\Endpoint\ConnectManualRestEndpoint; +use WooCommerce\PayPalCommerce\Settings\Endpoint\SwitchSettingsUiEndpoint; use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Settings\Endpoint\OnboardingRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile; @@ -109,4 +110,10 @@ return array( return in_array( $country, $eligible_countries, true ); }, + 'settings.switch-ui.endpoint' => static function ( ContainerInterface $container ) : SwitchSettingsUiEndpoint { + return new SwitchSettingsUiEndpoint( + $container->get( 'woocommerce.logger.woocommerce' ), + $container->get( 'button.request-data' ), + ); + }, ); diff --git a/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php new file mode 100644 index 000000000..1c0479ddb --- /dev/null +++ b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php @@ -0,0 +1,82 @@ +logger = $logger; + $this->request_data = $request_data; + } + + /** + * Handles the request. + */ + public function handle_request(): void { + if ( ! current_user_can( 'manage_woocommerce' ) ) { + wp_send_json_error( 'Not an admin.', 403 ); + return; + } + + try { + $this->request_data->read_request( $this->nonce() ); + update_option( self::OPTION_NAME_SHOULD_USE_OLD_UI, false ); + + wp_send_json_success(); + } catch ( Exception $error ) { + wp_send_json_error( array( 'message' => $error->getMessage() ), 500 ); + } + } + + /** + * The nonce. + * + * @return string + */ + public static function nonce(): string { + return self::ENDPOINT; + } +} diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index 16c943b41..233922b8f 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Settings; use WooCommerce\PayPalCommerce\Settings\Endpoint\ConnectManualRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\OnboardingRestEndpoint; +use WooCommerce\PayPalCommerce\Settings\Endpoint\SwitchSettingsUiEndpoint; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait; use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ServiceModule; @@ -26,7 +27,10 @@ class SettingsModule implements ServiceModule, ExecutableModule { * Returns whether the old settings UI should be loaded. */ public static function should_use_the_old_ui(): bool { - return apply_filters( 'woocommerce_paypal_payments_should_use_the_old_ui', false ); + return apply_filters( + 'woocommerce_paypal_payments_should_use_the_old_ui', + get_option(SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI) === '1' + ); } /** @@ -45,7 +49,7 @@ class SettingsModule implements ServiceModule, ExecutableModule { 'woocommerce_paypal_payments_inside_settings_page_header', static function () : void { echo sprintf( - '%s', + '%s', esc_html__( 'Switch to new settings UI', 'woocommerce-paypal-payments' ) ); } @@ -67,14 +71,22 @@ class SettingsModule implements ServiceModule, ExecutableModule { wp_localize_script( 'ppcp-switch-settings-ui', - 'PayPalCommerceGatewayOrderTrackingInfo', - array() + 'ppcpSwitchSettingsUi', + array( + 'endpoint' => \WC_AJAX::get_endpoint( SwitchSettingsUiEndpoint::ENDPOINT ), + 'nonce' => wp_create_nonce( SwitchSettingsUiEndpoint::nonce() ), + ) ); wp_enqueue_script( 'ppcp-switch-settings-ui' ); } ); + $endpoint = $container->get( 'settings.switch-ui.endpoint' ); + assert( $endpoint instanceof SwitchSettingsUiEndpoint ); + + add_action( 'wc_ajax_' . SwitchSettingsUiEndpoint::ENDPOINT, array( $endpoint, 'handle_request' ) ); + return true; } From df9a0befaa7b3920dffd333c4301376cc394cf58 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 21 Nov 2024 15:21:23 +0400 Subject: [PATCH 5/9] Fix the button placing --- modules/ppcp-settings/src/SettingsModule.php | 14 ++++++-------- .../src/Settings/HeaderRenderer.php | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index 233922b8f..188db04c7 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -29,7 +29,7 @@ class SettingsModule implements ServiceModule, ExecutableModule { public static function should_use_the_old_ui(): bool { return apply_filters( 'woocommerce_paypal_payments_should_use_the_old_ui', - get_option(SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI) === '1' + ( bool ) get_option(SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI) === true ); } @@ -45,14 +45,12 @@ class SettingsModule implements ServiceModule, ExecutableModule { */ public function run( ContainerInterface $container ) : bool { if ( self::should_use_the_old_ui() ) { - add_action( + add_filter( 'woocommerce_paypal_payments_inside_settings_page_header', - static function () : void { - echo sprintf( - '%s', - esc_html__( 'Switch to new settings UI', 'woocommerce-paypal-payments' ) - ); - } + static fn() : string => sprintf( + '%s', + esc_html__( 'Switch to new settings UI', 'woocommerce-paypal-payments' ) + ) ); add_action( diff --git a/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php b/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php index 43ae398e9..4a304e335 100644 --- a/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php +++ b/modules/ppcp-wc-gateway/src/Settings/HeaderRenderer.php @@ -76,7 +76,7 @@ class HeaderRenderer { . __( 'Submit a bug', 'woocommerce-paypal-payments' ) . ' - ' . do_action( 'woocommerce_paypal_payments_inside_settings_page_header' ) . ' + ' . apply_filters( 'woocommerce_paypal_payments_inside_settings_page_header', '' ) . '
From ae2756327481ae8435733b316155a90d4b370d65 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 21 Nov 2024 16:32:30 +0400 Subject: [PATCH 6/9] Fix the cs --- modules/ppcp-settings/services.php | 2 +- .../src/Endpoint/SwitchSettingsUiEndpoint.php | 12 ++++++------ modules/ppcp-settings/src/SettingsModule.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php index 76ec8337a..20ea96b09 100644 --- a/modules/ppcp-settings/services.php +++ b/modules/ppcp-settings/services.php @@ -110,7 +110,7 @@ return array( return in_array( $country, $eligible_countries, true ); }, - 'settings.switch-ui.endpoint' => static function ( ContainerInterface $container ) : SwitchSettingsUiEndpoint { + 'settings.switch-ui.endpoint' => static function ( ContainerInterface $container ) : SwitchSettingsUiEndpoint { return new SwitchSettingsUiEndpoint( $container->get( 'woocommerce.logger.woocommerce' ), $container->get( 'button.request-data' ), diff --git a/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php index 1c0479ddb..494c46d9f 100644 --- a/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php +++ b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php @@ -21,8 +21,8 @@ class SwitchSettingsUiEndpoint { use RequestTrait; - public const ENDPOINT = 'ppcp-settings-switch-ui'; - public const OPTION_NAME_SHOULD_USE_OLD_UI = 'woocommerce_ppcp-settings-should-use-old-ui'; + public const ENDPOINT = 'ppcp-settings-switch-ui'; + public const OPTION_NAME_SHOULD_USE_OLD_UI = 'woocommerce_ppcp-settings-should-use-old-ui'; /** * The RequestData. @@ -41,15 +41,15 @@ class SwitchSettingsUiEndpoint { /** * SwitchSettingsUiEndpoint constructor. * - * @param LoggerInterface $logger The logger. - * @param RequestData $request_data The Request data. + * @param LoggerInterface $logger The logger. + * @param RequestData $request_data The Request data. */ public function __construct( LoggerInterface $logger, RequestData $request_data ) { - $this->logger = $logger; - $this->request_data = $request_data; + $this->logger = $logger; + $this->request_data = $request_data; } /** diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index 188db04c7..1207d5264 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -29,7 +29,7 @@ class SettingsModule implements ServiceModule, ExecutableModule { public static function should_use_the_old_ui(): bool { return apply_filters( 'woocommerce_paypal_payments_should_use_the_old_ui', - ( bool ) get_option(SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI) === true + (bool) get_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI ) === true ); } @@ -56,7 +56,7 @@ class SettingsModule implements ServiceModule, ExecutableModule { add_action( 'admin_enqueue_scripts', static function () use ( $container ) { - $module_url = $container->get('settings.url'); + $module_url = $container->get( 'settings.url' ); $script_asset_file = require dirname( realpath( __FILE__ ) ?: '', 2 ) . '/assets/switchSettingsUi.asset.php'; wp_register_script( From 0e6f9e3f798619d9f890f71434057a166cacfe0f Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 21 Nov 2024 16:35:41 +0400 Subject: [PATCH 7/9] Remove the option on plugin uninstallation --- modules/ppcp-uninstall/services.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/ppcp-uninstall/services.php b/modules/ppcp-uninstall/services.php index ca67dc71b..51ff935af 100644 --- a/modules/ppcp-uninstall/services.php +++ b/modules/ppcp-uninstall/services.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Uninstall; use WooCommerce\PayPalCommerce\ApiClient\Repository\PayPalRequestIdRepository; +use WooCommerce\PayPalCommerce\Settings\Endpoint\SwitchSettingsUiEndpoint; use WooCommerce\PayPalCommerce\Uninstall\Assets\ClearDatabaseAssets; use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway; @@ -34,6 +35,7 @@ return array( WebhookSimulation::OPTION_ID, WebhookRegistrar::KEY, 'ppcp_payment_tokens_migration_initialized', + SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI, ); }, From f75952f50a813b06de30b4e225426de559fa4411 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 21 Nov 2024 16:37:53 +0400 Subject: [PATCH 8/9] Fix psalm --- modules/ppcp-settings/src/SettingsModule.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php index 1207d5264..f0c3770f3 100644 --- a/modules/ppcp-settings/src/SettingsModule.php +++ b/modules/ppcp-settings/src/SettingsModule.php @@ -56,7 +56,13 @@ class SettingsModule implements ServiceModule, ExecutableModule { add_action( 'admin_enqueue_scripts', static function () use ( $container ) { - $module_url = $container->get( 'settings.url' ); + $module_url = $container->get( 'settings.url' ); + + /** + * Require resolves. + * + * @psalm-suppress UnresolvableInclude + */ $script_asset_file = require dirname( realpath( __FILE__ ) ?: '', 2 ) . '/assets/switchSettingsUi.asset.php'; wp_register_script( From b4dc94a2f4e1d4dfdac497fac7d3c0a45530cbf5 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 21 Nov 2024 17:09:36 +0400 Subject: [PATCH 9/9] Remove the unused trait --- .../ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php index 494c46d9f..ebc85d9dc 100644 --- a/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php +++ b/modules/ppcp-settings/src/Endpoint/SwitchSettingsUiEndpoint.php @@ -11,7 +11,6 @@ namespace WooCommerce\PayPalCommerce\Settings\Endpoint; use Exception; use Psr\Log\LoggerInterface; -use WooCommerce\PayPalCommerce\ApiClient\Endpoint\RequestTrait; use WooCommerce\PayPalCommerce\Button\Endpoint\RequestData; /** @@ -19,8 +18,6 @@ use WooCommerce\PayPalCommerce\Button\Endpoint\RequestData; */ class SwitchSettingsUiEndpoint { - use RequestTrait; - public const ENDPOINT = 'ppcp-settings-switch-ui'; public const OPTION_NAME_SHOULD_USE_OLD_UI = 'woocommerce_ppcp-settings-should-use-old-ui';