Merge branch 'develop' into add/settings-synchronization

Author: hsingyuc

changelog.txt

@@ -1,12 +1,25 @@
 *** Changelog ***
 
 = 9.4.0 - xxxx-xx-xx =
+* Dev - Introduces new payment method constants for the express methods: Google Pay, Apple Pay, Link, and Amazon Pay (backend version).
+* Dev - Introduces a new Stripe Order class to wrap Stripe-specific logic and data on the backend.
+* Dev - Improves how we handle express payment method titles by introducing new constants and methods to replace duplicate code.
+* 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 a possible fatal error when a product added to the cart cannot be found (with Payment Request Buttons).
 * Add - Add Amazon Pay payment method class.
 * Tweak - Record a Tracks event when enabling/disabling SPE
 * Tweak - Updates the Single Payment Element setting copy. Now it is labeled "Smart Checkout".
 * Update - Enable/disable Amazon Pay by adding/removing it from the enabled payment methods list.
 * Add - Add ACSS payment tokenization.
+* Update - Update payment method type for Amazon Pay orders.
+* Dev - Fetch Stripe settings with Stripe configuration API.
+
+= 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.
@@ -51,7 +64,7 @@
 * 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.
-* Dev - Fetch Stripe settings with Stripe configuration API.
+* Fix - Fix variable dump in ACH customer error message when retrying a payment.
 
 = 9.2.0 - 2025-02-13 =
 * Fix - Fix missing product_id parameter for the express checkout add-to-cart operation.

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 (
 		<>

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 ) => {

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( ', ' )

client/settings/general-settings-section/payment-methods-unavailable-list.js

@@ -13,10 +13,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 ) =>
 				! [ PAYMENT_METHOD_LINK, PAYMENT_METHOD_AMAZON_PAY ].includes(

client/settings/payment-settings/promotional-banner-section.js

@@ -99,6 +99,8 @@ const PromotionalBannerSection = ( {
 						'woocommerce-gateway-stripe'
 					)
 				);
+
+				window.location.reload();
 			} catch ( err ) {
 				createErrorNotice(
 					__(

includes/abstracts/abstract-wc-stripe-payment-gateway.php

@@ -1,4 +1,7 @@
 <?php
+
+use Automattic\WooCommerce\Admin\Overrides\OrderRefund;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -602,7 +605,12 @@ public function process_response( $response, $order ) {
 
 			if ( 'failed' === $response->status ) {
 				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				$order->add_order_note( $localized_message );
+				$order->add_order_note(
+					property_exists( $response, 'outcome' ) && isset( $response->outcome->seller_message )
+						? $response->outcome->seller_message
+						: $localized_message
+				);
+
 				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
 			}
 		} else {
@@ -2389,10 +2397,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(),

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 );
 		}
 	}

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

@@ -237,6 +237,7 @@ public function admin_scripts( $hook_suffix ) {
 			'is_acss_enabled'           => WC_Stripe_Feature_Flags::is_acss_lpm_enabled(),
 			'is_bacs_enabled'           => WC_Stripe_Feature_Flags::is_bacs_lpm_enabled(),
 			'is_blik_enabled'           => WC_Stripe_Feature_Flags::is_blik_lpm_enabled(),
+			'is_becs_debit_enabled'     => WC_Stripe_Feature_Flags::is_becs_debit_lpm_enabled(),
 			'stripe_oauth_url'          => $oauth_url,
 			'stripe_test_oauth_url'     => $test_oauth_url,
 			'show_customization_notice' => get_option( 'wc_stripe_show_customization_notice', 'yes' ) === 'yes' ? true : false,

includes/class-wc-stripe-blocks-support.php

@@ -515,14 +515,22 @@ public function add_stripe_intents( PaymentContext $context, PaymentResult &$res
 	 * @param string    $payment_request_type The payment request type used for payment.
 	 */
 	private function add_order_meta( \WC_Order $order, $payment_request_type ) {
-		if ( 'apple_pay' === $payment_request_type ) {
-			$order->set_payment_method_title( 'Apple Pay (Stripe)' );
-			$order->save();
-		} elseif ( 'google_pay' === $payment_request_type ) {
-			$order->set_payment_method_title( 'Google Pay (Stripe)' );
-			$order->save();
-		} elseif ( 'payment_request_api' === $payment_request_type ) {
-			$order->set_payment_method_title( 'Payment Request (Stripe)' );
+		$payment_method_title = '';
+		switch ( $payment_request_type ) {
+			case WC_Stripe_Payment_Methods::APPLE_PAY:
+				$payment_method_title = WC_Stripe_Payment_Methods::APPLE_PAY_LABEL;
+				break;
+			case WC_Stripe_Payment_Methods::GOOGLE_PAY:
+				$payment_method_title = WC_Stripe_Payment_Methods::GOOGLE_PAY_LABEL;
+				break;
+			case 'payment_request_api':
+				$payment_method_title = WC_Stripe_Payment_Methods::PAYMENT_REQUEST_LABEL;
+				break;
+		}
+
+		if ( $payment_method_title ) {
+			$payment_method_suffix = WC_Stripe_Express_Checkout_Helper::get_payment_method_title_suffix();
+			$order->set_payment_method_title( $payment_method_title . $payment_method_suffix );
 			$order->save();
 		}
 	}

includes/class-wc-stripe-feature-flags.php

@@ -12,6 +12,7 @@ class WC_Stripe_Feature_Flags {
 	const LPM_ACSS_FEATURE_FLAG_NAME          = '_wcstripe_feature_lpm_acss';
 	const LPM_BACS_FEATURE_FLAG_NAME          = '_wcstripe_feature_lpm_bacs';
 	const LPM_BLIK_FEATURE_FLAG_NAME          = '_wcstripe_feature_lpm_blik';
+	const LPM_BECS_DEBIT_FEATURE_FLAG_NAME    = '_wcstripe_feature_lpm_becs_debit';
 
 	/**
 	 * Map of feature flag option names => their default "yes"/"no" value.
@@ -20,13 +21,14 @@ class WC_Stripe_Feature_Flags {
 	 * @var array
 	 */
 	protected static $feature_flags = [
-		'_wcstripe_feature_upe'            => 'yes',
-		self::ECE_FEATURE_FLAG_NAME        => 'yes',
-		self::AMAZON_PAY_FEATURE_FLAG_NAME => 'no',
-		self::SPE_FEATURE_FLAG_NAME        => 'no',
-		self::LPM_ACH_FEATURE_FLAG_NAME    => 'yes',
-		self::LPM_ACSS_FEATURE_FLAG_NAME   => 'no',
-		self::LPM_BACS_FEATURE_FLAG_NAME   => 'yes',
+		'_wcstripe_feature_upe'                => 'yes',
+		self::ECE_FEATURE_FLAG_NAME            => 'yes',
+		self::AMAZON_PAY_FEATURE_FLAG_NAME     => 'no',
+		self::SPE_FEATURE_FLAG_NAME            => 'no',
+		self::LPM_ACH_FEATURE_FLAG_NAME        => 'yes',
+		self::LPM_ACSS_FEATURE_FLAG_NAME       => 'no',
+		self::LPM_BACS_FEATURE_FLAG_NAME       => 'yes',
+		self::LPM_BECS_DEBIT_FEATURE_FLAG_NAME => 'no',
 	];
 
 	/**
@@ -99,6 +101,16 @@ public static function is_blik_lpm_enabled(): bool {
 		return 'yes' === self::get_option_with_default( self::LPM_BLIK_FEATURE_FLAG_NAME );
 	}
 
+	/**
+	 * Checks whether BECS Debit LPM (Local Payment Method) feature flag is enabled.
+	 * https://docs.stripe.com/payments/au-becs-debit.
+	 *
+	 * @return bool
+	 */
+	public static function is_becs_debit_lpm_enabled(): bool {
+		return 'yes' === self::get_option_with_default( self::LPM_BECS_DEBIT_FEATURE_FLAG_NAME );
+	}
+
 	/**
 	 * Checks whether Stripe ECE (Express Checkout Element) feature flag is enabled.
 	 * Express checkout buttons are rendered with either ECE or PRB depending on this feature flag.

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'.
@@ -1490,7 +1490,17 @@ public static function get_european_economic_area_countries() {
 	 * @return bool Whether the payment method allows manual capture.
 	 */
 	public static function payment_method_allows_manual_capture( string $payment_method_id ) {
-		return in_array( $payment_method_id, [ 'stripe', 'stripe_affirm', 'stripe_klarna', 'stripe_afterpay_clearpay' ], true );
+		return in_array(
+			$payment_method_id,
+			[
+				'stripe',
+				'stripe_affirm',
+				'stripe_klarna',
+				'stripe_afterpay_clearpay',
+				'stripe_amazon_pay',
+			],
+			true
+		);
 	}
 
 	/**
@@ -1653,4 +1663,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';
+	}
 }

includes/class-wc-stripe-intent-controller.php

@@ -636,7 +636,7 @@ public function update_order_status_ajax() {
 			wp_send_json_error(
 				[
 					'error' => [
-						'message' => $e->getMessage(),
+						'message' => $e->getLocalizedMessage(),
 					],
 				]
 			);