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

malithsen · malithsen · commit 618a4a76e72e · 2025-07-28T13:23:43.000-05:00
diff --git a/.github/actions/get-wordpress-plugin-versions/action.yml b/.github/actions/get-wordpress-plugin-versions/action.yml
@@ -38,14 +38,20 @@ runs:
       id: get-versions-json
       shell: bash
       # jq does the following:
-      # - filters the versions to only include x.y.z versions, i.e. ignoring beta, rc, and dev versions etc
-      # - groups the versions by the first two parts of the version number, i.e. major.minor
-      # - reverses the order of the versions, so the highest major.minor versions are first
-      # - limits the number of major.versions to the number specified in the version-count input
+      # - filters the versions to only include semantic releases (x.y.z), ignoring beta, rc, trunk, etc.
+      # - maps each version into a structure with:
+      #     - major_minor: the major.minor part (e.g. "9.6")
+      #     - full: the full version string (e.g. "9.6.2")
+      #     - parts: a numeric array of the version (e.g. [9, 6, 2])
+      # - groups the versions by major.minor
+      # - selects the highest patch version (i.e. max patch) within each group
+      # - sorts all selected versions by semantic version order, descending
+      # - limits the result to the latest N major.minor groups, where N is from version-count input
       # - returns the last version for each major.minor version
       run: |
         echo 'versions-json<<EOF' >> $GITHUB_OUTPUT
-        cat ${{ inputs.plugin-slug }}.json | jq '.versions | keys | map( select( test("^\\d+\\.\\d+\\.\\d+$"; "s") ) ) | group_by( split( "." ) | .[0:2] | join( "." ) ) | reverse | .[0:${{ inputs.version-count }}] | [.[][-1]]' >> $GITHUB_OUTPUT
+        cat ${{ inputs.plugin-slug }}.json | jq --argjson count "${{ inputs.version-count }}" '.versions | keys | map(select(test("^\\d+\\.\\d+\\.\\d+$"))) | map({ major_minor: (split(".")[0:2] | join(".")), full: ., parts: (split(".") | map(tonumber)) })
+            | group_by(.major_minor) | map(max_by(.parts[2])) | sort_by(.parts[0], .parts[1], .parts[2]) | reverse | .[0:$count] | map(.full) ' >> $GITHUB_OUTPUT
         echo 'EOF' >> $GITHUB_OUTPUT
 
     - name: Get versions in text format
diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml
@@ -71,6 +71,8 @@ jobs:
         exclude: # incompatible versions of PHP, WordPress, and WooCommerce
           - woocommerce_support_policy: L
             wordpress_support_policy: L-2
+          - woocommerce_support_policy: L-1
+            wordpress_support_policy: L-2
 
     name: Stable (PHP=${{ matrix.php_support_policy }}, WP=${{ matrix.wordpress_support_policy }}, WC=${{ matrix.woocommerce_support_policy }})
     env:
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,14 @@
 *** Changelog ***
 
+= 9.7.1 - 2025-07-28 =
+* Add - Add state mapping for Lithuania in express checkout
+* Tweak - Check for checkout validation error before creating a payment method in Stripe
+* Fix - Prevent multiple save appearance AJAX calls on Block Checkout
+* Fix - Fix required field error message and PHP warning for custom checkout fields that don't have a label
+* Fix - Fix fatal when processing setup intents for free subscriptions via webhooks
+* Dev - Fix WooCommerce version fetching in GitHub workflows
+* Dev - Fix failing test cases associated with WooCommerce 10.0.x
+
 = 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
diff --git a/client/blocks/upe/upe-deferred-intent-creation/payment-processor.js b/client/blocks/upe/upe-deferred-intent-creation/payment-processor.js
@@ -3,6 +3,7 @@
  */
 import { getPaymentMethods } from '@woocommerce/blocks-registry';
 import { __ } from '@wordpress/i18n';
