Updates to 3.1.0

Author: WooCommerce

build/frontend.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-checkout', 'wc-settings', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '35ce60746dde2dba624c');
+<?php return array('dependencies' => array('react', 'wc-blocks-checkout', 'wc-settings', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '6cc28b57af85188a9770');

build/frontend.js

@@ -1,6 +1,21 @@
 *** EU VAT Number Changelog ***
 
-2025-02-09 - version 3.0.4
+2026-03-16 - version 3.1.0
+* Fix - Ensure that orders without shipping address fields (e.g., virtual products) correctly appear in the EC Sales List report.
+* Fix - Ensure that the Create Order REST API response does not get corrupted when VAT validation fails.
+* Fix – Resolve an issue where the Blocks checkout would fail silently after switching from an EU country to a non-EU country when a VAT number had been entered.
+* Fix - Respect "Failed Validation Handling" setting when VIES service is unavailable for a member state.
+* Fix - Optimized admin dashboard performance by reducing unnecessary background checks.
+* Fix - Ensure that the `{vat_id}` placeholder is replaced with the VAT number correctly on block checkout.
+* Fix - Improved the translation system to ensure all text is correctly displayed in the selected language.
+* Fix – Make the “optional” string translatable.
+* Fix - Ensure that Greece VAT number validation correctly uses “EL” instead of “GR” as the VAT prefix in the shortcode checkout when the country code prefix is not required.
+* Fix - More specific error message for checkout when two-character VAT number is missing.
+* Dev - Bump WooCommerce "tested up to" version 10.6.
+* Dev - Bump WooCommerce minimum supported version to 10.4.
+* Dev - Bump Wordpress minimum supported version to 6.8.
+
+2026-02-09 - version 3.0.4
 * Fix - Ensure that VAT number validation applies only to EU countries.
 * Fix - VAT number not verified on manually created order.
 * Fix - Inconsistent value between `vat_number`, `billing_vat_number` and `shipping_vat_number` usermeta fields.

changelog.txt

@@ -396,6 +396,11 @@ public static function admin_order( $args, $order ) {
 			return;
 		}
 
+		// This should only run when triggered by the admin ajax call for woocommerce_calc_line_taxes.
+		if ( did_action( 'wp_ajax_woocommerce_calc_line_taxes' ) === 0 ) {
+			return;
+		}
+
 		/*
 		 * First try and get the billing country from the
 		 * address form (adding new order). If it is not

includes/class-wc-eu-vat-admin.php

@@ -64,7 +64,11 @@ public function update_order_meta( $order, $request ) {
 		}
 
 		if ( ! empty( $request['extensions']['woocommerce-eu-vat-number']['vat_number'] ) ) {
-			$vat_number   = $request['extensions']['woocommerce-eu-vat-number']['vat_number'];
+			$vat_number = $request['extensions']['woocommerce-eu-vat-number']['vat_number'];
+
+			// Normalize the VAT number prefix before validation (handles cases like Greece where GR != EL).
+			$vat_number = WC_EU_VAT_Number::get_normalized_vat_number( $vat_number, $country );
+
 			$is_valid     = WC_EU_VAT_Number::vat_number_is_valid( $vat_number, $country, $postcode );
 			$fail_handler = get_option( 'woocommerce_eu_vat_number_failure_handling', 'reject' );
 
@@ -75,7 +79,7 @@ public function update_order_meta( $order, $request ) {
 
 		$customer_id = $order->get_customer_id();
 
-		if ( $customer_id ) {
+		if ( $customer_id && ! empty( $vat_number ) ) {
 			$customer = new \WC_Customer( $customer_id );
 			$customer->update_meta_data( 'vat_number', $vat_number );
 			$customer->save_meta_data();
@@ -96,6 +100,11 @@ public function update_order_meta( $order, $request ) {
 		$order->update_meta_data( '_vat_number_is_valid', true === $data['validation']['valid'] ? 'true' : 'false' );
 		$order->update_meta_data( '_billing_vat_number', $vat_number );
 
+		// Add detailed order note about VAT validation result.
+		$vat_number = $data['vat_number'] ?? '';
+		$is_valid   = $data['validation']['valid'] ?? null;
+		wc_eu_vat_maybe_add_order_note( $order, $vat_number, $is_valid );
+
 		$this->maybe_apply_exemption();
 	}
 
@@ -274,7 +283,11 @@ public function validate( $vat_number = null ) {
 			);
 		}
 
-		$fail_handler    = get_option( 'woocommerce_eu_vat_number_failure_handling', 'reject' );
+		$fail_handler = get_option( 'woocommerce_eu_vat_number_failure_handling', 'reject' );
+
+		// Normalize the VAT number prefix before validation (handles cases like Greece where GR != EL).
+		$vat_number = WC_EU_VAT_Number::get_normalized_vat_number( $vat_number, $country );
+
 		$is_format_valid = WC_EU_VAT_Number::validate_vat_format( $vat_number, $country );
 
 		if ( is_wp_error( $is_format_valid ) ) {
@@ -290,12 +303,16 @@ public function validate( $vat_number = null ) {
 
 		$is_registered_valid = WC_EU_VAT_Number::vat_number_is_valid( $vat_number, $country );
 
+		// Handle WP_Error (API communication errors) according to fail_handler setting.
 		if ( is_wp_error( $is_registered_valid ) ) {
+			$error_code    = $is_registered_valid->get_error_code();
+			$error_message = $is_registered_valid->get_error_message();
+
 			$data['vat_number'] = $vat_number;
 			$data['validation'] = array(
 				'valid' => false,
-				'error' => $is_registered_valid->get_error_message(),
-				'code'  => $is_registered_valid->get_error_code(),
+				'code'  => $error_code,
+				'error' => 'reject' === $fail_handler ? $error_message : false,
 			);
 
 			return $data;
@@ -345,11 +362,11 @@ public function maybe_apply_exemption( $with_notices = true ) {
 		if ( false === (bool) $validation['validation']['valid'] && $with_notices ) {
 			switch ( $fail_handler ) {
 				case 'accept_with_vat':
-					wc_add_notice( $validation['validation']['error'], 'error' );
-					break;
 				case 'accept':
+					// Don't add an error notice - order should be accepted.
 					break;
 				default:
+					// 'reject' - show error and block checkout.
 					wc_add_notice( $validation['validation']['error'], 'error' );
 					break;
 			}
@@ -372,16 +389,17 @@ private function maybe_set_vat_exemption( $validation ) {
 		} else {
 			switch ( $fail_handler ) {
 				case 'accept_with_vat':
+					// Accept the order but keep VAT charged.
 					WC_EU_VAT_Number::maybe_apply_vat_exemption( $vat_number, false );
 					break;
 				case 'accept':
-					$error_code = $validation['validation']['code'] ?? false;
-
-					if ( 'wc-eu-vat-api-error' !== $error_code ) {
-						WC_EU_VAT_Number::maybe_apply_vat_exemption( $vat_number, true );
-					}
+					// Accept the order and remove VAT.
+					// This applies whether validation failed due to invalid number OR API error.
+					// The merchant has explicitly chosen to trust customers when validation fails.
+					WC_EU_VAT_Number::maybe_apply_vat_exemption( $vat_number, true );
 					break;
 				default:
+					// 'reject' - don't exempt VAT (order will be blocked anyway).
 					WC_EU_VAT_Number::maybe_apply_vat_exemption( $vat_number, false );
 					break;
 			}

includes/class-wc-eu-vat-extend-store-endpoint.php

@@ -211,6 +211,7 @@ public static function reset() {
 			'validation' => array(
 				'valid' => null,
 				'error' => false,
+				'code'  => false,
 			),
 		);
 	}
@@ -329,6 +330,36 @@ public static function get_vat_number_prefix( $country ) {
 		return apply_filters( 'woocommerce_eu_vat_number_get_vat_number_prefix', $vat_prefix );
 	}
 
+	/**
+	 * Normalize a VAT number by cleaning it and ensuring the correct country prefix.
+	 *
+	 * Strips unwanted characters, uppercases, and fixes the prefix for countries
+	 * where the VAT prefix differs from the country code (e.g., Greece uses 'EL'
+	 * as VAT prefix but 'GR' as country code).
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string $vat_number The raw VAT number.
+	 * @param string $country    The country code.
+	 * @return string The normalized VAT number with the correct prefix.
+	 */
+	public static function get_normalized_vat_number( $vat_number, $country ) {
+		$vat_number           = strtoupper( str_replace( array( ' ', '.', '-', ',', ', ' ), '', $vat_number ) );
+		$vat_number_formatted = self::get_formatted_vat_number( $vat_number );
+		$vat_prefix           = self::get_vat_number_prefix( $country );
+
+		// If the VAT number starts with the country code (e.g., GR) instead of the VAT prefix (e.g., EL),
+		// replace it with the correct VAT prefix. This handles cases like Greece where GR != EL.
+		if ( $vat_prefix !== $country && str_starts_with( $vat_number, $country ) ) {
+			$vat_number = $vat_prefix . $vat_number_formatted;
+		} elseif ( ! str_starts_with( $vat_number, $vat_prefix ) && $vat_number_formatted === $vat_number ) {
+			// No recognized prefix was provided, add the correct VAT prefix.
+			$vat_number = $vat_prefix . $vat_number;
+		}
+
+		return $vat_number;
+	}
+
 	/**
 	 * Extract the 2-letter country code from a VAT number.
 	 *
@@ -415,15 +446,15 @@ public static function vat_number_is_valid( $vat_number, $country, $postcode = '
 		}
 
 		if ( empty( $vat_number_formatted ) ) {
-			return new WP_Error( 'wc-eu-vat-api-error', __( 'The VAT number is incomplete.', 'woocommerce-eu-vat-number' ) );
+			return new WP_Error( 'wc-eu-vat-validation-error', __( 'The VAT number is incomplete.', 'woocommerce-eu-vat-number' ) );
 		}
 
 		$country_codes_patterns = self::get_country_code_patterns();
 
 		// Return error if VAT Country Code doesn't match or exist.
 		if ( ! isset( $country_codes_patterns[ $vat_prefix ] ) || ( $vat_prefix . $vat_number_formatted !== $vat_number ) ) {
 			// translators: %1$s - VAT number field label, %2$s - VAT Number from user, %3$s - Billing country.
-			return new WP_Error( 'wc-eu-vat-api-error', sprintf( __( 'You have entered an invalid country code for %1$s (%2$s) for your country (%3$s).', 'woocommerce-eu-vat-number' ), get_option( 'woocommerce_eu_vat_number_field_label', 'VAT number' ), $vat_number, $country ) );
+			return new WP_Error( 'wc-eu-vat-validation-error', sprintf( __( 'You have entered an invalid country code for %1$s (%2$s) for your country (%3$s).', 'woocommerce-eu-vat-number' ), get_option( 'woocommerce_eu_vat_number_field_label', 'VAT number' ), $vat_number, $country ) );
 		}
 
 		if ( ! empty( $cached_result ) ) {
@@ -453,8 +484,33 @@ public static function vat_number_is_valid( $vat_number, $country, $postcode = '
 				try {
 					$vies_req = $vies->check_vat( $vat_prefix, $vat_number_formatted );
 					$is_valid = $vies_req->is_valid();
-
 				} catch ( SoapFault $e ) {
+					$fault_string = $e->getMessage();
+
+					// Check for specific VIES error codes that indicate member state unavailability.
+					if ( stripos( $fault_string, 'MS_UNAVAILABLE' ) !== false ) {
+						return new WP_Error(
+							'wc-eu-vat-api-error',
+							__( 'The VAT validation service for this country is temporarily unavailable. Please try again later.', 'woocommerce-eu-vat-number' )
+						);
+					}
+
+					if ( stripos( $fault_string, 'SERVICE_UNAVAILABLE' ) !== false || stripos( $fault_string, 'MS_MAX_CONCURRENT_REQ' ) !== false ) {
+						return new WP_Error(
+							'wc-eu-vat-api-error',
+							__( 'The VAT validation service is temporarily unavailable due to high load. Please try again later.', 'woocommerce-eu-vat-number' )
+						);
+					}
+
+					if ( stripos( $fault_string, 'TIMEOUT' ) !== false ) {
+						return new WP_Error(
+							'wc-eu-vat-api-error',
+							__( 'The VAT validation service timed out. Please try again later.', 'woocommerce-eu-vat-number' )
+						);
+					}
+
+					return new WP_Error( 'wc-eu-vat-api-error', __( 'Error communicating with the VAT validation server - please try again.', 'woocommerce-eu-vat-number' ) );
+				} catch ( Exception $e ) {
 					return new WP_Error( 'wc-eu-vat-api-error', __( 'Error communicating with the VAT validation server - please try again.', 'woocommerce-eu-vat-number' ) );
 				}
 			}
@@ -541,12 +597,14 @@ public static function validate( $vat_number, $country, $postcode = '' ) {
 			self::$data['validation'] = array(
 				'valid' => false,
 				'error' => $valid->get_error_message(),
+				'code'  => $valid->get_error_code(),
 			);
 		} else {
 			self::$data['vat_number'] = $valid ? self::get_vat_number_prefix( $country ) . $vat_number_formatted : $vat_number;
 			self::$data['validation'] = array(
 				'valid' => $valid,
 				'error' => false,
+				'code'  => false,
 			);
 		}
 	}
@@ -1018,6 +1076,13 @@ public static function set_order_data( $order ) {
 			$order->update_meta_data( '_customer_ip_country', self::get_ip_country() );
 			$order->update_meta_data( '_customer_self_declared_country', ! empty( $_POST['location_confirmation'] ) ? 'true' : 'false' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		}
+
+		// Add detailed order note about VAT validation result.
+		wc_eu_vat_maybe_add_order_note(
+			$order,
+			self::$data['vat_number'],
+			self::$data['validation']['valid'] ?? null
+		);
 	}
 
 	/**
@@ -1056,6 +1121,11 @@ public static function validate_vat_format( $vat_number = '', $address_country_c
 			$vat_number   = $country_code . $vat_number;
 		}
 
+		// If country prefix is required but not provided, show a specific error.
+		if ( empty( $country_code ) && self::is_country_prefix_required() ) {
+			return new WP_Error( 'wc-eu-vat-country-code-required', __( 'A valid two character country code is required at the start of the VAT number.', 'woocommerce-eu-vat-number' ) );
+		}
+
 		$vat_number     = self::get_formatted_vat_number( $vat_number );
 		$regex_patterns = self::get_country_code_patterns();
 
@@ -1104,12 +1174,8 @@ public static function validate_checkout( $data, $doing_checkout = false ) {
 		}
 
 		if ( in_array( $vat_country, self::get_eu_countries(), true ) && ! empty( $billing_vat_number ) ) {
-			$billing_vat_number   = strtoupper( str_replace( array( ' ', '.', '-', ',', ', ' ), '', $billing_vat_number ) );
-			$is_format_valid      = self::validate_vat_format( $billing_vat_number, $vat_country );
-			$vat_number_formatted = self::get_formatted_vat_number( $billing_vat_number );
-			if ( ! str_starts_with( $billing_vat_number, $vat_country ) && $vat_number_formatted === $billing_vat_number ) {
-				$billing_vat_number = $vat_country . $billing_vat_number;
-			}
+			$billing_vat_number = self::get_normalized_vat_number( $billing_vat_number, $vat_country );
+			$is_format_valid    = self::validate_vat_format( $billing_vat_number, $vat_country );
 
 			if ( is_wp_error( $is_format_valid ) ) {
 				wc_add_notice( $is_format_valid->get_error_message(), 'error' );
@@ -1119,21 +1185,26 @@ public static function validate_checkout( $data, $doing_checkout = false ) {
 			self::validate( $billing_vat_number, $vat_country, $postcode );
 
 			if ( true === (bool) self::$data['validation']['valid'] ) {
+				// VAT number validated successfully.
 				self::maybe_apply_vat_exemption( $billing_vat_number, true );
 				WC()->session->set( 'vat_number', $billing_vat_number );
-			} elseif ( ! empty( self::$data['validation']['error'] ) ) {
-				wc_add_notice( self::$data['validation']['error'], 'error' );
-				WC()->session->set( 'vat_number', null );
 			} else {
+				// Validation failed (either API error or invalid number).
+				// Handle according to fail_handler setting.
 				switch ( $fail_handler ) {
 					case 'accept_with_vat':
+						// Accept the order but keep VAT charged.
 						self::maybe_apply_vat_exemption( $billing_vat_number, false );
 						break;
 					case 'accept':
+						// Accept the order and remove VAT.
 						self::maybe_apply_vat_exemption( $billing_vat_number, true );
 						break;
 					default:
-						if ( false === self::$data['validation']['valid'] ) {
+						// 'reject' - show error and block the order.
+						if ( ! empty( self::$data['validation']['error'] ) ) {
+							wc_add_notice( self::$data['validation']['error'], 'error' );
+						} elseif ( false === self::$data['validation']['valid'] ) {
 							wc_add_notice(
 								sprintf(
 									/* translators: 1: VAT number field label, 2: VAT Number, 3: Address type, 4: Country */
@@ -1145,10 +1216,8 @@ public static function validate_checkout( $data, $doing_checkout = false ) {
 								),
 								'error'
 							);
