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

Do not render paylater block if module disabled

Browse source
This commit is contained in:
Alex P 2023-12-20 09:00:16 +02:00
parent 22e908ff25
commit 340704756b
No known key found for this signature in database
GPG key ID: 54487A734A204D71
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/ppcp-button/resources/js/modules/ContextBootstrap/MessagesBootstap.js
View file

@ -12,14 +12,9 @@ class MessagesBootstrap {
} }
init() { init() {
Array.from(document.querySelectorAll('.ppcp-paylater-message-block')).forEach(blockElement => { if (this.gateway.messages.block.enabled) {
const config = {wrapper: '#' + blockElement.id}; this.discoverBlocks();
if (!blockElement.getAttribute('data-pp-placement')) {
config.placement = this.gateway.messages.placement;
} }
this.renderers.push(new MessageRenderer(config));
});
jQuery(document.body).on('ppcp_cart_rendered ppcp_checkout_rendered', () => { jQuery(document.body).on('ppcp_cart_rendered ppcp_checkout_rendered', () => {
this.render(); this.render();
}); });
@ -39,6 +34,16 @@ class MessagesBootstrap {
this.render(); this.render();
} }
discoverBlocks() {
Array.from(document.querySelectorAll('.ppcp-paylater-message-block')).forEach(blockElement => {
const config = {wrapper: '#' + blockElement.id};
if (!blockElement.getAttribute('data-pp-placement')) {
config.placement = this.gateway.messages.placement;
}
this.renderers.push(new MessageRenderer(config));
});
}
shouldShow(renderer) { shouldShow(renderer) {
if (this.gateway.messages.is_hidden === true) { if (this.gateway.messages.is_hidden === true) {
return false; return false;

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

@ -32,6 +32,7 @@ use WooCommerce\PayPalCommerce\Button\Endpoint\ValidateCheckoutEndpoint;
use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait; use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply; use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply;
use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\PayLaterBlock\PayLaterBlockModule;
use WooCommerce\PayPalCommerce\Session\SessionHandler; use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait; use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper; use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
@ -624,7 +625,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
$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 );
$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ); $has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ) && PayLaterBlockModule::is_enabled();
switch ( $location ) { switch ( $location ) {
case 'checkout': case 'checkout':
@ -868,6 +869,9 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
return array( return array(
'wrapper' => '#ppcp-messages', 'wrapper' => '#ppcp-messages',
'is_hidden' => ! $this->is_pay_later_filter_enabled_for_location( $this->context() ), 'is_hidden' => ! $this->is_pay_later_filter_enabled_for_location( $this->context() ),
'block' => array(
'enabled' => PayLaterBlockModule::is_enabled(),
),
'amount' => $amount, 'amount' => $amount,
'placement' => $placement, 'placement' => $placement,
'style' => array( 'style' => array(