From 4de7191d7ca0c2af232485bf5c028a820195c12c Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 2 Nov 2023 09:48:33 +0000 Subject: [PATCH] Add ApplePay validation file display conditions --- modules/ppcp-applepay/src/ApplepayModule.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/ppcp-applepay/src/ApplepayModule.php b/modules/ppcp-applepay/src/ApplepayModule.php index b81329811..d6c47a341 100644 --- a/modules/ppcp-applepay/src/ApplepayModule.php +++ b/modules/ppcp-applepay/src/ApplepayModule.php @@ -84,11 +84,12 @@ class ApplepayModule implements ModuleInterface { return; } - $module->load_assets( $c, $apple_payment_method ); - $module->handle_validation_file( $c ); - $module->render_buttons( $c, $apple_payment_method ); - - $apple_payment_method->bootstrap_ajax_request(); + if ( $apple_payment_method->is_enabled() ) { + $module->load_assets( $c, $apple_payment_method ); + $module->handle_validation_file( $c, $apple_payment_method ); + $module->render_buttons( $c, $apple_payment_method ); + $apple_payment_method->bootstrap_ajax_request(); + } } ); @@ -214,9 +215,13 @@ class ApplepayModule implements ModuleInterface { * Handles the validation file. * * @param ContainerInterface $c The container. + * @param ApplePayButton $button The button. * @return void */ - public function handle_validation_file( ContainerInterface $c ): void { + public function handle_validation_file( ContainerInterface $c, ApplePayButton $button ): void { + if ( ! $button->is_enabled() ) { + return; + } $env = $c->get( 'onboarding.environment' ); assert( $env instanceof Environment ); $is_sandobx = $env->current_environment_is( Environment::SANDBOX );