woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 13:44:42 +08:00
Code Issues Projects Packages Wiki Activity Actions

Fix messages check in editor

Browse source
This commit is contained in:
Alex P 2023-12-13 08:34:07 +02:00
parent a99fbc6eb3
commit 93997fac7e
No known key found for this signature in database
GPG key ID: 54487A734A204D71
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -620,10 +620,6 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
return false; return false;
} }
if ( has_block( 'woocommerce-paypal-payments/paylater-messages' ) ) {
return true;
}
$location = $this->location(); $location = $this->location();
$messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $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; return $messaging_enabled_for_current_location;
case 'block-editor': case 'block-editor':
return true; return true;
case 'checkout-block':
case 'cart-block':
return has_block( 'woocommerce-paypal-payments/paylater-messages' ) || $this->is_block_editor();
default: default:
return false; return false;
} }

2
modules/ppcp-button/src/Helper/ContextTrait.php
View file

@ -182,7 +182,7 @@ trait ContextTrait {
/** /**
* Checks if it is the block editor page. * 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' ) ) { if ( ! function_exists( 'get_current_screen' ) ) {
return true; return true;
} }