+import { select } from '@wordpress/data';
 import {
 	PaymentElement,
 	useElements,
@@ -194,6 +195,16 @@ const PaymentProcessor = ( {
 						};
 					}
 
+					const { validationStore } = window.wc?.wcBlocksData ?? {};
+					if ( validationStore ) {
+						const store = select( validationStore );
+						const hasValidationErrors = store.hasValidationErrors();
+						// Return if there is a validation error on the checkout fields.
+						if ( hasValidationErrors ) {
+							return;
+						}
+					}
+
 					// BLIK is a special case which is not handled through the Stripe element.
 					if ( ! ( isPaymentElementComplete || isBlikSelected ) ) {
 						return {
diff --git a/client/classic/upe/deferred-intent.js b/client/classic/upe/deferred-intent.js
@@ -41,6 +41,22 @@ jQuery( function ( $ ) {
 	} );
 
 	$( 'form.checkout' ).on( generateCheckoutEventNames(), function () {
+		const $form = $( 'form.checkout' );
+		// Lose focus for all fields to trigger validation
+		$form
+			.find( '.input-text, select, input:checkbox' )
+			.trigger( 'validate' )
+			.trigger( 'blur' );
+
+		const hasValidationErrors =
+			$form.find( '.woocommerce-invalid' ).length > 0 &&
+			$form.find( '.woocommerce-invalid' ).is( ':visible' );
+
+		// Return if there is a validation error on the checkout fields
+		if ( hasValidationErrors ) {
+			return;
+		}
+
 		return processPaymentIfNotUsingSavedMethod( $( this ) );
 	} );
 
diff --git a/client/stripe-utils/utils.js b/client/stripe-utils/utils.js
@@ -613,6 +613,10 @@ export const showErrorPaymentMethod = ( errorMessage, containerSelector ) => {
  *
  * @return {Object} The appearance object for the UPE.
  */
+
+// Track if save appearance is already in progress to prevent multiple calls
+let isSavingAppearance = false;
+
 export const initializeUPEAppearance = ( api, isBlockCheckout = 'false' ) => {
 	let appearance =
 		isBlockCheckout === 'true'
@@ -631,8 +635,21 @@ export const initializeUPEAppearance = ( api, isBlockCheckout = 'false' ) => {
 				! data.isChangingPayment );
 
 		// If we have re-built the appearance, only update the settings in the checkout context
-		if ( isValidUpdateContext ) {
-			api.saveAppearance( appearance, isBlockCheckout );
+		if ( isValidUpdateContext && ! isSavingAppearance ) {
+			// Set flag to prevent concurrent saves
+			isSavingAppearance = true;
+
+			// Update the global variable immediately to prevent multiple AJAX calls
+			if ( isBlockCheckout === 'true' ) {
+				data.blocksAppearance = appearance;
+			} else {
+				data.appearance = appearance;
+			}
+
+			api.saveAppearance( appearance, isBlockCheckout ).finally( () => {
+				// Reset flag when save completes (success or failure)
+				isSavingAppearance = false;
+			} );
 		}
 	}
 
diff --git a/includes/class-wc-stripe-webhook-handler.php b/includes/class-wc-stripe-webhook-handler.php
@@ -1169,10 +1169,12 @@ public function process_setup_intent( $notification ) {
 		 * @since 9.7.0
 		 *
 		 * @param array $allowed_payment_processing_statuses The allowed payment processing statuses.
+		 * @param WC_Order $order The order object.
 		 */
 		$allowed_payment_processing_statuses = apply_filters(
 			'wc_stripe_allowed_payment_processing_statuses',
 			$allowed_payment_processing_statuses,
+			$order
 		);
 
 		if ( ! $order->has_status( $allowed_payment_processing_statuses ) ) {
diff --git a/includes/constants/class-wc-stripe-payment-request-button-states.php b/includes/constants/class-wc-stripe-payment-request-button-states.php
@@ -18,7 +18,7 @@
  *    1. WC provides a dropdown list of states, but there's no state field in Chrome for the following countries:
  *        AO (Angola), BD (Bangladesh), BG (Bulgaria), BJ (Benin), BO (Bolivia), DO (Dominican Republic),
  *        DZ (Algeria), GH (Ghana), GT (Guatemala), HU (Hungary), KE (Kenya), LA (Laos),
- *        LR (Liberia), MD (Moldova), NA (Namibia), NP (Nepal), PK (Pakistan),
+ *        LR (Liberia), LT (Lithuania), MD (Moldova), NA (Namibia), NP (Nepal), PK (Pakistan),
  *        PY (Paraguay), RO (Romania), TZ (Tanzania), UG (Uganda), UM (United States Minor Outlying Islands),
  *        ZA (South Africa), ZM (Zambia).
  *    2. Chrome does not provide a dropdown list of states for 161 countries in total, out of the 249 countries WC supports,
@@ -648,6 +648,8 @@ class WC_Stripe_Payment_Request_Button_States {
 		'LK' => [],
 		// Liberia.
 		'LR' => [],
+		// Lithuania.
+		'LT' => [],
 		// Luxembourg.
 		'LU' => [],
 		// Moldova.
diff --git a/includes/payment-methods/class-wc-stripe-express-checkout-custom-fields.php b/includes/payment-methods/class-wc-stripe-express-checkout-custom-fields.php
@@ -59,7 +59,7 @@ public function process_custom_checkout_data( $order, $request ) {
 				$required_field_errors[] = sprintf(
 					/* translators: %s: field name */
 					__( '%s is a required field.', 'woocommerce-gateway-stripe' ),
-					$field['label']
+					empty( $field['label'] ) ? $key : $field['label']
 				);
 			}
 		}
@@ -197,7 +197,7 @@ public function get_custom_checkout_fields( $context = '' ) {
 				$additional_fields            = $checkout_fields->get_additional_fields();
 				foreach ( $additional_fields as $field_key => $field ) {
 					$block_custom_checkout_fields[ $field_key ] = [
-						'label'    => $field['label'],
+						'label'    => $field['label'] ?? '',
 						'type'     => $field['type'] ?? 'text',
 						'location' => $checkout_fields->get_field_location( $field_key ),
 						'required' => $field['required'] ?? false,
@@ -222,7 +222,7 @@ public function get_custom_checkout_fields( $context = '' ) {
 					}
 
 					$classic_custom_checkout_fields[ $field_key ] = [
-						'label'    => $field['label'],
+						'label'    => $field['label'] ?? '',
 						'type'     => $field['type'] ?? 'text',
 						'location' => $fieldset,
 						'required' => $field['required'] ?? false,
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.7.0",
+  "version": "9.7.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, payments, woocommerce, woo
 Requires at least: 6.6
 Tested up to: 6.8.2
 Requires PHP: 7.4
-Stable tag: 9.7.0
+Stable tag: 9.7.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -110,6 +110,16 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
+= 9.7.1 - 2025-07-28 =
+
+* Fix - Fix fatal when processing setup intents for free subscriptions via webhooks
+* Fix - Fix required field error message and PHP warning for custom checkout fields that don't have a label
+* Add - Add state mapping for Lithuania in express checkout
+* Fix - Prevent multiple save appearance AJAX calls on Block Checkout
+* Tweak - Check for checkout validation error before creating a payment method in Stripe
+* Dev - Fix WooCommerce version fetching in GitHub workflows
+* Dev - Fix failing test cases associated with WooCommerce 10.0.x
+
 = 9.7.0 - 2025-07-21 =
 
 **New Features**
diff --git a/tests/phpunit/PaymentMethods/WC_Stripe_UPE_Payment_Gateway_Test.php b/tests/phpunit/PaymentMethods/WC_Stripe_UPE_Payment_Gateway_Test.php
@@ -440,7 +440,11 @@ public function test_process_payment_returns_valid_response() {
 			->with(
 				"payment_intents/$payment_intent_id",
 				$expected_request,
-				wc_get_order( $order_id )
+				$this->callback(
+					function ( $passed_order ) use ( $order ) {
+						return $order->get_id() === $passed_order->get_id();
+					}
+				)
 			)
 			->will(
 				$this->returnValue( [] )
@@ -1979,7 +1983,11 @@ public function test_if_order_has_subscription_payment_method_will_be_saved() {
 			->with(
 				"payment_intents/$payment_intent_id",
 				$expected_request,
-				wc_get_order( $order_id )
+				$this->callback(
+					function ( $passed_order ) use ( $order ) {
+						return $order->get_id() === $passed_order->get_id();
+					}
+				)
 			)
 			->will(
 				$this->returnValue( [] )
diff --git a/tests/phpunit/WC_Stripe_Co_Branded_CC_Compatibility_Test.php b/tests/phpunit/WC_Stripe_Co_Branded_CC_Compatibility_Test.php
@@ -18,6 +18,6 @@ class WC_Stripe_Co_Branded_CC_Compatibility_Test extends WP_UnitTestCase {
 	 */
 	public function test_is_wc_supported() {
 		$helper = new WC_Stripe_Co_Branded_CC_Compatibility();
-		$this->assertSame( defined( 'WC_VERSION' ) && WC_VERSION > WC_Stripe_Co_Branded_CC_Compatibility::MIN_WC_VERSION, $helper->is_wc_supported() );
+		$this->assertSame( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, WC_Stripe_Co_Branded_CC_Compatibility::MIN_WC_VERSION, '>' ), $helper->is_wc_supported() );
 	}
 }
diff --git a/woocommerce-gateway-stripe.php b/woocommerce-gateway-stripe.php
@@ -5,7 +5,7 @@
  * Description: Accept debit and credit card payments in 135+ currencies, as well as Apple Pay, Google Pay, Klarna, Affirm, P24, ACH, and more.
  * Author: Stripe
  * Author URI: https://stripe.com/
- * Version: 9.7.0
+ * Version: 9.7.1
  * Requires Plugins: woocommerce
  * Requires at least: 6.6
  * Tested up to: 6.8.2
@@ -22,7 +22,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '9.7.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '9.7.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.4' );
 define( 'WC_STRIPE_MIN_WC_VER', '9.8' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '9.9' );
