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

Author: malithsen

changelog.txt

@@ -1,6 +1,34 @@
 *** Changelog ***
 
+= 9.7.0 - 2025-07-21 =
+* Update - Removes BNPL payment methods (Klarna and Affirm) when other official plugins are active
+* Fix - Moves the existing order lock functionality earlier in the order processing flow to prevent duplicate processing requests
+* Add - Adds two new safety filters to the subscriptions detached debug tool: `wc_stripe_detached_subscriptions_maximum_time` and `wc_stripe_detached_subscriptions_maximum_count`
+* Add - Show a notice when editing an active subscription that has no payment method attached
+* Fix - Fixes a possible fatal error when trying to generate the order signature for a `WC_Order_Refund` object
+* Add - New WooCommerce Debug Tool to list subscriptions without a payment method attached
+* Fix - Fixes a possible error notice when the `payment_request` Stripe setting key is not defined
+* Fix - Prevent irrelevant payment method update requests to Stripe during checkout
+* Add - A notice to take user back to WC onboarding flow after connecting the Stripe account
+* Tweak - Deprecate wc_connect_* filters
+* Fix - Prevent text field reset while editing Optimized Checkout title
+* Update - Improvements to custom checkout fields support for express checkout
+* Tweak - Use the Database Cache for the Stripe Account Data
+* Update - Update filter names to use the wc_stripe_* prefix
+* Add - Show payment methods sync status on the UI
+* Fix - No such customer error when creating a payment method with a new Stripe account
+* Fix - Validate create customer payload against required billing fields before sending to Stripe
+* Update - Enhanced logging system with support for all log levels and improved context handling
+* Fix - Fixes wrong price formatting in express checkout
+* Fix - Require email address only for Stripe customer validation when request is from the Add Payment Method page
+* Fix - Set default values for custom field options
+* Fix - Enforce rate limiter for failed add payment method attempts
+* Update - Add the number of pending webhooks to the Account status section
+* Fix - Prevent "Undefined array key charges_enabled" PHP warning when determining live‑mode status
+* Update - Deprecate `wc_gateway_stripe_process_payment`, `wc_gateway_stripe_process_redirect_payment` and `wc_gateway_stripe_process_webhook_payment` actions in favour of `wc_gateway_stripe_process_payment_charge`
+
 = 9.6.0 - 2025-07-07 =
+* Fix - Register Express Checkout script before use to restore buttons on “order-pay” pages
 * Dev - Re-include the deprecated WC_Stripe_Order class to avoid breaking changes for merchants using it
 * Update - Removes the change display order feature from the settings page when the Optimized Checkout is enabled
 * Update - Removes the customization of individual payment method titles and descriptions

client/blocks/upe/index.js

@@ -3,9 +3,11 @@ import {
 	registerExpressPaymentMethod,
 } from '@woocommerce/blocks-registry';
 import {
+	PAYMENT_METHOD_AFFIRM,
 	PAYMENT_METHOD_AMAZON_PAY,
 	PAYMENT_METHOD_CARD,
 	PAYMENT_METHOD_GIROPAY,
+	PAYMENT_METHOD_KLARNA,
 	PAYMENT_METHOD_LINK,
 } from '../../stripe-utils/constants';
 import { updateTokenLabelsWhenLoaded } from './token-label-updater.js';
