Skip to content

Block registration: delay the get_gateways() call until after we're inside the hook callback #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agibson-godaddy merged 1 commit into from
May 1, 2025
Merged

Block registration: delay the get_gateways() call until after we're inside the hook callback #765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions woocommerce/payment-gateway/Blocks/Gateway_Blocks_Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,28 @@ public function __construct( SV_WC_Payment_Gateway_Plugin $plugin ) {
*
* @return void
*/
public function handle_blocks_integration() : void {

if ( ! class_exists( PaymentMethodRegistry::class ) || ! class_exists( WooCommerceBlocks::class ) || ! version_compare( WooCommerceBlocks::get_version(), '4.4.0', '>' ) ) {
public function handle_blocks_integration() : void
{
if (
! class_exists(PaymentMethodRegistry::class) ||
! class_exists(WooCommerceBlocks::class) ||
! version_compare(WooCommerceBlocks::get_version(), '4.4.0', '>')
) {
return;
}

if ( $this->is_checkout_block_compatible() ) {

/** @var SV_WC_Payment_Gateway_Plugin $plugin */
$plugin = $this->plugin;

foreach ( $plugin->get_gateways() as $gateway ) {

if ( $checkout_integration = $gateway->get_checkout_block_integration_instance() ) {
if ($this->is_checkout_block_compatible()) {
add_action('woocommerce_blocks_payment_method_type_registration', function (PaymentMethodRegistry $payment_method_registry) {
if (! $this->plugin instanceof SV_WC_Payment_Gateway_Plugin) {
return;
}

add_action('woocommerce_blocks_payment_method_type_registration', function ( PaymentMethodRegistry $payment_method_registry ) use ( $checkout_integration ) {
$payment_method_registry->register( $checkout_integration );
}
);
foreach ($this->plugin->get_gateways() as $gateway) {
if ($checkout_integration = $gateway->get_checkout_block_integration_instance()) {
$payment_method_registry->register($checkout_integration);
}
}
}
});
}
}

Expand Down
Loading