Fix initial payment method list migration to PMC (#4351)

* Add param to force the migration
* Force PMC migration for new installs, and on re-auth if pmc is not already enabled

Author: diegocurbelo

changelog.txt

@@ -5,6 +5,7 @@
 * Update - Remove feature that flags 401s and proactively blocks subsequent API calls until the store has reauthenticated.
 * Fix - Disable payment settings sync when we receive unsupported payment method configurations.
 * Fix - Ensure that we use current Stripe API keys after settings updates
+* Fix - Fix initial enabled payment methods migration to the Stripe Payment Methods Configuration API
 
 = 9.5.1 - 2025-05-17 =
 * Fix - Add a fetch cooldown to the payment method configuration retrieval endpoint to prevent excessive requests.

includes/class-wc-stripe-payment-method-configurations.php

@@ -348,12 +348,19 @@ public static function is_enabled() {
 
 	/**
 	 * Migrates the payment methods from the DB option to PMC if needed.
+	 *
+	 * @param bool $force_migration Whether to force the migration.
 	 */
-	public static function maybe_migrate_payment_methods_from_db_to_pmc() {
+	public static function maybe_migrate_payment_methods_from_db_to_pmc( $force_migration = false ) {
 		$stripe_settings = WC_Stripe_Helper::get_stripe_settings();
 
-		// Skip if PMC is not enabled or migration already done (pmc_enabled is set).
-		if ( ! self::is_enabled() || ! empty( $stripe_settings['pmc_enabled'] ) ) {
+		// Skip if PMC is not enabled.
+		if ( ! self::is_enabled() ) {
+			return;
+		}
+
+		// Skip if migration already done (pmc_enabled is set) and we are not forcing the migration.
+		if ( ! empty( $stripe_settings['pmc_enabled'] ) && ! $force_migration ) {
 			return;
 		}
 

includes/connect/class-wc-stripe-connect.php

@@ -163,7 +163,7 @@ private function save_stripe_keys( $result, $type = 'connect', $mode = 'live' )
 			$options[ $prefix . 'publishable_key' ]     = $publishable_key;
 			$options[ $prefix . 'secret_key' ]          = $secret_key;
 			$options[ $prefix . 'connection_type' ]     = $type;
-			$options['pmc_enabled']                     = 'connect' === $type ? '' : 'no'; // When not connected via oauth, the PMC is disabled. Otherwise, set to empty string which will be set to 'yes' after the migration in 'maybe_migrate_payment_methods_from_db_to_pmc'.
+			$options['pmc_enabled']                     = 'connect' === $type ? 'yes' : 'no'; // When not connected via Connect OAuth, the PMC is disabled.
 			if ( 'app' === $type ) {
 				$options[ $prefix . 'refresh_token' ] = $result->refreshToken; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			}
@@ -199,15 +199,15 @@ private function save_stripe_keys( $result, $type = 'connect', $mode = 'live' )
 				return new WP_Error( 'wc_stripe_webhook_error', $e->getMessage() );
 			}
 
-			// If we are already using the UPE gateway, update the PMC with the currently enabled payment methods.
+			// For new installs the legacy gateway gets instantiated because there is no settings in the DB yet,
+			// so we need to instantiate the UPE gateway just for the PMC migration.
 			$gateway = WC_Stripe::get_instance()->get_main_stripe_gateway();
-			if ( $gateway instanceof WC_Stripe_UPE_Payment_Gateway ) {
-				// The UPE accepted payment list does not include Apple Pay/Google Pay, but PMC does, so we need to add them (if they are enabled).
-				$enabled_payment_methods = array_merge(
-					$options['upe_checkout_experience_accepted_payments'],
-					$gateway->is_payment_request_enabled() ? [ WC_Stripe_Payment_Methods::APPLE_PAY, WC_Stripe_Payment_Methods::GOOGLE_PAY ] : []
-				);
-				$gateway->update_enabled_payment_methods( $enabled_payment_methods );
+			if ( ! $gateway instanceof WC_Stripe_UPE_Payment_Gateway ) {
+				$gateway = new WC_Stripe_UPE_Payment_Gateway();
+			}
+			// If pmc_enabled is not set (aka new install) or is not 'yes' (aka migration already done) we need to migrate the payment methods from the DB option to Stripe PMC API.
+			if ( empty( $current_options ) || ! isset( $current_options['pmc_enabled'] ) || 'yes' !== $current_options['pmc_enabled'] ) {
+				WC_Stripe_Payment_Method_Configurations::maybe_migrate_payment_methods_from_db_to_pmc( true );
 			}
 
 			return $result;

readme.txt

@@ -115,5 +115,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Update - Remove feature that flags 401s and proactively blocks subsequent API calls until the store has reauthenticated.
 * Fix - Disable payment settings sync when we receive unsupported payment method configurations.
 * Fix - Ensure that we use current Stripe API keys after settings updates
+* Fix - Fix initial enabled payment methods migration to the Stripe Payment Methods Configuration API
 
 [See changelog for full details across versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).