Removing card requirement for OC

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.8.0 - xxxx-xx-xx =
+* Fix - Removes the credit card payment method requirement for the Optimized Checkout feature
 * Add - Includes a new notice to highlight the Optimized Checkout feature above the payment methods list in the Stripe settings page
 * Update - Increases the default font size for the Optimized Checkout payment element to match the rest of the checkout form
 * Fix - Checks for the subscription payment method (if it is Stripe) when verifying for the payment method detachment

client/blocks/upe/index.js

@@ -5,7 +5,6 @@ import {
 import {
 	PAYMENT_METHOD_AFFIRM,
 	PAYMENT_METHOD_AMAZON_PAY,
-	PAYMENT_METHOD_CARD,
 	PAYMENT_METHOD_GIROPAY,
 	PAYMENT_METHOD_KLARNA,
 	PAYMENT_METHOD_LINK,
@@ -40,32 +39,25 @@ const api = new WCStripeAPI(
 const paymentMethodsConfig =
 	getBlocksConfiguration()?.paymentMethodsConfig ?? {};
 
-// Register UPE Elements.
-if ( getBlocksConfiguration()?.isOCEnabled ) {
-	registerPaymentMethod(
-		upeElement( PAYMENT_METHOD_CARD, api, paymentMethodsConfig.card )
-	);
-} else {
-	const methodsToFilter = [
-		PAYMENT_METHOD_AMAZON_PAY,
-		PAYMENT_METHOD_LINK,
-		PAYMENT_METHOD_GIROPAY, // Skip giropay as it was deprecated by Jun, 30th 2024.
-	];
-
-	// Filter out some BNPLs when other official extensions are present.
-	if ( getBlocksConfiguration()?.hasAffirmGatewayPlugin ) {
-		methodsToFilter.push( PAYMENT_METHOD_AFFIRM );
-	}
-	if ( getBlocksConfiguration()?.hasKlarnaGatewayPlugin ) {
-		methodsToFilter.push( PAYMENT_METHOD_KLARNA );
-	}
+const methodsToFilter = [
+	PAYMENT_METHOD_AMAZON_PAY,
+	PAYMENT_METHOD_LINK,
+	PAYMENT_METHOD_GIROPAY, // Skip giropay as it was deprecated by Jun, 30th 2024.
+];
 
-	Object.entries( paymentMethodsConfig )
-		.filter( ( [ method ] ) => ! methodsToFilter.includes( method ) )
-		.forEach( ( [ method, config ] ) => {
-			registerPaymentMethod( upeElement( method, api, config ) );
-		} );
+// Filter out some BNPLs when other official extensions are present.
+if ( getBlocksConfiguration()?.hasAffirmGatewayPlugin ) {
+	methodsToFilter.push( PAYMENT_METHOD_AFFIRM );
 }
+if ( getBlocksConfiguration()?.hasKlarnaGatewayPlugin ) {
+	methodsToFilter.push( PAYMENT_METHOD_KLARNA );
+}
+
+Object.entries( paymentMethodsConfig )
+	.filter( ( [ method ] ) => ! methodsToFilter.includes( method ) )
+	.forEach( ( [ method, config ] ) => {
+		registerPaymentMethod( upeElement( method, api, config ) );
+	} );
 
 if ( getBlocksConfiguration()?.isECEEnabled ) {
 	// Register Express Checkout Elements.

client/settings/general-settings-section/payment-method-description.js

@@ -5,7 +5,6 @@ import RecurringPaymentIcon from '../../components/recurring-payment-icon';
 import PaymentMethodCapabilityStatusPill from 'wcstripe/components/payment-method-capability-status-pill';
 import PaymentMethodDeprecationPill from 'wcstripe/components/payment-method-deprecation-pill';
 import PaymentMethodUnavailableDueConflictPill from 'wcstripe/components/payment-method-unavailable-due-conflict-pill';
-import PaymentMethodRequiredForOCPill from 'wcstripe/components/payment-method-required-for-oc-pill';
 
 const Wrapper = styled.div`
 	display: flex;
@@ -75,10 +74,6 @@ const PaymentMethodDescription = ( {
 								id={ id }
 								label={ label }
 							/>
-							<PaymentMethodRequiredForOCPill
-								id={ id }
-								label={ label }
-							/>
 						</>
 					) }
 				</LabelWrapper>

client/settings/general-settings-section/payment-method.js

@@ -7,7 +7,7 @@ import interpolateComponents from 'interpolate-components';
 import PaymentMethodsMap from '../../payment-methods-map';
 import PaymentMethodDescription from './payment-method-description';
 import PaymentMethodCheckbox from './payment-method-checkbox';
-import { useIsOCEnabled, useManualCapture } from 'wcstripe/data';
+import { useManualCapture } from 'wcstripe/data';
 import {
 	PAYMENT_METHOD_AFFIRM,
 	PAYMENT_METHOD_AFTERPAY_CLEARPAY,
@@ -105,7 +105,6 @@ const StyledFees = styled( PaymentMethodFeesPill )`
 `;
 
 const PaymentMethod = ( { method, data } ) => {
-	const [ isOCEnabled ] = useIsOCEnabled();
 	const [ isManualCaptureEnabled ] = useManualCapture();
 	const paymentMethodCurrencies = usePaymentMethodCurrencies( method );
 
@@ -138,7 +137,7 @@ const PaymentMethod = ( { method, data } ) => {
 			// eslint-disable-next-line camelcase
 			wc_stripe_settings_params.has_klarna_gateway_plugin );
 
-	const isDisabledButChecked = PAYMENT_METHOD_CARD === method && isOCEnabled;
+	const isDisabledButChecked = false;
 
 	return (
 		<div key={ method }>

includes/class-wc-stripe.php

@@ -865,8 +865,7 @@ public function initialize_status_page() {
 
 	/**
 	 * Toggle payment methods that should be enabled/disabled, e.g. unreleased,
-	 * BNPLs when other official plugins are active,
-	 * cards when the Optimized Checkout is enabled, etc.
+	 * BNPLs when other official plugins are active, etc.
 	 *
 	 * @return void
 	 */
@@ -877,7 +876,6 @@ public function maybe_toggle_payment_methods() {
 		}
 
 		$payment_method_ids_to_disable = [];
-		$payment_method_ids_to_enable  = [];
 		$enabled_payment_methods       = $gateway->get_upe_enabled_payment_method_ids();
 
 		// Check for BNPLs that should be deactivated.
@@ -892,22 +890,10 @@ public function maybe_toggle_payment_methods() {
 			$this->maybe_deactivate_amazon_pay( $enabled_payment_methods )
 		);
 
-		// Check if cards should be activated.
-		// TODO: Remove this once card is not a requirement for the Optimized Checkout.
-		if ( $gateway->is_oc_enabled()
-			&& ! in_array( WC_Stripe_Payment_Methods::CARD, $enabled_payment_methods, true ) ) {
-			$payment_method_ids_to_enable[] = WC_Stripe_Payment_Methods::CARD;
-		}
-
-		if ( [] === $payment_method_ids_to_disable && [] === $payment_method_ids_to_enable ) {
+		if ( [] === $payment_method_ids_to_disable ) {
 			return;
 		}
 
-		$enabled_payment_methods = array_merge(
-			$enabled_payment_methods,
-			$payment_method_ids_to_enable
-		);
-
 		$gateway->update_enabled_payment_methods(
 			array_diff( $enabled_payment_methods, $payment_method_ids_to_disable )
 		);

includes/payment-methods/class-wc-stripe-upe-payment-gateway.php

@@ -629,6 +629,12 @@ public function get_upe_enabled_payment_method_ids( $force_refresh = false ) {
 	 * @return string[]
 	 */
 	public function get_upe_enabled_at_checkout_payment_method_ids( $order_id = null ) {
+		// If the Optimized Checkout is enabled, we need to return just the card payment method.
+		// All payment methods are rendered inside of it.
+		if ( $this->oc_enabled ) {
+			return [ WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID ];
+		}
+
 		$is_automatic_capture_enabled = $this->is_automatic_capture_enabled();
 		$available_method_ids         = [];
 		$account_domestic_currency    = WC_Stripe::get_instance()->account->get_account_default_currency();

includes/payment-methods/class-wc-stripe-upe-payment-method.php

@@ -175,7 +175,9 @@ public function get_id() {
 	 * @return bool
 	 */
 	public function is_enabled() {
-		return 'yes' === $this->enabled;
+		return 'yes' === $this->enabled
+			// When OC is enabled, we use the card payment container to render all the methods.
+			|| ( $this->oc_enabled && WC_Stripe_Payment_Methods::CARD === $this->stripe_id );
 	}
 
 	/**
@@ -185,8 +187,8 @@ public function is_enabled() {
 	 */
 	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 ( $this->oc_enabled && WC_Stripe_Payment_Methods::CARD === $this->stripe_id ) {
+			return true;
 		}
 
 		if ( is_add_payment_method_page() && ! $this->is_reusable() ) {

readme.txt

@@ -111,6 +111,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.8.0 - xxxx-xx-xx =
+* Fix - Removes the credit card payment method requirement for the Optimized Checkout feature
 * Add - Includes a new notice to highlight the Optimized Checkout feature above the payment methods list in the Stripe settings page
 * Update - Increases the default font size for the Optimized Checkout payment element to match the rest of the checkout form
 * Fix - Checks for the subscription payment method (if it is Stripe) when verifying for the payment method detachment

tests/phpunit/PaymentMethods/WC_Stripe_UPE_Payment_Gateway_Test.php

@@ -311,15 +311,6 @@ public function test_get_upe_available_payment_methods( $country, $available_pay
 		$this->assertSame( $available_payment_methods, $this->mock_gateway->get_upe_available_payment_methods(), "Available payment methods are not the same for $country" );
 	}
 
-	public function test_get_upe_enabled_at_checkout_payment_method_ids() {
-		$available_payment_methods = [
-			WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID,
-			WC_Stripe_UPE_Payment_Method_Link::STRIPE_ID,
-		];
-		$this->mock_payment_method_configurations( $available_payment_methods );
-		$this->assertSame( $available_payment_methods, $this->mock_gateway->get_upe_enabled_at_checkout_payment_method_ids() );
-	}
-
 	public function get_upe_available_payment_methods_provider() {
 		return [
 			[
@@ -385,6 +376,60 @@ public function get_upe_available_payment_methods_provider() {
 		];
 	}
 
+	/**
+	 * Tests for `get_upe_enabled_at_checkout_payment_method_ids`.
+	 *
+	 * @param array $available_methods The available payment methods.
+	 * @param bool $oc_enabled Whether the OC feature is enabled.
+	 * @param array $expected The expected payment method IDs.
+	 * @return void
+	 *
+	 * @dataProvider provide_test_get_upe_enabled_at_checkout_payment_method_ids
+	 */
+	public function test_get_upe_enabled_at_checkout_payment_method_ids( $available_methods, $oc_enabled, $expected ) {
+		$this->mock_gateway->oc_enabled = $oc_enabled;
+
+		$this->mock_payment_method_configurations( $available_methods );
+
+		$actual = $this->mock_gateway->get_upe_enabled_at_checkout_payment_method_ids();
+
+		// Clean up.
+		$this->mock_gateway->oc_enabled = false;
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider for `test_get_upe_enabled_at_checkout_payment_method_ids`.
+	 *
+	 * @return array[]
+	 */
+	public function provide_test_get_upe_enabled_at_checkout_payment_method_ids() {
+		return [
+			'Default'    => [
+				'available methods' => [
+					WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID,
+					WC_Stripe_UPE_Payment_Method_Link::STRIPE_ID,
+				],
+				'OC enabled' => false,
+				'expected' => [
+					WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID,
+					WC_Stripe_UPE_Payment_Method_Link::STRIPE_ID,
+				],
+			],
+			'OC enabled' => [
+				'available methods (ignored)' => [
+					WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID,
+					WC_Stripe_UPE_Payment_Method_Link::STRIPE_ID,
+				],
+				'OC enabled' => true,
+				'expected' => [
+					WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID,
+				],
+			],
+		];
+	}
+
 	/**
 	 * CLASSIC CHECKOUT TESTS.
 	 */

tests/phpunit/WC_Stripe_Test.php

@@ -29,7 +29,6 @@ public function test_constants_defined() {
 	 *
 	 * @param array $active_gateways The active payment gateways.
 	 * @param array $enabled_payment_method_ids The enabled payment method IDs.
-	 * @param bool $oc_enabled Whether the one-click payment methods are enabled.
 	 * @param int $update_enable_payment_methods_calls The number of times `update_enabled_payment_methods` should be called.
 	 * @return void
 	 *
@@ -38,7 +37,6 @@ public function test_constants_defined() {
 	public function test_maybe_toggle_payment_methods(
 		$active_gateways,
 		$enabled_payment_method_ids,
-		$oc_enabled,
 		$update_enable_payment_methods_calls
 	) {
 		$original_payment_gateways = WC()->payment_gateways->payment_gateways;
@@ -50,10 +48,6 @@ public function test_maybe_toggle_payment_methods(
 			->disableOriginalConstructor()
 			->getMock();
 
-		$upe_payment_gateway->expects( $this->once() )
-			->method( 'is_oc_enabled' )
-			->willReturn( $oc_enabled );
-
 		$upe_payment_gateway->expects( $this->once() )
 			->method( 'get_upe_enabled_payment_method_ids' )
 			->willReturn( $enabled_payment_method_ids );
@@ -88,7 +82,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
-				'OC enabled'                          => false,
 				'update enable payment methods calls' => 0,
 			],
 			'affirm'                                      => [
@@ -102,7 +95,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AFFIRM,
 				],
-				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'klarna'                                      => [
@@ -116,7 +108,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
-				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'klarna and affirm active, but not on Stripe' => [
@@ -133,7 +124,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
-				'OC enabled'                          => false,
 				'update enable payment methods calls' => 0,
 			],
 			'klarna and affirm active in both'            => [
@@ -152,7 +142,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 					WC_Stripe_Payment_Methods::AFFIRM,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
-				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'amazon pay'                                  => [
@@ -161,13 +150,6 @@ public function provide_test_maybe_toggle_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AMAZON_PAY,
 				],
-				'OC enabled'                          => false,
-				'update enable payment methods calls' => 1,
-			],
-			'card, OC enabled'                            => [
-				'active gateways'                     => [],
-				'enabled payment method IDs'          => [],
-				'OC enabled'                          => true,
 				'update enable payment methods calls' => 1,
 			],
 		];