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

Author: daledupreez

changelog.txt

@@ -1,5 +1,16 @@
 *** Changelog ***
 
+= 9.5.3 - 2025-06-23 =
+* Fix - Reimplement mapping of Express Checkout state values to align with WooCommerce's expected state formats
+* Fix - Adds an exception to be thrown when the order item quantity is zero, during the retrieval of level 3 data from an order.
+* Tweak - Track charge completed via webhooks in order notes
+* Fix - Ensure that we migrate payment_request_button_size=medium on upgrade
+* Fix - Show correct price in express checkout for zero decimal currencies
+* Fix - Fixes a possible fatal error with Multibanco purchases when generating the email instructions.
+* Fix - Fix buggy unsaved changes warning in settings page
+* Fix - Use the platform's payment method configuration id constant when rendering the Optimized Checkout
+* Update - Improve checks in voucher purchase flow
+
 = 9.5.2 - 2025-05-22 =
 * Add - Implement custom database cache for persistent caching with in-memory optimization.
 * Update - Remove feature that flags 401s and proactively blocks subsequent API calls until the store has reauthenticated.

client/api/index.js

@@ -497,6 +497,23 @@ export default class WCStripeAPI {
 		);
 	}
 
+	/**
+	 * Normalizes address fields in WooCommerce supported format.
+	 *
+	 * @param {Object} billingAddress Billing address.
+	 * @param {Object} shippingAddress Shipping address.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutNormalizeAddress( billingAddress, shippingAddress ) {
+		return this.request( getExpressCheckoutAjaxURL( 'normalize_address' ), {
+			security: getExpressCheckoutData( 'nonce' )?.normalize_address,
+			data: {
+				billing_address: billingAddress,
+				shipping_address: shippingAddress,
+			},
+		} );
+	}
+
 	/**
 	 * Get cart items and total amount.
 	 *

client/classic/upe/payment-processing.js

@@ -567,7 +567,8 @@ export const createAndConfirmSetupIntent = (
  * @param {Object} jQueryForm    The jQuery object for the form being submitted.
  */
 export const confirmVoucherPayment = async ( api, jQueryForm ) => {
-	const isOrderPay = getStripeServerData()?.isOrderPay;
+	const stripeServerData = getStripeServerData();
+	const isOrderPay = stripeServerData?.isOrderPay;
 
 	// The Order Pay page does a hard refresh when the hash changes, so we need to block the UI again.
 	if ( isOrderPay ) {
@@ -596,7 +597,7 @@ export const confirmVoucherPayment = async ( api, jQueryForm ) => {
 	// Verify the request using the data added to the URL.
 	if (
 		! clientSecret ||
-		( isOrderPay && orderId !== getStripeServerData()?.orderId )
+		( isOrderPay && orderId !== stripeServerData?.orderId )
 	) {
 		jQueryForm.removeClass( 'processing' ).unblock();
 		return;
@@ -624,13 +625,63 @@ export const confirmVoucherPayment = async ( api, jQueryForm ) => {
 		if ( confirmPayment.error ) {
 			throw confirmPayment.error;
 		}
-
-		// Once the customer closes the voucher and there are no errors, redirect them to the order received page.
-		window.location.href = decodeURIComponent( partials[ 4 ] );
 	} catch ( error ) {
 		jQueryForm.removeClass( 'processing' ).unblock();
 		showErrorCheckout( error.message );
+		return;
 	}
+
+	let postPaymentUrl = null;
+	try {
+		postPaymentUrl = decodeURIComponent( partials[ 4 ] || '' );
+	} catch ( error ) {}
+
+	let validatedRedirectUrl = null;
+	if ( postPaymentUrl ) {
+		try {
+			const redirectUrl = new URL(
+				postPaymentUrl,
+				window.location.origin
+			);
+
+			if ( redirectUrl.origin === window.location.origin ) {
+				validatedRedirectUrl = redirectUrl;
+			}
+		} catch ( error ) {}
+	}
+
+	if ( validatedRedirectUrl ) {
+		window.location.href = validatedRedirectUrl.toString();
+		return;
+	}
+
+	if ( ! stripeServerData?.orderReceivedURL ) {
+		showErrorCheckout(
+			__(
+				'There was a problem processing the payment. Please refresh the page to try again.',
+				'woocommerce-gateway-stripe'
+			)
+		);
+		return;
+	}
+
+	// We didn't get a valid redirect URL, so redirect to the order received page.
+	// If we have a numeric order ID, navigate to the order received page for that order.
+	if (
+		orderId &&
+		orderId !== 'NaN' &&
+		orderId === String( parseInt( orderId, 10 ) )
+	) {
+		window.location.href =
+			stripeServerData.orderReceivedURL +
+			'/' +
+			encodeURIComponent( orderId ) +
+			'/';
+		return;
+	}
+
+	// Otherwise go to the generic page.
+	window.location.href = stripeServerData.orderReceivedURL;
 };
 
 /**

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

@@ -219,6 +219,7 @@ describe( 'Express checkout event handlers', () => {
 
 		beforeEach( () => {
 			api = {
+				expressCheckoutNormalizeAddress: jest.fn(),
 				expressCheckoutECECreateOrder: jest.fn(),
 				expressCheckoutECEPayForOrder: jest.fn(),
 				confirmIntent: jest.fn(),

client/express-checkout/payment-flow.js

@@ -148,23 +148,33 @@ const processOrder = async ( {
 	orderDetails = {},
 } ) => {
 	let orderResponse;
+
+	const normalizedOrderData = normalizeOrderData( {
+		event,
+		paymentMethodId,
+		confirmationTokenId,
+	} );
+
+	const normalizedAddress = await api.expressCheckoutNormalizeAddress(
+		normalizedOrderData.billing_address,
+		normalizedOrderData.shipping_address
+	);
+
+	if ( normalizedAddress ) {
+		normalizedOrderData.billing_address = normalizedAddress.billing_address;
+		normalizedOrderData.shipping_address =
+			normalizedAddress.shipping_address;
+	}
+
 	if ( order ) {
 		orderResponse = await api.expressCheckoutECEPayForOrder(
 			order,
 			orderDetails,
-			normalizeOrderData( {
-				event,
-				paymentMethodId,
-				confirmationTokenId,
-			} )
+			normalizedOrderData
 		);
 	} else {
 		orderResponse = await api.expressCheckoutECECreateOrder(
-			normalizeOrderData( {
-				event,
-				paymentMethodId,
-				confirmationTokenId,
-			} )
+			normalizedOrderData
 		);
 	}
 

client/settings/general-settings-section/customize-payment-method.js

@@ -94,7 +94,9 @@ const CustomizePaymentMethod = ( { method, onClose } ) => {
 					) }
 				/>
 			) }
-			<ButtonWrapper>
+			{ /* The 'submit' class is used by WC core to clear unsaved changes warnings.
+				See https://github.com/woocommerce/woocommerce/blob/fc7ffce309662758c0d3383de8cc8e8c6a57a167/plugins/woocommerce/client/legacy/js/admin/settings.js#L139 */ }
+			<ButtonWrapper className="submit">
 				<Button
 					variant="tertiary"
 					disabled={ isCustomizing }

client/settings/save-settings-section/index.js

@@ -20,7 +20,9 @@ const SaveSettingsSection = ( { onSettingsSave } ) => {
 	};
 
 	return (
-		<SaveSettingsSectionWrapper>
+		// The 'submit' class is used by WC core to clear unsaved changes warnings.
+		// See https://github.com/woocommerce/woocommerce/blob/fc7ffce309662758c0d3383de8cc8e8c6a57a167/plugins/woocommerce/client/legacy/js/admin/settings.js#L139
+		<SaveSettingsSectionWrapper className="submit">
 			<Button
 				isPrimary
 				isBusy={ isSaving }

client/settings/settings-manager/index.js

@@ -4,13 +4,12 @@ import React, { useState } from 'react';
 import { TabPanel } from '@wordpress/components';
 import { getQuery, updateQueryString } from '@woocommerce/navigation';
 import styled from '@emotion/styled';
-import { isEmpty, isEqual } from 'lodash';
+import { isEmpty } from 'lodash';
 import SettingsLayout from '../settings-layout';
 import PaymentSettingsPanel from '../payment-settings';
 import PaymentMethodsPanel from '../payment-methods';
 import SaveSettingsSection from '../save-settings-section';
 import { useSettings } from '../../data';
-import useConfirmNavigation from 'utils/use-confirm-navigation';
 
 const StyledTabPanel = styled( TabPanel )`
 	.components-tab-panel__tabs {
@@ -51,18 +50,6 @@ const SettingsManager = () => {
 		} );
 	};
 
-	const isPristine =
-		! isEmpty( initialSettings ) && isEqual( initialSettings, settings );
-	const displayPrompt = ! isPristine;
-	const confirmationNavigationCallback = useConfirmNavigation(
-		displayPrompt
-	);
-
-	useEffect( confirmationNavigationCallback, [
-		displayPrompt,
-		confirmationNavigationCallback,
-	] );
-
 	// This grabs the "panel" URL query string value to allow for opening a specific tab.
 	const { panel } = getQuery();
 

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

@@ -611,6 +611,9 @@ public function process_response( $response, $order ) {
 
 					/* translators: transaction id */
 					$message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id );
+					if ( isset( $response->is_webhook_response ) ) {
+						$message .= ' (via webhook)';
+					}
 					$order->add_order_note( $message );
 				}
 			}
@@ -1433,15 +1436,17 @@ public function generate_create_intent_request( $order, $prepared_source ) {
 	 *
 	 * @param WC_Order $order The order that is being paid for.
 	 * @return array          The level 3 data to send to Stripe.
+	 * @throws WC_Stripe_Exception If an order item has no quantity set.
 	 */
 	public function get_level3_data_from_order( $order ) {
 		// Get the order items. Don't need their keys, only their values.
 		// Order item IDs are used as keys in the original order items array.
 		$order_items = array_values( $order->get_items( [ 'line_item', 'fee' ] ) );
 		$currency    = $order->get_currency();
+		$order_id    = $order->get_id();
 
 		$stripe_line_items = array_map(
-			function ( $item ) use ( $currency ) {
+			function ( $item ) use ( $currency, $order_id ) {
 				if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
 					$product_id = $item->get_variation_id()
 						? $item->get_variation_id()
@@ -1453,9 +1458,14 @@ function ( $item ) use ( $currency ) {
 				}
 				$product_description = substr( $item->get_name(), 0, 26 );
 				$quantity            = $item->get_quantity();
-				$unit_cost           = WC_Stripe_Helper::get_stripe_amount( ( $subtotal / $quantity ), $currency );
-				$tax_amount          = WC_Stripe_Helper::get_stripe_amount( $item->get_total_tax(), $currency );
-				$discount_amount     = WC_Stripe_Helper::get_stripe_amount( $subtotal - $item->get_total(), $currency );
+				if ( ! $quantity ) {
+					$error_msg = "Stripe Level 3 data: Order item with ID {$item->get_id()} from order ID {$order_id} has no quantity set.";
+					WC_Stripe_Logger::error( $error_msg );
+					throw new WC_Stripe_Exception( $error_msg );
+				}
+				$unit_cost       = WC_Stripe_Helper::get_stripe_amount( ( $subtotal / $quantity ), $currency );
+				$tax_amount      = WC_Stripe_Helper::get_stripe_amount( $item->get_total_tax(), $currency );
+				$discount_amount = WC_Stripe_Helper::get_stripe_amount( $subtotal - $item->get_total(), $currency );
 
 				return (object) [
 					'product_code'        => (string) $product_id, // Up to 12 characters that uniquely identify the product.

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

@@ -165,12 +165,12 @@ private static function get_payment_method_configuration_from_stripe() {
 	}
 
 	/**
-	 * Get the parent configuration ID.
+	 * Get the WooCommerce Platform payment method configuration id.
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public static function get_parent_configuration_id() {
-		return self::get_primary_configuration()->parent ?? null;
+		return WC_Stripe_Mode::is_test() ? self::TEST_MODE_CONFIGURATION_PARENT_ID : self::LIVE_MODE_CONFIGURATION_PARENT_ID;
 	}
 
 	/**