Merge branch 'trunk' into PCP-591-save-and-display-vaulted-payment-methods-in-woo-commerce-native-endpoint

modules/ppcp-wc-gateway/connection-tab-settings.php

@@ -395,6 +395,24 @@ return function ( ContainerInterface $container, array $fields ): array {
 			'gateway'      => Settings::CONNECTION_TAB_ID,
 			'input_class'  => $container->get( 'wcgateway.settings.should-disable-tracking-checkbox' ) ? array( 'ppcp-disabled-checkbox' ) : array(),
 		),
+		'fraudnet_enabled'                              => array(
+			'title'        => __( 'FraudNet', 'woocommerce-paypal-payments' ),
+			'type'         => 'checkbox',
+			'desc_tip'     => true,
+			'label'        => sprintf(
+			// translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
+				__( 'Manage online risk with %1$sFraudNet%2$s.', 'woocommerce-paypal-payments' ),
+				'<a href="https://woocommerce.com/document/woocommerce-paypal-payments/#FraudNet" target="_blank">',
+				'</a>'
+			),
+			'description'  => __( 'FraudNet is a JavaScript library developed by PayPal and embedded into a merchant’s web page to collect browser-based data to help reduce fraud.', 'woocommerce-paypal-payments' ),
+			'default'      => false,
+			'screens'      => array(
+				State::STATE_ONBOARDED,
+			),
+			'requirements' => array(),
+			'gateway'      => Settings::CONNECTION_TAB_ID,
+		),
 
 		'credentials_integration_configuration_heading' => array(
 			'heading'      => __( 'General integration configuration', 'woocommerce-paypal-payments' ),

modules/ppcp-wc-gateway/extensions.php

@@ -84,6 +84,8 @@ return array(
 			$application_context_repository,
 			$pay_pal_request_id_repository,
 			$subscription_helper,
+			$container->get( 'wcgateway.is-fraudnet-enabled' ),
+			$container->get( 'wcgateway.fraudnet' ),
 			$bn_code
 		);
 	},

modules/ppcp-wc-gateway/services.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\WcGateway;
 
+use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PayUponInvoiceOrderEndpoint;
@@ -28,6 +29,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Admin\FeesRenderer;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\OrderTablePaymentStatusColumn;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\PaymentStatusOrderDetail;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\RenderAuthorizeAction;
+use WooCommerce\PayPalCommerce\WcGateway\Assets\FraudNetAssets;
 use WooCommerce\PayPalCommerce\WcGateway\Checkout\CheckoutPayPalAddressPreset;
 use WooCommerce\PayPalCommerce\WcGateway\Checkout\DisableGateways;
 use WooCommerce\PayPalCommerce\WcGateway\Endpoint\ReturnUrlEndpoint;
