Fix 'Invalid Configuration' error when disabling card (#4531)

* PMC: required card to be enabled before adding Apple Pay and Google Pay

* Add unit tests

* Add readme and changelog entries

* Add comments

---------

Co-authored-by: Wesley Rosa <[email protected]>

Author: annemirasol

changelog.txt

@@ -20,6 +20,7 @@
 * Fix - Prevent Stripe API calls after several consecutive 401 (Unauthorized) responses
 * Fix - 3DS authentication modal not shown when using Google Pay
 * Update - Improve Stripe API connector logging to include request/response context
+* Fix - Require credit cards to be enabled before Apple Pay and Google Pay can be enabled in PMC
 
 = 9.7.0 - 2025-07-21 =
 * Update - Removes BNPL payment methods (Klarna and Affirm) when other official plugins are active

includes/admin/class-wc-rest-stripe-settings-controller.php

@@ -300,7 +300,11 @@ private function get_payment_method_ids_to_enable( WP_REST_Request $request ) {
 		$is_upe_enabled               = $request->get_param( 'is_upe_enabled' );
 		$is_payment_request_enabled   = $request->get_param( 'is_payment_request_enabled' );
 
-		if ( $is_upe_enabled && $is_payment_request_enabled ) {
+		// Card is required for Apple Pay and Google Pay.
+		if ( $is_upe_enabled &&
+			 $is_payment_request_enabled &&
+			 in_array( WC_Stripe_Payment_Methods::CARD, $payment_method_ids_to_enable, true )
+		) {
 			$payment_method_ids_to_enable = array_merge(
 				$payment_method_ids_to_enable,
 				[ WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ]

readme.txt

@@ -129,5 +129,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Prevent Stripe API calls after several consecutive 401 (Unauthorized) responses
 * Fix - 3DS authentication modal not shown when using Google Pay
 * Update - Improve Stripe API connector logging to include request/response context
+* Fix - Require credit cards to be enabled before Apple Pay and Google Pay can be enabled in PMC
 
 [See changelog for full details across versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

tests/phpunit/Admin/WC_REST_Stripe_Settings_Controller_Test.php

@@ -376,6 +376,61 @@ public function test_update_settings_fails_if_user_cannot_manage_woocommerce() {
 		remove_filter( 'user_has_cap', $cb );
 	}
 
+	/**
+	 * Tests that Apple Pay and Google Pay can be enabled in the PMC
+	 * when payment request is enabled, and card is enabled.
+	 */
+	public function test_update_settings_enables_apple_pay_google_pay() {
+		// Before the update: card and CashApp are enabled, Apple Pay and Google Pay are disabled
+		$this->mock_payment_method_configurations(
+			[ WC_Stripe_Payment_Methods::CARD, WC_Stripe_Payment_Methods::CASHAPP_PAY ],
+			[ WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ]
+		);
+
+		// After the update: card, Apple Pay, and Google Pay are enabled, CashApp is disabled
+		$this->expect_payment_method_configurations_update(
+			[ WC_Stripe_Payment_Methods::CARD, WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ],
+			[ WC_Stripe_Payment_Methods::CASHAPP_PAY ]
+		);
+		$request = new WP_REST_Request( 'POST', self::SETTINGS_ROUTE );
+		// Disable CashApp, keep card enabled.
+		$request->set_param( 'enabled_payment_method_ids', [ WC_Stripe_Payment_Methods::CARD ] );
+		$request->set_param( 'is_upe_enabled', true );
+		// Enable Apple Pay and Google Pay.
+		$request->set_param( 'is_payment_request_enabled', true );
+
+		$response = $this->controller->update_settings( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Tests that Apple Pay and Google Pay can only be enabled in the PMC
+	 * when payment request is enabled, and card is enabled.
+	 */
+	public function test_update_settings_enforces_apple_pay_google_pay_requires_card() {
+		// Before the update: card, Apple Pay, and Google Pay are enabled, CashApp is disabled
+		$this->mock_payment_method_configurations(
+			[ WC_Stripe_Payment_Methods::CARD, WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ],
+			[ WC_Stripe_Payment_Methods::CASHAPP_PAY ]
+		);
+
+		// After the update: CashApp is enabled, card, Apple Pay, and Google Pay are disabled
+		$this->expect_payment_method_configurations_update(
+			[ WC_Stripe_Payment_Methods::CASHAPP_PAY ],
+			[ WC_Stripe_Payment_Methods::CARD, WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ]
+		);
+
+		$request = new WP_REST_Request( 'POST', self::SETTINGS_ROUTE );
+		// Disable card, enable CashApp.
+		$request->set_param( 'enabled_payment_method_ids', [ WC_Stripe_Payment_Methods::CASHAPP_PAY ] );
+		$request->set_param( 'is_upe_enabled', true );
+		// Enable Apple Pay and Google Pay -- this will be ignored because card is disabled
+		$request->set_param( 'is_payment_request_enabled', true );
+
+		$response = $this->controller->update_settings( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
 	/**
 	 * Tests for the dismiss notice endpoint.
 	 *