@@ -38,18 +40,26 @@ const api = new WCStripeAPI(
 const paymentMethodsConfig =
 	getBlocksConfiguration()?.paymentMethodsConfig ?? {};
 
-const methodsToFilter = [
-	PAYMENT_METHOD_AMAZON_PAY,
-	PAYMENT_METHOD_LINK,
-	PAYMENT_METHOD_GIROPAY, // Skip giropay as it was deprecated by Jun, 30th 2024.
-];
-
 // Register UPE Elements.
 if ( getBlocksConfiguration()?.isOCEnabled ) {
 	registerPaymentMethod(
 		upeElement( PAYMENT_METHOD_CARD, api, paymentMethodsConfig.card )
 	);
 } else {
+	const methodsToFilter = [
+		PAYMENT_METHOD_AMAZON_PAY,
+		PAYMENT_METHOD_LINK,
+		PAYMENT_METHOD_GIROPAY, // Skip giropay as it was deprecated by Jun, 30th 2024.
+	];
+
+	// Filter out some BNPLs when other official extensions are present.
+	if ( getBlocksConfiguration()?.hasAffirmGatewayPlugin ) {
+		methodsToFilter.push( PAYMENT_METHOD_AFFIRM );
+	}
+	if ( getBlocksConfiguration()?.hasKlarnaGatewayPlugin ) {
+		methodsToFilter.push( PAYMENT_METHOD_KLARNA );
+	}
+
 	Object.entries( paymentMethodsConfig )
 		.filter( ( [ method ] ) => ! methodsToFilter.includes( method ) )
 		.forEach( ( [ method, config ] ) => {

client/components/payment-method-unavailable-due-conflict-pill/__tests__/index.test.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import { screen, render } from '@testing-library/react';
+import PaymentMethodUnavailableDueConflictPill from '..';
+import { PAYMENT_METHOD_AFFIRM } from 'wcstripe/stripe-utils/constants';
+
+describe( 'PaymentMethodUnavailableDueConflictPill', () => {
+	beforeEach( () => {
+		global.wc_stripe_settings_params = { has_affirm_gateway_plugin: false };
+	} );
+
+	it( 'should render the "Has plugin conflict" text', () => {
+		global.wc_stripe_settings_params = { has_affirm_gateway_plugin: true };
+
+		render(
+			<PaymentMethodUnavailableDueConflictPill
+				id={ PAYMENT_METHOD_AFFIRM }
+				label="Affirm"
+			/>
+		);
+
+		expect(
+			screen.queryByText( 'Has plugin conflict' )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should not render when other extensions are not active', () => {
+		const { container } = render(
+			<PaymentMethodUnavailableDueConflictPill
+				id={ PAYMENT_METHOD_AFFIRM }
+				label="Affirm"
+			/>
+		);
+
+		expect( container.firstChild ).toBeNull();
+	} );
+} );

client/components/payment-method-unavailable-due-conflict-pill/index.js

@@ -0,0 +1,96 @@
+/* global wc_stripe_settings_params */
+import { __, sprintf } from '@wordpress/i18n';
+import React from 'react';
+import styled from '@emotion/styled';
+import interpolateComponents from 'interpolate-components';
+import { Icon, info } from '@wordpress/icons';
+import Popover from 'wcstripe/components/popover';
+import {
+	PAYMENT_METHOD_AFFIRM,
+	PAYMENT_METHOD_KLARNA,
+} from 'wcstripe/stripe-utils/constants';
+
+const StyledPill = styled.span`
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+	padding: 4px 8px;
+	border: 1px solid #fcf9e8;
+	border-radius: 2px;
+	background-color: #fcf9e8;
+	color: #674600;
+	font-size: 12px;
+	font-weight: 400;
+	line-height: 16px;
+	width: fit-content;
+`;
+
+const StyledLink = styled.a`
+	&:focus,
+	&:visited {
+		box-shadow: none;
+	}
+`;
+
+const IconWrapper = styled.span`
+	height: 16px;
+	cursor: pointer;
+`;
+
+const AlertIcon = styled( Icon )`
+	fill: #674600;
+`;
+
+const IconComponent = ( { children, ...props } ) => (
+	<IconWrapper { ...props }>
+		<AlertIcon icon={ info } size="16" />
+		{ children }
+	</IconWrapper>
+);
+
+const PaymentMethodUnavailableDueConflictPill = ( { id, label } ) => {
+	if (
+		( id === PAYMENT_METHOD_AFFIRM &&
+			// eslint-disable-next-line camelcase
+			wc_stripe_settings_params.has_affirm_gateway_plugin ) ||
+		( id === PAYMENT_METHOD_KLARNA &&
+			// eslint-disable-next-line camelcase
+			wc_stripe_settings_params.has_klarna_gateway_plugin )
+	) {
+		return (
+			<StyledPill>
+				{ __( 'Has plugin conflict', 'woocommerce-gateway-stripe' ) }
+				<Popover
+					BaseComponent={ IconComponent }
+					content={ interpolateComponents( {
+						mixedString: sprintf(
+							/* translators: $1: a payment method name */
+							__(
+								'%1$s is unavailable due to another official plugin being active.',
+								'woocommerce-gateway-stripe'
+							),
+							label
+						),
+						components: {
+							currencySettingsLink: (
+								<StyledLink
+									href="/wp-admin/admin.php?page=wc-settings&tab=general"
+									target="_blank"
+									rel="noreferrer"
+									onClick={ ( ev ) => {
+										// Stop propagation is necessary so it doesn't trigger the tooltip click event.
+										ev.stopPropagation();
+									} }
+								/>
+							),
+						},
+					} ) }
+				/>
+			</StyledPill>
+		);
+	}
+
+	return null;
+};
+
+export default PaymentMethodUnavailableDueConflictPill;

client/data/settings/hooks.js

@@ -167,6 +167,10 @@ export const useDebugLog = makeSettingsHook( 'is_debug_log_enabled' );
 export const useIsUpeEnabled = makeSettingsHook( 'is_upe_enabled' );
 export const useIsOCEnabled = makeSettingsHook( 'is_oc_enabled' );
 export const useOCTitle = makeSettingsHook( 'oc_title', 'Stripe' );
+export const useIsPMCEnabled = makeReadOnlySettingsHook(
+	'is_pmc_enabled',
+	false
+);
 
 export const useIndividualPaymentMethodSettings = makeSettingsHook(
 	'individual_payment_method_settings',

client/express-checkout/__tests__/event-handler.test.js

@@ -14,6 +14,12 @@ import {
 
 jest.mock( '@woocommerce/blocks-checkout', () => {}, { virtual: true } );
 
+jest.mock( 'wcstripe/stripe-utils', () => ( {
+	getStripeServerData: jest.fn( () => ( {
+		isCheckout: true,
+	} ) ),
+} ) );
+
 describe( 'Express checkout event handlers', () => {
 	describe( 'shippingAddressChangeHandler', () => {
 		let api;

client/express-checkout/compatibility/classic-checkout-custom-fields.js

@@ -23,28 +23,26 @@ addFilter(
 
 		// Extract the data from the checkout form.
 		const customCheckoutFieldsData = {};
-		Object.keys( customCheckoutFields ).forEach( ( field ) => {
-			const formElements = document.querySelectorAll(
-				`form[name="checkout"] [name="${ field }"]`
-			);
-			if ( ! formElements || formElements.length === 0 ) {
-				return;
-			}
+		const form = document.querySelector( 'form[name="checkout"]' );
+		if ( ! form ) {
+			return extensionData;
+		}
 
-			formElements.forEach( ( formElement ) => {
-				if ( formElement.type === 'checkbox' ) {
-					if ( formElement.checked ) {
-						customCheckoutFieldsData[ field ] = 1;
-					}
-				} else if ( formElement.type === 'radio' ) {
-					if ( formElement.checked ) {
-						customCheckoutFieldsData[ field ] = formElement.value;
+		const formData = new FormData( form );
+		for ( const [ fieldName, fieldValue ] of formData.entries() ) {
+			const isMultiSelect = fieldName.endsWith( '[]' );
+			const key = isMultiSelect ? fieldName.slice( 0, -2 ) : fieldName;
+			if ( Object.keys( customCheckoutFields ).includes( key ) ) {
+				if ( isMultiSelect ) {
+					if ( ! customCheckoutFieldsData[ key ] ) {
+						customCheckoutFieldsData[ key ] = [];
 					}
+					customCheckoutFieldsData[ key ].push( fieldValue );
 				} else {
-					customCheckoutFieldsData[ field ] = formElement.value;
+					customCheckoutFieldsData[ key ] = fieldValue;
 				}
-			} );
-		} );
+			}
+		}
 
 		return {
 			...extensionData,

client/express-checkout/utils/__tests__/normalize.test.js

@@ -12,6 +12,12 @@ jest.mock( 'wcstripe/express-checkout/utils', () => ( {
 	getExpressCheckoutData: jest.fn(),
 } ) );
 
+jest.mock( 'wcstripe/stripe-utils', () => ( {
+	getStripeServerData: jest.fn( () => ( {
+		isCheckout: true,
+	} ) ),
+} ) );
+
 describe( 'Express checkout normalization', () => {
 	describe( 'normalizeLineItems', () => {
 		test( 'normalizes blocks array properly', () => {

client/express-checkout/utils/normalize.js

@@ -1,6 +1,7 @@
 import { select } from '@wordpress/data';
 import { applyFilters } from '@wordpress/hooks';
 import { getExpressCheckoutData } from 'wcstripe/express-checkout/utils';
+import { getStripeServerData } from 'wcstripe/stripe-utils';
 
 /**
  * Normalizes incoming cart total items for use as a displayItems with the Stripe api.
@@ -152,12 +153,18 @@ const approximateLastName = ( name, defaultValue = '' ) => {
  * @return {Object} The custom billing address data.
  */
 const getCustomBillingAddressData = ( data ) => {
+	// Bail if we're on classic checkout. We do not use the Checkout/Cart Store
+	// for supporting custom fields in classic checkout.
+	if ( getStripeServerData()?.isCheckout && ! isBlockCheckoutPage() ) {
+		return {};
+	}
+
 	// We need to specifically pass empty fields when not on the block checkout page,
 	// to avoid sending "hidden" and possibly stale data from previous transactions,
 	// e.g. shopper is on the product page (hence, no checkout form fields are displayed),
 	// but session still holds data from a previous checkout.
 	if ( ! isBlockCheckoutPage() ) {
-		return emptyCustomFieldObject( [ 'address' ] );
+		return emptyCustomFieldsData( [ 'address' ] );
 	}
 
 	const customerData = getCustomerDataFromStore();
@@ -189,12 +196,18 @@ const getCustomBillingAddressData = ( data ) => {
  * @return {Object} The custom shipping address data.
  */
 const getCustomShippingAddressData = ( data ) => {
+	// Bail if we're on classic checkout. We do not use the Checkout/Cart Store
+	// for supporting custom fields in classic checkout.
+	if ( getStripeServerData()?.isCheckout && ! isBlockCheckoutPage() ) {
+		return {};
+	}
+
 	// We need to specifically pass empty fields when not on the block checkout page,
 	// to avoid sending "hidden" and possibly stale data from previous transactions,
 	// e.g. shopper is on the product page (hence, no checkout form fields are displayed),
 	// but session still holds data from a previous checkout.
 	if ( ! isBlockCheckoutPage() ) {
-		return emptyCustomFieldObject( [ 'address' ] );
+		return emptyCustomFieldsData( [ 'address' ] );
 	}
 
 	const customerData = getCustomerDataFromStore();
@@ -258,12 +271,18 @@ const getPhone = ( event ) => {
  * @return {Object} The additional fields data.
  */
 const getAdditionalFieldsData = () => {
+	// Bail if we're on classic checkout. We do not use the Checkout/Cart Store
+	// for supporting custom fields in classic checkout.
+	if ( getStripeServerData()?.isCheckout && ! isBlockCheckoutPage() ) {
+		return {};
+	}
+
 	// We need to specifically pass empty fields when not on the block checkout page,
 	// to avoid sending "hidden" and possibly stale data from previous transactions,
 	// e.g. shopper is on the product page (hence, no checkout form fields are displayed),
 	// but session still holds data from a previous checkout.
 	if ( ! isBlockCheckoutPage() ) {
-		return emptyCustomFieldObject( [ 'contact', 'order' ] );
+		return emptyCustomFieldsData( [ 'contact', 'order' ] );
 	}
 
 	return getAdditionalFieldsDataFromStore();
@@ -315,13 +334,15 @@ const getExtensionDataFromStore = () => {
  *
  * @return {Object} The custom fields object with empty values.
  */
-const emptyCustomFieldObject = ( locations ) => {
-	const customFields = getExpressCheckoutData( 'custom_checkout_fields' );
-	if ( ! customFields ) {
+const emptyCustomFieldsData = ( locations ) => {
+	const customCheckoutFields = getExpressCheckoutData(
+		'custom_checkout_fields'
+	);
+	if ( ! customCheckoutFields ) {
 		return {};
 	}
 
-	const customFieldObject = Object.entries( customFields ).reduce(
+	const emptyData = Object.entries( customCheckoutFields ).reduce(
 		( acc, [ field, config ] ) => {
 			if ( locations.includes( config.location ) ) {
 				acc[ field ] = '';
@@ -331,7 +352,7 @@ const emptyCustomFieldObject = ( locations ) => {
 		{}
 	);
 
-	return customFieldObject;
+	return emptyData;
 };
 
 /**