From 93997fac7e6dc61315f615a9e1e60fbdfadf5fba Mon Sep 17 00:00:00 2001 From: Alex P Date: Wed, 13 Dec 2023 08:34:07 +0200 Subject: [PATCH] Fix messages check in editor --- modules/ppcp-button/src/Assets/SmartButton.php | 7 +++---- modules/ppcp-button/src/Helper/ContextTrait.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php index 39bc183ee..e06f34a8e 100644 --- a/modules/ppcp-button/src/Assets/SmartButton.php +++ b/modules/ppcp-button/src/Assets/SmartButton.php @@ -620,10 +620,6 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages return false; } - if ( has_block( 'woocommerce-paypal-payments/paylater-messages' ) ) { - return true; - } - $location = $this->location(); $messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $location ); @@ -638,6 +634,9 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages return $messaging_enabled_for_current_location; case 'block-editor': return true; + case 'checkout-block': + case 'cart-block': + return has_block( 'woocommerce-paypal-payments/paylater-messages' ) || $this->is_block_editor(); default: return false; } diff --git a/modules/ppcp-button/src/Helper/ContextTrait.php b/modules/ppcp-button/src/Helper/ContextTrait.php index 3a33cbdbb..a9c81c08d 100644 --- a/modules/ppcp-button/src/Helper/ContextTrait.php +++ b/modules/ppcp-button/src/Helper/ContextTrait.php @@ -182,7 +182,7 @@ trait ContextTrait { /** * Checks if it is the block editor page. */ - private function is_block_editor(): bool { + protected function is_block_editor(): bool { if ( ! function_exists( 'get_current_screen' ) ) { return true; }