Use the default ordering of the payment methods for new installations when the new settings sync is enabled (#4300)

* Use UPE_AVAILABLE_METHODS as default order when enabling PMC sync

Author: diegocurbelo

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

@@ -357,6 +357,11 @@ public static function maybe_migrate_payment_methods_from_db_to_pmc() {
 			);
 		}
 
+		// If there is no payment method order defined, set it to the default order
+		if ( empty( $stripe_settings['stripe_upe_payment_method_order'] ) ) {
+			$stripe_settings['stripe_upe_payment_method_order'] = array_keys( WC_Stripe_UPE_Payment_Gateway::UPE_AVAILABLE_METHODS );
+		}
+
 		// Mark migration as complete in stripe settings
 		$stripe_settings['pmc_enabled'] = 'yes';
 		WC_Stripe_Helper::update_main_stripe_settings( $stripe_settings );

tests/phpunit/admin/migrations/test-class-migrate-payment-methods-from-db-to-pmc.php

@@ -82,4 +82,43 @@ public function test_migration_handles_empty_enabled_payment_methods() {
 		$this->assertArrayHasKey( 'pmc_enabled', $updated_settings );
 		$this->assertEquals( 'yes', $updated_settings['pmc_enabled'] );
 	}
+
+	public function test_migration_sets_default_payment_method_order() {
+		// Set up environment with pmc_enabled not set and no payment method order
+		$stripe_settings = WC_Stripe_Helper::get_stripe_settings();
+		$stripe_settings['test_connection_type'] = 'connect';
+		$stripe_settings['pmc_enabled'] = '';
+		$stripe_settings['stripe_upe_payment_method_order'] = '';
+		WC_Stripe_Helper::update_main_stripe_settings( $stripe_settings );
+
+		$this->mock_payment_method_configurations( [], [] );
+
+		// Execute migration
+		$this->pmc->maybe_migrate_payment_methods_from_db_to_pmc();
+
+		// Verify payment method order is set to default
+		$updated_settings = WC_Stripe_Helper::get_stripe_settings();
+		$this->assertArrayHasKey( 'stripe_upe_payment_method_order', $updated_settings );
+		$this->assertEquals( array_keys( WC_Stripe_UPE_Payment_Gateway::UPE_AVAILABLE_METHODS ), $updated_settings['stripe_upe_payment_method_order'] );
+	}
+
+	public function test_migration_preserves_existing_payment_method_order() {
+		// Set up environment with pmc_enabled not set and existing payment method order
+		$existing_order = [ 'card', 'sepa_debit', 'ideal' ];
+		$stripe_settings = WC_Stripe_Helper::get_stripe_settings();
+		$stripe_settings['test_connection_type'] = 'connect';
+		$stripe_settings['pmc_enabled'] = '';
+		$stripe_settings['stripe_upe_payment_method_order'] = $existing_order;
+		WC_Stripe_Helper::update_main_stripe_settings( $stripe_settings );
+
+		$this->mock_payment_method_configurations( [], [] );
+
+		// Execute migration
+		$this->pmc->maybe_migrate_payment_methods_from_db_to_pmc();
+
+		// Verify payment method order is preserved
+		$updated_settings = WC_Stripe_Helper::get_stripe_settings();
+		$this->assertArrayHasKey( 'stripe_upe_payment_method_order', $updated_settings );
+		$this->assertEquals( $existing_order, $updated_settings['stripe_upe_payment_method_order'] );
+	}
 }