Merge remote-tracking branch 'origin/release/9.3.1' into trunk

diegocurbelo · diegocurbelo · commit 7f0e8783c4fb · 2025-03-15T01:22:27.000-03:00
diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml
@@ -16,18 +16,20 @@ jobs:
         include:
           # WooCommerce
           - woocommerce_support_policy: L
-            woocommerce: '9.5.2'
+            woocommerce: '9.7.1'
           - woocommerce_support_policy: L-1
-            woocommerce: '9.3.4'
+            woocommerce: '9.6.2'
           - woocommerce_support_policy: L-2
-            woocommerce: '9.2.3'
+            woocommerce: '9.5.2'
           # WordPress
           - wordpress_support_policy: L
-            wordpress: '6.7'
+            wordpress: '6.7.2'
           - wordpress_support_policy: L-1
-            wordpress: '6.6'
+            wordpress: '6.6.2'
+          # WooCommerce 9.5.0+ requires WordPress 6.6+
+          # (we'll keep two versions from the 6.6 branch until Apr when WP 6.8 is released)
           - wordpress_support_policy: L-2
-            wordpress: '6.5'
+            wordpress: '6.6'
           # PHP
           - php_support_policy: L
             php: '8.1'
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,12 @@
 *** Changelog ***
 
+= 9.3.1 - 2025-03-14 =
+* Fix - Temporarily disables the subscriptions detached notice feature due to long loading times on stores with many subscriptions.
+* Fix - Update ACH capability check key
+* Fix - Update legacy checkout documentation links and deprecation notice display logic
+* Fix - Fixes an issue where the order signature retrieval method could throw a fatal error when the received order parameter is actually an OrderRefund object (instead of a WC_Order).
+* Fix - Fixes an error with the `filter_thankyou_order_received_text` filter when it does not receive a valid WC_Order instance.
+
 = 9.3.0 - 2025-03-13 =
 * Dev - Adds a new README.md file to the plugin with specific development-focused instructions.
 * Add - Implements the Single Payment Element feature for the new checkout experience on the block checkout page.