@@ -38,9 +40,9 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXO;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXOEndpoint;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXOGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\FraudNet;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\FraudNetSessionId;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\FraudNetSourceWebsiteId;
+use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNet;
+use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNetSessionId;
+use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNetSourceWebsiteId;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PaymentSourceFactory;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoice;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
@@ -1571,7 +1573,7 @@ return array(
 			$container->get( 'api.host' ),
 			$container->get( 'api.bearer' ),
 			$container->get( 'api.factory.order' ),
-			$container->get( 'wcgateway.pay-upon-invoice-fraudnet' ),
+			$container->get( 'wcgateway.fraudnet' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
@@ -1592,15 +1594,15 @@ return array(
 			$container->get( 'wcgateway.processor.refunds' )
 		);
 	},
-	'wcgateway.pay-upon-invoice-fraudnet-session-id'       => static function ( ContainerInterface $container ): FraudNetSessionId {
+	'wcgateway.fraudnet-session-id'                        => static function ( ContainerInterface $container ): FraudNetSessionId {
 		return new FraudNetSessionId();
 	},
-	'wcgateway.pay-upon-invoice-fraudnet-source-website-id' => static function ( ContainerInterface $container ): FraudNetSourceWebsiteId {
+	'wcgateway.fraudnet-source-website-id'                 => static function ( ContainerInterface $container ): FraudNetSourceWebsiteId {
 		return new FraudNetSourceWebsiteId( $container->get( 'api.merchant_id' ) );
 	},
-	'wcgateway.pay-upon-invoice-fraudnet'                  => static function ( ContainerInterface $container ): FraudNet {
-		$session_id = $container->get( 'wcgateway.pay-upon-invoice-fraudnet-session-id' );
-		$source_website_id = $container->get( 'wcgateway.pay-upon-invoice-fraudnet-source-website-id' );
+	'wcgateway.fraudnet'                                   => static function ( ContainerInterface $container ): FraudNet {
+		$session_id = $container->get( 'wcgateway.fraudnet-session-id' );
+		$source_website_id = $container->get( 'wcgateway.fraudnet-source-website-id' );
 		return new FraudNet(
 			(string) $session_id(),
 			(string) $source_website_id()
@@ -1621,21 +1623,15 @@ return array(
 	},
 	'wcgateway.pay-upon-invoice'                           => static function ( ContainerInterface $container ): PayUponInvoice {
 		return new PayUponInvoice(
-			$container->get( 'wcgateway.url' ),
-			$container->get( 'wcgateway.pay-upon-invoice-fraudnet' ),
 			$container->get( 'wcgateway.pay-upon-invoice-order-endpoint' ),
 			$container->get( 'woocommerce.logger.woocommerce' ),
 			$container->get( 'wcgateway.settings' ),
-			$container->get( 'onboarding.environment' ),
-			$container->get( 'ppcp.asset-version' ),
 			$container->get( 'onboarding.state' ),
-			$container->get( 'wcgateway.is-ppcp-settings-page' ),
 			$container->get( 'wcgateway.current-ppcp-settings-page-id' ),
 			$container->get( 'wcgateway.pay-upon-invoice-product-status' ),
 			$container->get( 'wcgateway.pay-upon-invoice-helper' ),
 			$container->get( 'wcgateway.checkout-helper' ),
-			$container->get( 'api.factory.capture' ),
-			$container->get( 'session.handler' )
+			$container->get( 'api.factory.capture' )
 		);
 	},
 	'wcgateway.oxxo'                                       => static function( ContainerInterface $container ): OXXO {
@@ -1929,4 +1925,78 @@ return array(
 
 		return $button_locations;
 	},
+	'wcgateway.ppcp-gateways'                              => static function ( ContainerInterface $container ): array {
+		return array(
+			PayPalGateway::ID,
+			CreditCardGateway::ID,
+			PayUponInvoiceGateway::ID,
+			CardButtonGateway::ID,
+			OXXOGateway::ID,
+		);
+	},
+	'wcgateway.enabled-ppcp-gateways'                      => static function ( ContainerInterface $container ): array {
+		$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+		$ppcp_gateways = $container->get( 'wcgateway.ppcp-gateways' );
+		$enabled_ppcp_gateways = array();
+
+		foreach ( $ppcp_gateways as $gateway ) {
+			if ( ! isset( $available_gateways[ $gateway ] ) ) {
+				continue;
+			}
+			$enabled_ppcp_gateways[] = $gateway;
+		}
+
+		return $enabled_ppcp_gateways;
+	},
+	'wcgateway.is-paypal-continuation'                     => static function ( ContainerInterface $container ): bool {
+		$session_handler              = $container->get( 'session.handler' );
+		assert( $session_handler instanceof SessionHandler );
+
+		$order = $session_handler->order();
+		if ( ! $order ) {
+			return false;
+		}
+		$source = $order->payment_source();
+		if ( $source && $source->card() ) {
+			return false; // Ignore for DCC.
+		}
+		if ( 'card' === $session_handler->funding_source() ) {
+			return false; // Ignore for card buttons.
+		}
+		return true;
+	},
+	'wcgateway.current-context'                            => static function ( ContainerInterface $container ): string {
+		$context = 'mini-cart';
+		if ( is_product() || wc_post_content_has_shortcode( 'product_page' ) ) {
+			$context = 'product';
+		}
+		if ( is_cart() ) {
+			$context = 'cart';
+		}
+		if ( is_checkout() && ! $container->get( 'wcgateway.is-paypal-continuation' ) ) {
+			$context = 'checkout';
+		}
+		if ( is_checkout_pay_page() ) {
+			$context = 'pay-now';
+		}
+		return $context;
+	},
+	'wcgateway.is-fraudnet-enabled'                        => static function ( ContainerInterface $container ): bool {
+		$settings      = $container->get( 'wcgateway.settings' );
+		assert( $settings instanceof Settings );
+
+		return $settings->has( 'fraudnet_enabled' ) && $settings->get( 'fraudnet_enabled' );
+	},
+	'wcgateway.fraudnet-assets'                            => function( ContainerInterface $container ) : FraudNetAssets {
+		return new FraudNetAssets(
+			$container->get( 'wcgateway.url' ),
+			$container->get( 'ppcp.asset-version' ),
+			$container->get( 'wcgateway.fraudnet' ),
+			$container->get( 'onboarding.environment' ),
+			$container->get( 'wcgateway.settings' ),
+			$container->get( 'wcgateway.enabled-ppcp-gateways' ),
+			$container->get( 'wcgateway.current-context' ),
+			$container->get( 'wcgateway.is-fraudnet-enabled' )
+		);
+	},
 );

modules/ppcp-wc-gateway/src/Assets/FraudNetAssets.php

@@ -0,0 +1,186 @@
+<?php
+/**
+ * Register and configure FraudNet assets
+ *
+ * @package WooCommerce\PayPalCommerce\WcGateway\Assets
+ */
+
+declare(strict_types=1);
+
+namespace WooCommerce\PayPalCommerce\WcGateway\Assets;
+
+use WooCommerce\PayPalCommerce\Onboarding\Environment;
+use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNet;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
+
+/**
+ * Class FraudNetAssets
+ */
+class FraudNetAssets {
+
+	/**
+	 * The URL of this module.
+	 *
+	 * @var string
+	 */
+	protected $module_url;
+
+	/**
+	 * The assets version.
+	 *
+	 * @var string
+	 */
+	protected $version;
+
+	/**
+	 * The FraudNet entity.
+	 *
+	 * @var FraudNet
+	 */
+	protected $fraud_net;
+
+	/**
+	 * The environment.
+	 *
+	 * @var Environment
+	 */
+	protected $environment;
+
+	/**
+	 * The Settings.
+	 *
+	 * @var Settings
+	 */
+	protected $settings;
+
+	/**
+	 * The list of enabled PayPal gateways.
+	 *
+	 * @var string[]
+	 */
+	protected $enabled_ppcp_gateways;
+
+	/**
+	 * The current context.
+	 *
+	 * @var string
+	 */
+	protected $context;
+
+	/**
+	 * True if FraudNet support is enabled in settings, otherwise false.
+	 *
+	 * @var bool
+	 */
+	protected $is_fraudnet_enabled;
+
+	/**
+	 * Assets constructor.
+	 *
+	 * @param string      $module_url The url of this module.
+	 * @param string      $version The assets version.
+	 * @param FraudNet    $fraud_net The FraudNet entity.
+	 * @param Environment $environment The environment.
+	 * @param Settings    $settings The Settings.
+	 * @param string[]    $enabled_ppcp_gateways The list of enabled PayPal gateways.
+	 * @param string      $context The current context.
+	 * @param bool        $is_fraudnet_enabled true if FraudNet support is enabled in settings, otherwise false.
+	 */
+	public function __construct(
+		string $module_url,
+		string $version,
+		FraudNet $fraud_net,
+		Environment $environment,
+		Settings $settings,
+		array $enabled_ppcp_gateways,
+		string $context,
+		bool $is_fraudnet_enabled
+	) {
+		$this->module_url            = $module_url;
+		$this->version               = $version;
+		$this->fraud_net             = $fraud_net;
+		$this->environment           = $environment;
+		$this->settings              = $settings;
+		$this->enabled_ppcp_gateways = $enabled_ppcp_gateways;
+		$this->context               = $context;
+		$this->is_fraudnet_enabled   = $is_fraudnet_enabled;
+	}
+
+	/**
+	 * Registers FraudNet assets.
+	 */
+	public function register_assets(): void {
+		add_action(
+			'wp_enqueue_scripts',
+			function() {
+				if ( $this->should_load_fraudnet_script() ) {
+					wp_enqueue_script(
+						'ppcp-fraudnet',
+						trailingslashit( $this->module_url ) . 'assets/js/fraudnet.js',
+						array(),
+						$this->version,
+						true
+					);
+
+					wp_localize_script(
+						'ppcp-fraudnet',
+						'FraudNetConfig',
+						array(
+							'f'       => $this->fraud_net->session_id(),
+							's'       => $this->fraud_net->source_website_id(),
+							'sandbox' => $this->environment->current_environment_is( Environment::SANDBOX ),
+						)
+					);
+				}
+			}
+		);
+	}
+
+	/**
+	 * Checks if FraudNet script should be loaded.
+	 *
+	 * @return bool true if FraudNet script should be loaded, otherwise false.
+	 */
+	protected function should_load_fraudnet_script(): bool {
+		if ( empty( $this->enabled_ppcp_gateways ) ) {
+			return false;
+		}
+
+		$is_pui_gateway_enabled           = in_array( PayUponInvoiceGateway::ID, $this->enabled_ppcp_gateways, true );
+		$is_only_standard_gateway_enabled = $this->enabled_ppcp_gateways === array( PayPalGateway::ID );
+
+		if ( $this->context !== 'checkout' || $is_only_standard_gateway_enabled ) {
+			return $this->is_fraudnet_enabled && $this->are_buttons_enabled_for_context();
+		}
+
+		return $is_pui_gateway_enabled ? true : $this->is_fraudnet_enabled;
+
+	}
+
+	/**
+	 * Checks if buttons are enabled for current context.
+	 *
+	 * @return bool true if enabled, otherwise false.
+	 */
+	protected function are_buttons_enabled_for_context() : bool {
+		if ( ! in_array( PayPalGateway::ID, $this->enabled_ppcp_gateways, true ) ) {
+			return false;
+		}
+
+		$location_prefix             = $this->context === 'checkout' ? '' : "{$this->context}_";
+		$setting_name                = "button_{$location_prefix}enabled";
+		$buttons_enabled_for_context = $this->settings->has( $setting_name ) && $this->settings->get( $setting_name );
+
+		if ( $this->context === 'product' ) {
+			return $buttons_enabled_for_context || $this->settings->has( 'mini-cart' ) && $this->settings->get( 'mini-cart' );
+		}
+
+		if ( $this->context === 'pay-now' ) {
+			return true;
+		}
+
+		return $buttons_enabled_for_context;
+	}
+}

modules/ppcp-wc-gateway/src/FraudNet/FraudNet.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice;
+namespace WooCommerce\PayPalCommerce\WcGateway\FraudNet;
 
 /**
  * Class FraudNet

modules/ppcp-wc-gateway/src/FraudNet/FraudNetSessionId.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice;
+namespace WooCommerce\PayPalCommerce\WcGateway\FraudNet;
 
 use Exception;
 

modules/ppcp-wc-gateway/src/FraudNet/FraudNetSourceWebsiteId.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice;
+namespace WooCommerce\PayPalCommerce\WcGateway\FraudNet;
 
 /**
  * Class FraudNetSourceWebsiteId.

modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php

@@ -17,6 +17,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Factory\CaptureFactory;
 use WooCommerce\PayPalCommerce\Button\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
+use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNet;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\CheckoutHelper;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\PayUponInvoiceHelper;
@@ -34,20 +35,6 @@ class PayUponInvoice {
 
 	use TransactionIdHandlingTrait;
 
-	/**
-	 * The module URL.
-	 *
-	 * @var string
-	 */
-	protected $module_url;
-
-	/**
-	 * The FraudNet entity.
-	 *
-	 * @var FraudNet
-	 */
-	protected $fraud_net;
-
 	/**
 	 * The pui order endpoint.
 	 *
@@ -69,20 +56,6 @@ class PayUponInvoice {
 	 */
 	protected $settings;
 
-	/**
-	 * The environment.
-	 *
-	 * @var Environment
-	 */
-	protected $environment;
-
-	/**
-	 * The asset version.
-	 *
-	 * @var string
-	 */
-	protected $asset_version;
-
 	/**
 	 * The PUI helper.
 	 *
@@ -97,13 +70,6 @@ class PayUponInvoice {
 	 */
 	protected $state;
 
-	/**
-	 * Whether the current page is the PPCP settings page.
-	 *
-	 * @var bool
-	 */
-	protected $is_ppcp_settings_page;
-
 	/**
 	 * Current PayPal settings page id.
 	 *
@@ -132,64 +98,39 @@ class PayUponInvoice {
 	 */
 	protected $capture_factory;
 
-	/**
-	 * The session handler
-	 *
-	 * @var SessionHandler
-	 */
-	protected $session_handler;
-
 	/**
 	 * PayUponInvoice constructor.
 	 *
-	 * @param string                      $module_url The module URL.
-	 * @param FraudNet                    $fraud_net The FraudNet entity.
 	 * @param PayUponInvoiceOrderEndpoint $pui_order_endpoint The PUI order endpoint.
 	 * @param LoggerInterface             $logger The logger.
 	 * @param Settings                    $settings The settings.
-	 * @param Environment                 $environment The environment.
-	 * @param string                      $asset_version The asset version.
 	 * @param State                       $state The onboarding state.
-	 * @param bool                        $is_ppcp_settings_page Whether page is PayPal settings poge.
 	 * @param string                      $current_ppcp_settings_page_id Current PayPal settings page id.
 	 * @param PayUponInvoiceProductStatus $pui_product_status The PUI product status.
 	 * @param PayUponInvoiceHelper        $pui_helper The PUI helper.
 	 * @param CheckoutHelper              $checkout_helper The checkout helper.
 	 * @param CaptureFactory              $capture_factory The capture factory.
-	 * @param SessionHandler              $session_handler The session handler.
 	 */
 	public function __construct(
-		string $module_url,
-		FraudNet $fraud_net,
 		PayUponInvoiceOrderEndpoint $pui_order_endpoint,
 		LoggerInterface $logger,
 		Settings $settings,
-		Environment $environment,
-		string $asset_version,
 		State $state,
-		bool $is_ppcp_settings_page,
 		string $current_ppcp_settings_page_id,
 		PayUponInvoiceProductStatus $pui_product_status,
 		PayUponInvoiceHelper $pui_helper,
 		CheckoutHelper $checkout_helper,
-		CaptureFactory $capture_factory,
-		SessionHandler $session_handler
+		CaptureFactory $capture_factory
 	) {
-		$this->module_url                    = $module_url;
-		$this->fraud_net                     = $fraud_net;
 		$this->pui_order_endpoint            = $pui_order_endpoint;
 		$this->logger                        = $logger;
 		$this->settings                      = $settings;
-		$this->environment                   = $environment;
-		$this->asset_version                 = $asset_version;
 		$this->state                         = $state;
-		$this->is_ppcp_settings_page         = $is_ppcp_settings_page;
 		$this->current_ppcp_settings_page_id = $current_ppcp_settings_page_id;
 		$this->pui_product_status            = $pui_product_status;
 		$this->pui_helper                    = $pui_helper;
 		$this->checkout_helper               = $checkout_helper;
 		$this->capture_factory               = $capture_factory;
-		$this->session_handler               = $session_handler;
 	}
 
 	/**
@@ -236,11 +177,6 @@ class PayUponInvoice {
 			}
 		);
 
-		add_action(
-			'wp_enqueue_scripts',
-			array( $this, 'register_assets' )
-		);
-
 		add_action(
 			'ppcp_payment_capture_completed_webhook_handler',
 			function ( WC_Order $wc_order, string $order_id ) {
@@ -360,7 +296,16 @@ class PayUponInvoice {
 
 		add_filter(
 			'woocommerce_gateway_description',
-			function( string $description, string $id ): string {
+			/**
+			 * Param types removed to avoid third-party issues.
+			 *
+			 * @psalm-suppress MissingClosureParamType
+			 */
+			function( $description, $id ): string {
+				if ( ! is_string( $description ) || ! is_string( $id ) ) {
+					return $description;
+				}
+
 				if ( PayUponInvoiceGateway::ID === $id ) {
 					ob_start();
 
@@ -423,7 +368,16 @@ class PayUponInvoice {
 
 		add_action(
 			'woocommerce_after_checkout_validation',
-			function( array $fields, WP_Error $errors ) {
+			/**
+			 * Param types removed to avoid third-party issues.
+			 *
+			 * @psalm-suppress MissingClosureParamType
+			 */
+			function( $fields, WP_Error $errors ) {
+				if ( ! is_array( $fields ) ) {
+					return;
+				}
+
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
 				$payment_method = wc_clean( wp_unslash( $_POST['payment_method'] ?? '' ) );
 				if ( PayUponInvoiceGateway::ID !== $payment_method ) {
@@ -458,8 +412,13 @@ class PayUponInvoice {
 
 		add_filter(
 			'woocommerce_available_payment_gateways',
-			function ( array $methods ): array {
-				if ( State::STATE_ONBOARDED !== $this->state->current_state() ) {
+			/**
+			 * Param types removed to avoid third-party issues.
+			 *
+			 * @psalm-suppress MissingClosureParamType
+			 */
+			function ( $methods ): array {
+				if ( ! is_array( $methods ) || State::STATE_ONBOARDED !== $this->state->current_state() ) {
 					return $methods;
 				}
 
@@ -587,31 +546,4 @@ class PayUponInvoice {
 			}
 		);
 	}
-
-	/**
-	 * Registers PUI assets.
-	 */
-	public function register_assets(): void {
-		$gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
-		$gateway_enabled  = $gateway_settings['enabled'] ?? '';
-		if ( $gateway_enabled === 'yes' && ! $this->session_handler->order() && ( is_checkout() || is_checkout_pay_page() ) ) {
-			wp_enqueue_script(
-				'ppcp-pay-upon-invoice',
-				trailingslashit( $this->module_url ) . 'assets/js/pay-upon-invoice.js',
-				array(),
-				$this->asset_version,
-				true
-			);
-
-			wp_localize_script(
-				'ppcp-pay-upon-invoice',
-				'FraudNetConfig',
-				array(
-					'f'       => $this->fraud_net->session_id(),
-					's'       => $this->fraud_net->source_website_id(),
-					'sandbox' => $this->environment->current_environment_is( Environment::SANDBOX ),
-				)
-			);
-		}
-	}
 }

modules/ppcp-wc-gateway/src/WCGatewayModule.php

@@ -22,6 +22,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Admin\FeesRenderer;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\OrderTablePaymentStatusColumn;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\PaymentStatusOrderDetail;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\RenderAuthorizeAction;
+use WooCommerce\PayPalCommerce\WcGateway\Assets\FraudNetAssets;
 use WooCommerce\PayPalCommerce\WcGateway\Assets\SettingsPageAssets;
 use WooCommerce\PayPalCommerce\WcGateway\Checkout\CheckoutPayPalAddressPreset;
 use WooCommerce\PayPalCommerce\WcGateway\Checkout\DisableGateways;
@@ -258,6 +259,10 @@ class WCGatewayModule implements ModuleInterface {
 				}
 
 				( $c->get( 'wcgateway.oxxo' ) )->init();
+
+				$fraudnet_assets = $c->get( 'wcgateway.fraudnet-assets' );
+				assert( $fraudnet_assets instanceof FraudNetAssets );
+				$fraudnet_assets->register_assets();
 			}
 		);
 

modules/ppcp-wc-gateway/webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
     target: 'web',
     entry: {
         'gateway-settings': path.resolve('./resources/js/gateway-settings.js'),
-        'pay-upon-invoice': path.resolve('./resources/js/pay-upon-invoice.js'),
+        'fraudnet': path.resolve('./resources/js/fraudnet.js'),
         'oxxo': path.resolve('./resources/js/oxxo.js'),
         'gateway-settings-style': path.resolve('./resources/css/gateway-settings.scss'),
     },