Turn off Amazon Pay in PMC if feature flag is off (#4535)

* Disable unreleased Amazon Pay on init

* Add changelog and readme entries

* Remove unintended whitespace changes

* Fix unit test

Co-authored-by: Copilot <[email protected]>

* Rephrase readme.txt entry

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

* Rephrase changelog.txt entry

---------

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

Author: 3 people

changelog.txt

@@ -18,6 +18,7 @@
 * Fix - Require credit cards to be enabled before Apple Pay and Google Pay can be enabled in PMC
 * Fix - Free trial subscription orders with payment methods that require redirection (eg: iDeal, Bancontact)
 * Tweak - Update checkout error message for invalid API key to be more generic and user-friendly
+* Tweak - Disable Amazon Pay in the merchant's Payment Method Configuration object if it is still behind a feature flag
 
 = 9.7.1 - 2025-07-28 =
 * Add - Add state mapping for Lithuania in express checkout

includes/class-wc-stripe.php

@@ -282,8 +282,9 @@ public function init() {
 
 		add_action( 'init', [ $this, 'initialize_apple_pay_registration' ] );
 
-		// Check if other official plugins are active for Klarna or Affirm and deactivate those BNPLs if so.
-		add_action( 'init', [ $this, 'maybe_deactivate_bnpls' ] );
+		// Check for payment methods that should be deactivated, e.g. unreleased,
+		// BNPLs when official plugins are active, etc.
+		add_action( 'init', [ $this, 'maybe_deactivate_payment_methods' ] );
 	}
 
 	/**
@@ -862,23 +863,54 @@ public function initialize_status_page() {
 	}
 
 	/**
-	 * Maybe deactivate Affirm or Klarna payment methods if other official plugins are active.
+	 * Deactivate payment methods that should be deactivated, e.g. unreleased,
+	 * BNPLs when other official plugins are active, etc.
 	 *
 	 * @return void
 	 */
-	public function maybe_deactivate_bnpls() {
-		$has_affirm_plugin_active = WC_Stripe_Helper::has_gateway_plugin_active( WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM );
-		$has_klarna_plugin_active = WC_Stripe_Helper::has_gateway_plugin_active( WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_KLARNA );
-		if ( ! $has_affirm_plugin_active && ! $has_klarna_plugin_active ) {
-			return;
-		}
-
+	public function maybe_deactivate_payment_methods() {
 		$gateway = $this->get_main_stripe_gateway();
 		if ( ! is_a( $gateway, 'WC_Stripe_UPE_Payment_Gateway' ) ) {
 			return;
 		}
 
+		$payment_method_ids_to_disable = [];
 		$enabled_payment_methods       = $gateway->get_upe_enabled_payment_method_ids();
+
+		// Check for BNPLs that should be deactivated.
+		$payment_method_ids_to_disable = array_merge(
+			$payment_method_ids_to_disable,
+			$this->maybe_deactivate_bnpls( $enabled_payment_methods )
+		);
+
+		// Check if Amazon Pay should be deactivated.
+		$payment_method_ids_to_disable = array_merge(
+			$payment_method_ids_to_disable,
+			$this->maybe_deactivate_amazon_pay( $enabled_payment_methods )
+		);
+
+		if ( [] === $payment_method_ids_to_disable ) {
+			return;
+		}
+
+		$gateway->update_enabled_payment_methods(
+			array_diff( $enabled_payment_methods, $payment_method_ids_to_disable )
+		);
+	}
+
+	/**
+	 * Deactivate Affirm or Klarna payment methods if other official plugins are active.
+	 *
+	 * @param array $enabled_payment_methods The enabled payment methods.
+	 * @return array The payment method IDs to disable.
+	 */
+	private function maybe_deactivate_bnpls( $enabled_payment_methods ) {
+		$has_affirm_plugin_active = WC_Stripe_Helper::has_gateway_plugin_active( WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM );
+		$has_klarna_plugin_active = WC_Stripe_Helper::has_gateway_plugin_active( WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_KLARNA );
+		if ( ! $has_affirm_plugin_active && ! $has_klarna_plugin_active ) {
+			return [];
+		}
+
 		$payment_method_ids_to_disable = [];
 		if ( $has_affirm_plugin_active && in_array( WC_Stripe_Payment_Methods::AFFIRM, $enabled_payment_methods, true ) ) {
 			$payment_method_ids_to_disable[] = WC_Stripe_Payment_Methods::AFFIRM;
@@ -887,15 +919,30 @@ public function maybe_deactivate_bnpls() {
 			$payment_method_ids_to_disable[] = WC_Stripe_Payment_Methods::KLARNA;
 		}
 
-		if ( [] === $payment_method_ids_to_disable ) {
-			return;
+		return $payment_method_ids_to_disable;
+	}
+
+	/**
+	 * Deactivate Amazon Pay if it's not available, i.e. unreleased.
+	 *
+	 * TODO: Remove this method once Amazon Pay is released.
+	 *
+	 * @param array $enabled_payment_methods The enabled payment methods.
+	 * @return array Amazon Pay payment method ID, if it should be disabled.
+	 */
+	private function maybe_deactivate_amazon_pay( $enabled_payment_methods ) {
+		// Safety guard only. Ideally, we will remove this method once Amazon Pay is released.
+		if ( WC_Stripe_Feature_Flags::is_amazon_pay_available() ) {
+			// Nothing to do if Amazon Pay is already released.
+			return [];
 		}
 
-		$gateway->update_enabled_payment_methods(
-			array_diff(
-				$enabled_payment_methods,
-				$payment_method_ids_to_disable
-			)
-		);
+		if ( ! in_array( WC_Stripe_Payment_Methods::AMAZON_PAY, $enabled_payment_methods, true ) ) {
+			// Nothing to do if Amazon Pay is not enabled.
+			return [];
+		}
+
+		// Disable Amazon Pay.
+		return [ WC_Stripe_Payment_Methods::AMAZON_PAY ];
 	}
 }

readme.txt

@@ -127,5 +127,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Require credit cards to be enabled before Apple Pay and Google Pay can be enabled in PMC
 * Fix - Free trial subscription orders with payment methods that require redirection (eg: iDeal, Bancontact)
 * Tweak - Update checkout error message for invalid API key to be more generic and user-friendly
+* Tweak - Disable Amazon Pay in the merchant's Payment Method Configuration object if it is still behind a feature flag
 
 [See changelog for full details across versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

tests/phpunit/WC_Stripe_Test.php

@@ -25,15 +25,14 @@ public function test_constants_defined() {
 	}
 
 	/**
-	 * Tests for `maybe_deactivate_bnpls`.
+	 * Tests for `maybe_deactivate_payment_methods`.
 	 *
 	 * @return void
 	 *
-	 * @dataProvider provide_test_maybe_deactivate_bnpls
+	 * @dataProvider provide_test_maybe_deactivate_payment_methods
 	 */
-	public function test_maybe_deactivate_bnpls(
+	public function test_maybe_deactivate_payment_methods(
 		$active_gateways,
-		$get_upe_payment_method_ids_calls,
 		$enabled_payment_method_ids,
 		$update_enable_payment_methods_calls
 	) {
@@ -46,7 +45,7 @@ public function test_maybe_deactivate_bnpls(
 			->disableOriginalConstructor()
 			->getMock();
 
-		$upe_payment_gateway->expects( $this->exactly( $get_upe_payment_method_ids_calls ) )
+		$upe_payment_gateway->expects( $this->once() )
 			->method( 'get_upe_enabled_payment_method_ids' )
 			->willReturn( $enabled_payment_method_ids );
 
@@ -62,56 +61,53 @@ public function test_maybe_deactivate_bnpls(
 		$wc_stripe->method( 'get_main_stripe_gateway' )
 			->willReturn( $upe_payment_gateway );
 
-		$wc_stripe->maybe_deactivate_bnpls();
+		$wc_stripe->maybe_deactivate_payment_methods();
 
 		// Clean up.
 		WC()->payment_gateways->payment_gateways = $original_payment_gateways;
 	}
 
 	/**
-	 * Provider for `test_maybe_deactivate_bnpls`.
+	 * Provider for `test_maybe_deactivate_payment_methods`.
 	 *
 	 * @return array
 	 */
-	public function provide_test_maybe_deactivate_bnpls() {
+	public function provide_test_maybe_deactivate_payment_methods() {
 		return [
-			'none active'                    => [
+			'none active'                                 => [
 				'active gateways'                     => [],
-				'get UPE payment method IDs calls'    => 0,
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
 				'update enable payment methods calls' => 0,
 			],
-			'affirm'                         => [
+			'affirm'                                      => [
 				'active gateways'                     => [
 					WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM => (object) [
 						'id'      => WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM,
 						'enabled' => 'yes',
 					],
 				],
-				'get UPE payment method IDs calls'    => 1,
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AFFIRM,
 				],
 				'update enable payment methods calls' => 1,
 			],
-			'klarna'                         => [
+			'klarna'                                      => [
 				'active gateways'                     => [
 					WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_KLARNA => (object) [
 						'id'      => WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_KLARNA,
 						'enabled' => 'yes',
 					],
 				],
-				'get UPE payment method IDs calls'    => 1,
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
 				'update enable payment methods calls' => 1,
 			],
-			'both active, but not on Stripe' => [
+			'klarna and affirm active, but not on Stripe' => [
 				'active gateways'                     => [
 					WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM => (object) [
 						'id'      => WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM,
@@ -122,13 +118,12 @@ public function provide_test_maybe_deactivate_bnpls() {
 						'enabled' => 'yes',
 					],
 				],
-				'get UPE payment method IDs calls'    => 1,
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
 				'update enable payment methods calls' => 0,
 			],
-			'both active in both'            => [
+			'klarna and affirm active in both'            => [
 				'active gateways'                     => [
 					WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM => (object) [
 						'id'      => WC_Stripe_Helper::OFFICIAL_PLUGIN_ID_AFFIRM,
@@ -139,14 +134,21 @@ public function provide_test_maybe_deactivate_bnpls() {
 						'enabled' => 'yes',
 					],
 				],
-				'get UPE payment method IDs calls'    => 1,
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AFFIRM,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
 				'update enable payment methods calls' => 1,
 			],
+			'amazon pay'                                  => [
+				'active gateways'                     => [],
+				'enabled payment method IDs'          => [
+					WC_Stripe_Payment_Methods::CARD,
+					WC_Stripe_Payment_Methods::AMAZON_PAY,
+				],
+				'update enable payment methods calls' => 1,
+			],
 		];
 	}
 }