diff --git a/client/components/payment-method-capability-status-pill/index.js b/client/components/payment-method-capability-status-pill/index.js
@@ -47,7 +47,10 @@ const IconComponent = ( { children, ...props } ) => (
 
 const PaymentMethodCapabilityStatusPill = ( { id, label } ) => {
 	const capabilities = useGetCapabilities();
-	const capabilityStatus = capabilities[ `${ id }_payments` ];
+	const capabilityStatus =
+		id === 'us_bank_account'
+			? capabilities[ `${ id }_ach_payments` ]
+			: capabilities[ `${ id }_payments` ];
 
 	return (
 		<>
diff --git a/client/components/payment-method-deprecation-pill/index.js b/client/components/payment-method-deprecation-pill/index.js
@@ -60,7 +60,7 @@ const PaymentMethodDeprecationPill = () => {
 					components: {
 						currencySettingsLink: (
 							<StyledLink
-								href="https://support.stripe.com/topics/shutdown-of-the-legacy-sources-api-for-non-card-payment-methods"
+								href="https://woocommerce.com/document/stripe/admin-experience/legacy-checkout-experience/"
 								target="_blank"
 								rel="noreferrer"
 								onClick={ ( ev ) => {
diff --git a/client/data/account/actions.js b/client/data/account/actions.js
@@ -40,11 +40,18 @@ export function* refreshAccount() {
 
 		// Check new payment methods available for account.
 		const newPaymentMethods = activeCapabilitiesAfterRefresh.filter(
-			( paymentMethod ) =>
-				! activeCapabilitiesBeforeRefresh.includes( paymentMethod ) &&
-				PaymentMethodsMap[
-					paymentMethod.replace( '_payments', '' )
-				] !== undefined
+			( capability ) => {
+				const paymentMethodFromCapability =
+					capability === 'us_bank_account_ach_payments'
+						? 'us_bank_account'
+						: capability.replace( '_payments', '' );
+
+				return (
+					! activeCapabilitiesBeforeRefresh.includes( capability ) &&
+					PaymentMethodsMap[ paymentMethodFromCapability ] !==
+						undefined
+				);
+			}
 		);
 
 		// If there are new payment methods available, show a toast informing the user.
@@ -57,9 +64,14 @@ export function* refreshAccount() {
 						'woocommerce-gateway-stripe'
 					),
 					newPaymentMethods
-						.map( ( method ) => {
+						.map( ( capability ) => {
+							const paymentMethodFromCapability =
+								capability === 'us_bank_account_ach_payments'
+									? 'us_bank_account'
+									: capability.replace( '_payments', '' );
+
 							return PaymentMethodsMap[
-								method.replace( '_payments', '' )
+								paymentMethodFromCapability
 							].label;
 						} )
 						.join( ', ' )
diff --git a/client/settings/general-settings-section/payment-methods-unavailable-list.js b/client/settings/general-settings-section/payment-methods-unavailable-list.js
@@ -10,10 +10,13 @@ const PaymentMethodsUnavailableList = () => {
 	const capabilities = useGetCapabilities();
 	const upePaymentMethodIds = useGetAvailablePaymentMethodIds();
 	const unavailablePaymentMethodIds = upePaymentMethodIds
-		.filter(
-			( methodId ) =>
-				! capabilities.hasOwnProperty( `${ methodId }_payments` )
-		)
+		.filter( ( methodId ) => {
+			const capabilityId =
+				methodId === 'us_bank_account'
+					? `${ methodId }_ach_payments`
+					: `${ methodId }_payments`;
+			return ! capabilities.hasOwnProperty( capabilityId );
+		} )
 		.filter( ( id ) => id !== PAYMENT_METHOD_LINK );
 	const unavailablePaymentMethods = unavailablePaymentMethodIds
 		.filter( ( methodId, idx ) => idx < countIconsToDisplay )
diff --git a/client/settings/payment-settings/promotional-banner-section.js b/client/settings/payment-settings/promotional-banner-section.js
@@ -99,6 +99,8 @@ const PromotionalBannerSection = ( {
 						'woocommerce-gateway-stripe'
 					)
 				);
+
+				window.location.reload();
 			} catch ( err ) {
 				createErrorNotice(
 					__(
diff --git a/includes/abstracts/abstract-wc-stripe-payment-gateway.php b/includes/abstracts/abstract-wc-stripe-payment-gateway.php
@@ -1,4 +1,7 @@
 <?php
+
+use Automattic\WooCommerce\Admin\Overrides\OrderRefund;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -2389,10 +2392,12 @@ public function get_balance_transaction_id_from_charge( $charge ) {
 	 *
 	 * This signature is included as metadata in Stripe requests and used to identify the order when webhooks are received.
 	 *
-	 * @param WC_Order $order The Order object.
+	 * @param WC_Order|OrderRefund $order The Order object.
 	 * @return string The order's unique signature. Format: order_id:md5(order_id-order_key-customer_id-order_total).
 	 */
 	protected function get_order_signature( $order ) {
+		$order = ! is_a( $order, 'WC_Order' ) ? wc_get_order( $order ) : $order;
+
 		$signature = [
 			absint( $order->get_id() ),
 			$order->get_order_key(),
diff --git a/includes/admin/class-wc-stripe-admin-notices.php b/includes/admin/class-wc-stripe-admin-notices.php
@@ -104,7 +104,7 @@ public function admin_notices() {
 	public static function display_legacy_deprecation_notice( $plugin_file ) {
 		global $wp_list_table;
 
-		if ( version_compare( WC_STRIPE_VERSION, '9.3.0', '!=' ) || WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
+		if ( WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
 			return;
 		}
 
@@ -372,7 +372,7 @@ public function stripe_check_environment() {
 
 			if ( empty( $legacy_deprecation_notice ) ) {
 				// Show legacy deprecation notice in version 9.3.0 if legacy checkout experience is enabled.
-				if ( ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() && version_compare( WC_STRIPE_VERSION, '9.3.0', '==' ) ) {
+				if ( ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
 					$setting_link = $this->get_setting_link();
 					$message = sprintf(
 						/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
@@ -469,22 +469,30 @@ public function payment_methods_check_environment() {
 	 * @return void
 	 */
 	public function subscriptions_check_environment() {
+		// @todo Temporarily disabling this due long load times on stores with too many subscriptions.
+		return;
+
+		$show_notice = get_option( 'wc_stripe_show_subscriptions_notice' );
+		if ( 'yes' !== $show_notice ) {
+			return;
+		}
+
 		$detached_messages = '';
 		$subscriptions     = WC_Stripe_Subscriptions_Helper::get_detached_subscriptions();
 		foreach ( $subscriptions as $subscription ) {
 			$customer_payment_method_link = sprintf(
 				'<a href="%s">%s</a>',
 				esc_url( $subscription['change_payment_method_url'] ),
 				esc_html(
-					/* translators: this is a text for a link pointing to the customer's payment method page */
+				/* translators: this is a text for a link pointing to the customer's payment method page */
 					__( 'this link &rarr;', 'woocommerce-gateway-stripe' )
 				)
 			);
 			$customer_stripe_page = sprintf(
 				'<a href="%s">%s</a>',
 				esc_url( self::STRIPE_CUSTOMER_PAGE_BASE_URL . $subscription['customer_id'] ),
 				esc_html(
-					/* translators: this is a text for a link pointing to the customer's page on Stripe */
+				/* translators: this is a text for a link pointing to the customer's page on Stripe */
 					__( 'here &rarr;', 'woocommerce-gateway-stripe' )
 				)
 			);
@@ -496,8 +504,7 @@ public function subscriptions_check_environment() {
 				$customer_stripe_page
 			);
 		}
-		$show_notice = get_option( 'wc_stripe_show_subscriptions_notice' );
-		if ( ! empty( $detached_messages ) && 'no' !== $show_notice ) {
+		if ( ! empty( $detached_messages ) ) {
 			$this->add_admin_notice( 'subscriptions', 'notice notice-error', $detached_messages, true );
 		}
 	}
diff --git a/includes/class-wc-stripe-helper.php b/includes/class-wc-stripe-helper.php
@@ -737,7 +737,7 @@ public static function filter_payment_methods_with_capabilities( $payment_method
 		$payment_method_ids_with_capability = [];
 
 		foreach ( $payment_method_ids as $payment_method_id ) {
-			$key = $payment_method_id . '_payments';
+			$key = self::get_payment_method_capability_id( $payment_method_id );
 			// Check if the payment method has capabilities set in the account data.
 			// Generally the key is the payment method id appended with '_payments' (i.e. 'card_payments', 'sepa_debit_payments', 'klarna_payments').
 			// In some cases, the Stripe account might have the legacy key set. For example, for Klarna, the legacy key is 'klarna'.
@@ -1653,4 +1653,19 @@ public static function maybe_log_ip_issues( $ip_address ) {
 			WC_Stripe_Logger::log( 'Invalid IP address detected. Data: ' . wp_json_encode( $log_data ) );
 		}
 	}
+
+	/**
+	 * Return capability ID based on payment method ID.
+	 *
+	 * @param string $payment_method_id The payment method ID.
+	 * @return string The capability ID.
+	 */
+	public static function get_payment_method_capability_id( $payment_method_id ) {
+		// "_payments" is a suffix that comes from Stripe API, except when it is "transfers" or ACH.
+		if ( WC_Stripe_UPE_Payment_Method_ACH::STRIPE_ID === $payment_method_id ) {
+			return $payment_method_id . '_ach_payments';
+		}
+
+		return $payment_method_id . '_payments';
+	}
 }
diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php b/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php
@@ -1841,7 +1841,7 @@ public function generate_upe_checkout_experience_accepted_payments_html( $key, $
 		foreach ( $this->payment_methods as $method_id => $method ) {
 			$method_enabled       = in_array( $method_id, $this->get_upe_enabled_payment_method_ids(), true ) && ( $is_automatic_capture_enabled || ! $method->requires_automatic_capture() ) ? 'enabled' : 'disabled';
 			$method_enabled_label = 'enabled' === $method_enabled ? __( 'enabled', 'woocommerce-gateway-stripe' ) : __( 'disabled', 'woocommerce-gateway-stripe' );
-			$capability_id        = "{$method_id}_payments"; // "_payments" is a suffix that comes from Stripe API, except when it is "transfers", which does not apply here
+			$capability_id        = WC_Stripe_Helper::get_payment_method_capability_id( $method_id );
 			$method_status        = isset( $stripe_capabilities[ $capability_id ] ) ? $stripe_capabilities[ $capability_id ] : 'inactive';
 			$subtext_messages     = $method->get_subtext_messages( $method_status );
 			$aria_label           = sprintf(
@@ -2956,11 +2956,11 @@ public function filter_my_account_my_orders_actions( $actions, $order ) {
 	 * Filter the order received text for Amazon Pay orders, including the delayed confirmation information.
 	 *
 	 * @param string $text Default text.
-	 * @param WC_Order $order Order data.
+	 * @param WC_Order|bool $order Order data.
 	 * @return string
 	 */
 	public function filter_thankyou_order_received_text( $text, $order ) {
-		if ( $order->get_payment_method_title() === 'Amazon Pay (Stripe)' && $order->has_status( 'pending' ) ) {
+		if ( is_a( $order, 'WC_Order' ) && $order->get_payment_method_title() === 'Amazon Pay (Stripe)' && $order->has_status( 'pending' ) ) {
 			$text .= '<p class="woocommerce-info">';
 			$text .= esc_html( 'The payment is being processed and it might take a few minutes before it\'s confirmed.' );
 			$text .= '</p>';
diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-method.php b/includes/payment-methods/class-wc-stripe-upe-payment-method.php
@@ -342,7 +342,7 @@ public function is_capability_active() {
 		if ( empty( $capabilities ) ) {
 			return false;
 		}
-		$key = $this->get_id() . '_payments';
+		$key = WC_Stripe_Helper::get_payment_method_capability_id( $this->get_id() );
 		return isset( $capabilities[ $key ] ) && 'active' === $capabilities[ $key ];
 	}
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "9.3.0",
+  "version": "9.3.1",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, bancont
 Requires at least: 6.5
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 9.3.0
+Stable tag: 9.3.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -110,48 +110,11 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
-= 9.3.0 - 2025-03-13 =
-* Dev - Adds a new README.md file to the plugin with specific development-focused instructions.
-* Add - Implements the Single Payment Element feature for the new checkout experience on the block checkout page.
-* Dev - Additional replacements for payment method constant values on the backend.
-* Fix - Improves the checking for existing customer attribute when retrieving a payment method that may be detached from a subscription.
-* Fix - Reverts the default value for the `capture_method` property to avoid breaking Amazon Pay when creating a payment intent.
-* Add - Adds a new feature flag to handle the Single Payment Element feature.
-* Dev - Moves the method to check if the subscriptions extension is enabled to a new helper class.
-* Dev - Moves and refactor some of the UPE-related code to make Single Payment Element development easier.
-* Add - Add logging of IP address issues when setting up mandate data.
-* Fix - Fixes a fatal error that might happen when a payment method ID cannot be retrieved during the processing of an order (new checkout experience).
-* Dev - Generates a code coverage report for PHP Unit tests as a comment on PRs.
-* Add - Adds Stripe specific information to the System Status Report data.
-* Fix - Fixes a fatal error that might happen during extension install due to missing Amazon Pay default settings data, when registering the settings route.
-* Dev - Adds the payment method constants to the payment methods map file (frontend side).
-* Add - Adds a new notice for store admins when there are subscriptions without a payment method attached.
-* Fix - Hides "pay" and "cancel" buttons on the order received page when an Amazon Pay order is pending, since it may take a while to be confirmed.
-* Fix - Prepare the redirect URL at the end of 'process_payment' method.
-* Fix - Fix uncaught error in block editor when the new checkout experience is enabled.
-* Fix - Fix error when processing a subscription via Amazon Pay.
-* Fix - Make Amazon Pay compatible with upfront pre-orders.
-* Add - Include minimum amounts in the capture_terminal_payment endpoint when a capture fails.
-* Dev - Fix changelog action
-* Tweak - Map feature flags into a standard array for easier maintenance.
-* Dev - Fix QIT Tests GitHub workflow.
-* Fix - Fix issue where payment methods do not refresh after address changes.
-* Add - Bacs: Process Payment with Saved Bank Details
-* Tweak - Update payment method logos on the checkout page.
-* Update - Refactor unsupported deferred intent in the blocks checkout.
-* Add - Use idempotency keys when creating payment intents, to help prevent duplicate charges for a single order.
-* Fix - Allow to save card during checkout with account creation.
-* Add - Add BLIK LPM feature flag.
-* Fix - Skip unnecessary save step when already using a saved payment method for legacy checkout.
-* Fix - Avoid duplicate payment method element for classic checkout.
-* Fix - ACSS: Handle errors and edge cases.
-* Add - Add subscriptions support to Bacs.
-* Update - Add tracks events for payment method settings updates.
-* Fix - Fix issue where Legacy Checkout settings get overwritten with old value.
-* Add - Add WooCommerce Pre-Orders support to Bacs.
-* Tweak - Fix background in express checkout settings.
-* Fix - Prevent potential duplicate renewal charges by ensuring subscription integration hooks are only attached once per Gateway ID
-* Update - Update Amazon Pay icon to use image from WooCommerce Design Library.
-* Add - Show upcoming legacy checkout experience deprecation notice.
+= 9.3.1 - 2025-03-14 =
+* Fix - Temporarily disables the subscriptions detached notice feature due to long loading times on stores with many subscriptions.
+* Fix - Update ACH capability check key
+* Fix - Update legacy checkout documentation links and deprecation notice display logic
+* Fix - Fixes an issue where the order signature retrieval method could throw a fatal error when the received order parameter is actually an OrderRefund object (instead of a WC_Order).
+* Fix - Fixes an error with the `filter_thankyou_order_received_text` filter when it does not receive a valid WC_Order instance.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).
diff --git a/tests/phpunit/admin/test-wc-stripe-admin-notices.php b/tests/phpunit/admin/test-wc-stripe-admin-notices.php
@@ -55,12 +55,16 @@ public function test_correct_stripe_notices_are_shown_in_all_scenarios( $options
 		$notices = new WC_Stripe_Admin_Notices();
 		ob_start();
 		$notices->admin_notices();
-		if ( WC_Stripe_Helper::is_wc_lt( WC_STRIPE_FUTURE_MIN_WC_VER ) ) {
-			// Displaying the style notice results in an early return.
-			if ( ! in_array( 'style', $expected_notices, true ) ) {
+		// Displaying the style notice results in an early return.
+		if ( ! in_array( 'style', $expected_notices, true ) ) {
+			if ( WC_Stripe_Helper::is_wc_lt( WC_STRIPE_FUTURE_MIN_WC_VER ) ) {
 				// This means a version support notice will be added.
 				$expected_notices[] = 'wcver';
 			}
+			if ( ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
+				// This means the legacy checkout support notice will be added.
+				$expected_notices[] = 'legacy_deprecation';
+			}
 		}
 
 		if ( $expected_output ) {
@@ -143,6 +147,7 @@ public function test_invalid_keys_notice_is_shown_when_account_data_is_not_valid
 		);
 		update_option( 'wc_stripe_show_style_notice', 'no' );
 		update_option( 'wc_stripe_show_sca_notice', 'no' );
+		update_option( 'wc_stripe_show_legacy_deprecation_notice', 'no' );
 		update_option( 'home', 'https://...' );
 
 		$notices = new WC_Stripe_Admin_Notices();
diff --git a/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-gateway.php b/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-gateway.php
diff --git a/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-method.php b/tests/phpunit/payment-methods/test-class-wc-stripe-upe-payment-method.php
diff --git a/woocommerce-gateway-stripe.php b/woocommerce-gateway-stripe.php

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ const PromotionalBannerSection = ( {`
`99`	`99`	`'woocommerce-gateway-stripe'`
`100`	`100`	`)`
`101`	`101`	`);`
	`102`	`+`
	`103`	`+ window.location.reload();`
`102`	`104`	`} catch ( err ) {`
`103`	`105`	`createErrorNotice(`
`104`	`106`	`__(`