Register only reusable payment methods when adding a payment method (#…

…4427)

* Register only reusable payment methods when adding a payment method

* Changelog entry

* Remove unnecessary UPE mount

* Get selected gateway on Add Payment Method page

* Add comment regarding payment method selection.

changelog/fix-4396-filter-reusable-add-payment-methods

@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: This is a minor fix to a larger PR that is forthcoming.
+
+

client/checkout/classic/upe.js

@@ -170,11 +170,26 @@ jQuery( function ( $ ) {
 	 */
 	const getSelectedGatewayPaymentMethod = () => {
 		const gatewayCardId = getUPEConfig( 'gatewayId' );
-		const selectedGatewayId = $(
-			'li.wc_payment_method input.input-radio:checked'
-		).attr( 'id' );
+		let selectedGatewayId = null;
+
+		// Handle payment method selection on the Checkout page or Add Payment Method page where class names differ.
+
+		if ( $( 'li.wc_payment_method' ).length ) {
+			selectedGatewayId = $(
+				'li.wc_payment_method input.input-radio:checked'
+			).attr( 'id' );
+		} else if ( $( 'li.woocommerce-PaymentMethod' ).length ) {
+			selectedGatewayId = $(
+				'li.woocommerce-PaymentMethod input.input-radio:checked'
+			).attr( 'id' );
+		}
+
+		if ( 'payment_method_woocommerce_payments' === selectedGatewayId ) {
+			selectedGatewayId = 'payment_method_woocommerce_payments_card';
+		}
 
 		let selectedPaymentMethod = null;
+
 		for ( const paymentMethodType in paymentMethodsConfig ) {
 			if (
 				`payment_method_${ gatewayCardId }_${ paymentMethodType }` ===
@@ -747,15 +762,6 @@ jQuery( function ( $ ) {
 
 	// Handle the add payment method form for WooCommerce Payments.
 	$( 'form#add_payment_method' ).on( 'submit', function () {
-		if (
-			'woocommerce_payments' !==
-			$(
-				"#add_payment_method input:checked[name='payment_method']"
-			).val()
-		) {
-			return;
-		}
-
 		if ( ! $( '#wcpay-setup-intent' ).val() ) {
 			const paymentMethodType = getSelectedGatewayPaymentMethod();
 			const paymentIntentId =

includes/class-wc-payment-gateway-wcpay.php

@@ -2580,7 +2580,6 @@ public function schedule_order_tracking( $order_id, $order = null ) {
 	 *
 	 * @throws Exception - When an error occurs in intent creation.
 	 */
-
 	public function create_intent( WC_Order $order, array $selected_payment_method_type, string $capture_method = 'automatic', array $metadata = [], string $customer_id = null ) {
 		$currency         = strtolower( $order->get_currency() );
 		$converted_amount = WC_Payments_Utils::prepare_amount( $order->get_total(), $currency );

includes/class-wc-payments.php

@@ -491,15 +491,27 @@ public static function add_plugin_links( $links ) {
 	 * @return array The list of payment gateways that will be available, including WooCommerce Payments' Gateway class.
 	 */
 	public static function register_gateway( $gateways ) {
-		$gateways[] = self::$legacy_card_gateway;
+		$gateways[]         = self::$legacy_card_gateway;
+		$reusable_methods[] = self::$legacy_card_gateway;
 
 		if ( WC_Payments_Features::is_upe_enabled() ) {
 			foreach ( self::$card_gateway->get_payment_method_ids_enabled_at_checkout() as $payment_method_id ) {
 				if ( 'card' === $payment_method_id ) {
 					continue;
 				}
-				$upe_gateway = self::get_payment_gateway_by_id( $payment_method_id );
-				$gateways[]  = $upe_gateway;
+				$upe_gateway        = self::get_payment_gateway_by_id( $payment_method_id );
+				$upe_payment_method = self::get_payment_method_by_id( $payment_method_id );
+
+				if ( $upe_payment_method->is_reusable() ) {
+					$reusable_methods[] = $upe_gateway;
+				}
+
+				$gateways[] = $upe_gateway;
+
+			}
+
+			if ( is_add_payment_method_page() ) {
+				return $reusable_methods;
 			}
 		}