From a1ded99f3fbe28c129c5289e80be5fe5ead72a31 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 16 Sep 2024 17:16:29 +0200
Subject: [PATCH] Move axo block module loading to the correct place plus some
 minor PHPCS fixes

---
 modules.php                                   |  2 +-
 modules/ppcp-axo-block/src/AxoBlockModule.php | 29 ++-----------------
 modules/ppcp-blocks/src/BlocksModule.php      |  2 +-
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/modules.php b/modules.php
index a8527f538..b800fc56d 100644
--- a/modules.php
+++ b/modules.php
@@ -29,7 +29,6 @@ return function ( string $root_dir ): iterable {
 		( require "$modules_dir/ppcp-vaulting/module.php" )(),
 		( require "$modules_dir/ppcp-order-tracking/module.php" )(),
 		( require "$modules_dir/ppcp-uninstall/module.php" )(),
-		( require "$modules_dir/ppcp-axo-block/module.php" )(),
 		( require "$modules_dir/ppcp-blocks/module.php" )(),
 		( require "$modules_dir/ppcp-paypal-subscriptions/module.php" )(),
 		( require "$modules_dir/ppcp-local-alternative-payment-methods/module.php" )(),
@@ -88,6 +87,7 @@ return function ( string $root_dir ): iterable {
 		getenv( 'PCP_AXO_ENABLED' ) === '1'
 	) ) {
 		$modules[] = ( require "$modules_dir/ppcp-axo/module.php" )();
+		$modules[] = ( require "$modules_dir/ppcp-axo-block/module.php" )();
 	}
 
 	return $modules;
diff --git a/modules/ppcp-axo-block/src/AxoBlockModule.php b/modules/ppcp-axo-block/src/AxoBlockModule.php
index 2f1cd41a9..2a52e0510 100644
--- a/modules/ppcp-axo-block/src/AxoBlockModule.php
+++ b/modules/ppcp-axo-block/src/AxoBlockModule.php
@@ -72,9 +72,9 @@ class AxoBlockModule implements ServiceModule, ExtendingModule, ExecutableModule
 			function () use ( $c ) {
 				add_filter(
 					'woocommerce_paypal_payments_localized_script_data',
-					function( array $localized_script_data ) use ($c) {
+					function( array $localized_script_data ) use ( $c ) {
 						$module = $this;
-						$api = $c->get( 'api.sdk-client-token' );
+						$api    = $c->get( 'api.sdk-client-token' );
 						assert( $api instanceof SdkClientToken );
 
 						$logger = $c->get( 'woocommerce.logger.woocommerce' );
@@ -106,31 +106,6 @@ class AxoBlockModule implements ServiceModule, ExtendingModule, ExecutableModule
 			}
 		);
 
-//		woocommerce_store_api_register_payment_requirements(
-//			array(
-//				'data_callback' => function() use ( $c ): array {
-//					$smart_button = $c->get( 'button.smart-button' );
-//					assert( $smart_button instanceof SmartButtonInterface );
-//
-//					if ( isset( $smart_button->script_data()['continuation'] ) ) {
-//						return array( 'ppcp_continuation' );
-//					}
-//
-//					return array();
-//				},
-//			)
-//		);
-
-//		add_action(
-//			'wc_ajax_' . UpdateShippingEndpoint::ENDPOINT,
-//			static function () use ( $c ) {
-//				$endpoint = $c->get( 'blocks.endpoint.update-shipping' );
-//				assert( $endpoint instanceof UpdateShippingEndpoint );
-//
-//				$endpoint->handle_request();
-//			}
-//		);
-
 		// Enqueue frontend scripts.
 		add_action(
 			'wp_enqueue_scripts',
diff --git a/modules/ppcp-blocks/src/BlocksModule.php b/modules/ppcp-blocks/src/BlocksModule.php
index 0f884be5c..d8363e415 100644
--- a/modules/ppcp-blocks/src/BlocksModule.php
+++ b/modules/ppcp-blocks/src/BlocksModule.php
@@ -68,7 +68,7 @@ class BlocksModule implements ServiceModule, ExtendingModule, ExecutableModule {
 			'woocommerce_blocks_payment_method_type_registration',
 			function( PaymentMethodRegistry $payment_method_registry ) use ( $c ): void {
 				$payment_method_registry->register( $c->get( 'blocks.method' ) );
-//				$payment_method_registry->register( $c->get( 'blocks.advanced-card-method' ) );
+				$payment_method_registry->register( $c->get( 'blocks.advanced-card-method' ) );
 			}
 		);