-						} else {
-							wc_add_notice( self::$data['validation']['error'], 'error' );
-							WC()->session->set( 'vat_number', null );
 						}
+						WC()->session->set( 'vat_number', null );
 						break;
 				}
 			}

includes/class-wc-eu-vat-number.php

@@ -138,9 +138,10 @@ public function get_main_chart() {
 						'name'     => '_billing_country',
 					),
 					'_shipping_country'   => array(
-						'type'     => 'meta',
-						'function' => '',
-						'name'     => '_shipping_country',
+						'type'      => 'meta',
+						'function'  => '',
+						'name'      => '_shipping_country',
+						'join_type' => 'LEFT',
 					),
 					'_order_currency'     => array(
 						'type'     => 'meta',
@@ -181,9 +182,10 @@ public function get_main_chart() {
 						'name'     => '_billing_country',
 					),
 					'_shipping_country' => array(
-						'type'     => 'meta',
-						'function' => '',
-						'name'     => '_shipping_country',
+						'type'      => 'meta',
+						'function'  => '',
+						'name'      => '_shipping_country',
+						'join_type' => 'LEFT',
 					),
 					'_order_currency'   => array(
 						'type'     => 'meta',

includes/class-wc-eu-vat-report-ec-sales-list.php

@@ -110,6 +110,15 @@ public static function display_hpos_incompatibility_notice() {
 	 * @return array
 	 */
 	public static function init_reports( $reports ) {
+		// Only check sync status when actually viewing reports page.
+		// This prevents the expensive query from running on every admin page.
+		// Check if get_current_screen() is available (may not be in AJAX/REST/CLI contexts).
+		$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
+		if ( ! $screen || 'woocommerce_page_wc-reports' !== $screen->id ) {
+			// Skip the expensive check on non-reports pages.
+			return $reports;
+		}
+
 		// The EU VAT reports are incompatible with stores running HPOS with syncing disabled.
 		if ( self::is_cot_enabled() && ! self::is_cot_sync_enabled() ) {
 			return $reports;