Fix the listing of payment methods on the classic checkout with Optimized Checkout (#4266)

wjrosa · malithsen · web-flow · commit 56e4c27fe6bb · 2025-05-02T14:37:23.000-03:00
* Fix the listing of payment methods on the classic checkout with Smart Checkout

* Adding specific unit test

* Fix bad merge

* Fix tests

* Specific unit tests

* Remove group annotation

* Changelog and readme entries

---------

Co-authored-by: Malith Senaweera &lt;6216000+malithsen@users.noreply.github.com&gt;
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.5.0 - xxxx-xx-xx =
+* Fix - Fixes the listing of payment methods on the classic checkout when the Optimized Checkout is enabled.
 * Fix - Fixes the availability of WeChat Pay when the Optimized Checkout is enabled on the block checkout. Removes it from the classic/shortcode checkout to avoid issues.
 * Dev - Renames all references to "Smart Checkout" and "Single Payment Element" (and "SPE") to "Optimized Checkout" (and "OC"), following the feature rebranding.
 * Tweak - Updates the "Smart Checkout" setting name to "Optimized Checkout", and the description accordingly.
diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php b/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php
@@ -179,55 +179,48 @@ public function __construct() {
 
 		$main_settings    = WC_Stripe_Helper::get_stripe_settings();
 		$this->oc_enabled = WC_Stripe_Feature_Flags::is_oc_available() && 'yes' === $this->get_option( 'optimized_checkout_element' );
-		$is_checkout      = is_checkout() || has_block( 'woocommerce/checkout' );
 
-		if ( $this->oc_enabled && ( $is_checkout || parent::is_valid_pay_for_order_endpoint() || is_add_payment_method_page() ) ) {
-			$payment_method                                     = new WC_Stripe_UPE_Payment_Method_CC();
-			$this->payment_methods[ $payment_method->get_id() ] = $payment_method;
-		} else {
-			$this->payment_methods = [];
-			foreach ( self::UPE_AVAILABLE_METHODS as $payment_method_class ) {
-
-				// Show ACH only if feature is enabled.
-				if ( WC_Stripe_UPE_Payment_Method_ACH::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_ach_lpm_enabled() ) {
-					continue;
-				}
-
-				// Show ACSS only if feature is enabled.
-				if ( WC_Stripe_UPE_Payment_Method_ACSS::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_acss_lpm_enabled() ) {
-					continue;
-				}
+		$this->payment_methods = [];
+		foreach ( self::UPE_AVAILABLE_METHODS as $payment_method_class ) {
+			// Show ACH only if feature is enabled.
+			if ( WC_Stripe_UPE_Payment_Method_ACH::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_ach_lpm_enabled() ) {
+				continue;
+			}
 
-				// Consider Bacs only if the feature is enabled.
-				if ( WC_Stripe_UPE_Payment_Method_Bacs_Debit::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_bacs_lpm_enabled() ) {
-					continue;
-				}
+			// Show ACSS only if feature is enabled.
+			if ( WC_Stripe_UPE_Payment_Method_ACSS::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_acss_lpm_enabled() ) {
+				continue;
+			}
 
-				// Show BECS Debit only if feature is enabled.
-				if ( WC_Stripe_UPE_Payment_Method_Becs_Debit::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_becs_debit_lpm_enabled() ) {
-					continue;
-				}
+			// Consider Bacs only if the feature is enabled.
+			if ( WC_Stripe_UPE_Payment_Method_Bacs_Debit::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_bacs_lpm_enabled() ) {
+				continue;
+			}
 
-				// Show BLIK only if feature is enabled.
-				if ( WC_Stripe_UPE_Payment_Method_BLIK::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_blik_lpm_enabled() ) {
-					continue;
-				}
+			// Show BECS Debit only if feature is enabled.
+			if ( WC_Stripe_UPE_Payment_Method_Becs_Debit::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_becs_debit_lpm_enabled() ) {
+				continue;
+			}
 
-				/** Show Sofort if it's already enabled. Hide from the new merchants and keep it for the old ones who are already using this gateway, until we remove it completely.
-				 * Stripe is deprecating Sofort https://support.stripe.com/questions/sofort-is-being-deprecated-as-a-standalone-payment-method.
-				 */
-				if ( WC_Stripe_UPE_Payment_Method_Sofort::class === $payment_method_class && ! $is_sofort_enabled ) {
-					continue;
-				}
+			// Show BLIK only if feature is enabled.
+			if ( WC_Stripe_UPE_Payment_Method_BLIK::class === $payment_method_class && ! WC_Stripe_Feature_Flags::is_blik_lpm_enabled() ) {
+				continue;
+			}
 
-				// Show giropay only on the orders page to allow refunds. It was deprecated.
-				if ( WC_Stripe_UPE_Payment_Method_Giropay::class === $payment_method_class && ! $this->is_order_details_page() && ! $this->is_refund_request() ) {
-					continue;
-				}
+			/** Show Sofort if it's already enabled. Hide from the new merchants and keep it for the old ones who are already using this gateway, until we remove it completely.
+			 * Stripe is deprecating Sofort https://support.stripe.com/questions/sofort-is-being-deprecated-as-a-standalone-payment-method.
+			 */
+			if ( WC_Stripe_UPE_Payment_Method_Sofort::class === $payment_method_class && ! $is_sofort_enabled ) {
+				continue;
+			}
 
-				$payment_method                                     = new $payment_method_class();
-				$this->payment_methods[ $payment_method->get_id() ] = $payment_method;
+			// Show giropay only on the orders page to allow refunds. It was deprecated.
+			if ( WC_Stripe_UPE_Payment_Method_Giropay::class === $payment_method_class && ! $this->is_order_details_page() && ! $this->is_refund_request() ) {
+				continue;
 			}
+
+			$payment_method                                     = new $payment_method_class();
+			$this->payment_methods[ $payment_method->get_id() ] = $payment_method;
 		}
 
 		$this->intent_controller        = new WC_Stripe_Intent_Controller();
@@ -1879,7 +1872,6 @@ public function get_stripe_customer_from_order( $order ) {
 	 * @since 5.6.0
 	 */
 	public function is_available() {
-
 		// The main UPE gateway represents the card payment method. So it's only available if the card payment method is enabled and available.
 		if ( isset( $this->payment_methods['card'] ) && ( ! $this->payment_methods['card']->is_enabled() || ! $this->payment_methods['card']->is_available() ) ) {
 			return false;
diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-method.php b/includes/payment-methods/class-wc-stripe-upe-payment-method.php
@@ -210,6 +210,11 @@ public function is_enabled() {
 	 * @return bool
 	 */
 	public function is_available() {
+		// When OC is enabled, we use the card payment container to render all the methods.
+		if ( $this->oc_enabled && WC_Stripe_Payment_Methods::CARD !== $this->stripe_id ) {
+			return false;
+		}
+
 		if ( is_add_payment_method_page() && ! $this->is_reusable() ) {
 			return false;
 		}
diff --git a/readme.txt b/readme.txt
@@ -111,6 +111,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.5.0 - xxxx-xx-xx =
+* Fix - Fixes the listing of payment methods on the classic checkout when the Optimized Checkout is enabled.
 * Fix - Fixes the availability of WeChat Pay when the Optimized Checkout is enabled on the block checkout. Removes it from the classic/shortcode checkout to avoid issues.
 * Dev - Renames all references to "Smart Checkout" and "Single Payment Element" (and "SPE") to "Optimized Checkout" (and "OC"), following the feature rebranding.
 * Tweak - Updates the "Smart Checkout" setting name to "Optimized Checkout", and the description accordingly.
diff --git a/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-method.php b/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-method.php
@@ -755,6 +755,35 @@ public function test_payment_methods_are_reusable_if_cart_contains_subscription(
 		}
 	}
 
+	/**
+	 * Test that the payment method is available when optimized checkout is enabled.
+	 *
+	 * @return void
+	 */
+	public function test_non_card_methods_are_not_available_when_optimized_checkout_is_enabled() {
+		// Enable optimized checkout.
+		$stripe_settings                           = WC_Stripe_Helper::get_stripe_settings();
+		$stripe_settings['single_payment_element'] = 'yes';
+		WC_Stripe_Helper::update_main_stripe_settings( $stripe_settings );
+		update_option( WC_Stripe_Feature_Flags::SPE_FEATURE_FLAG_NAME, 'yes' );
+
+		$mocked_methods = [
+			'get_capabilities_response',
+			'get_woocommerce_currency',
+			'is_subscription_item_in_cart',
+			'get_current_order_amount',
+			'is_inside_currency_limits',
+		];
+
+		// Test for the WeChat payment method.
+		/** @var WC_Stripe_UPE_Payment_Method_Wechat_Pay $mocked_payment_method */
+		$mocked_payment_method = $this->getMockBuilder( WC_Stripe_UPE_Payment_Method_Wechat_Pay::class )
+			->onlyMethods( $mocked_methods )
+			->getMock();
+
+		$this->assertFalse( $mocked_payment_method->is_available() );
+	}
+
 	public function test_payment_methods_support_custom_name_and_description() {
 		$payment_method_ids = [
 			WC_Stripe_Payment_Methods::ACH,
