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

Replace the init hook with wp_loaded to avoid getting 'called too early' errors

Browse source
This commit is contained in:
Daniel Dudzic 2024-07-10 12:47:58 +02:00
parent 36a13f6500
commit acc0ac61d2
No known key found for this signature in database
GPG key ID: 31B40D33E3465483
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ppcp-axo/src/AxoModule.php
View file

@ -140,12 +140,17 @@ class AxoModule implements ModuleInterface {
); );
add_action( add_action(
'init', 'wp_loaded',
function () use ( $c ) { function () use ( $c ) {
$module = $this; $module = $this;
$subscription_helper = $c->get( 'wc-subscriptions.helper' );
assert( $subscription_helper instanceof SubscriptionHelper );
// Check if the module is applicable, correct country, currency, ... etc. // Check if the module is applicable, correct country, currency, ... etc.
if ( ! $c->get( 'axo.eligible' ) || 'continuation' === $c->get( 'button.context' ) ) { if ( ! $c->get( 'axo.eligible' )
|| 'continuation' === $c->get( 'button.context' )
|| $subscription_helper->cart_contains_subscription() ) {
return; return;
} }
@ -334,15 +339,11 @@ class AxoModule implements ModuleInterface {
$is_axo_enabled = $settings->has( 'axo_enabled' ) && $settings->get( 'axo_enabled' ) ?? false; $is_axo_enabled = $settings->has( 'axo_enabled' ) && $settings->get( 'axo_enabled' ) ?? false;
$is_dcc_enabled = $settings->has( 'dcc_enabled' ) && $settings->get( 'dcc_enabled' ) ?? false; $is_dcc_enabled = $settings->has( 'dcc_enabled' ) && $settings->get( 'dcc_enabled' ) ?? false;
$subscription_helper = $c->get( 'wc-subscriptions.helper' );
assert( $subscription_helper instanceof SubscriptionHelper );
return ! is_user_logged_in() return ! is_user_logged_in()
&& CartCheckoutDetector::has_classic_checkout() && CartCheckoutDetector::has_classic_checkout()
&& $is_axo_enabled && $is_axo_enabled
&& $is_dcc_enabled && $is_dcc_enabled
&& ! $this->is_excluded_endpoint() && ! $this->is_excluded_endpoint();
&& ! $subscription_helper->cart_contains_subscription();
} }
/** /**