Updates to 2.9.14

Author: WooCommerce

changelog.txt

@@ -1,5 +1,13 @@
 *** EU VAT Number Changelog ***
 
+2025-02-18 - version 2.9.14
+* Fix - VAT application and exemption logic for domestic transactions for shortcode checkout.
+* Fix - Add support for Belgian VAT numbers that begin with `1`.
+* Dev - Bump WooCommerce "tested up to" version 9.7.
+* Dev - Bump WooCommerce minimum supported version to 9.5.
+* Dev - Bump WordPress minimum supported version to 6.6.
+* Dev - Add the WordPress Plugin Check GitHub Action.
+
 2025-01-20 - version 2.9.13
 * Fix - Resolved PHP notice caused by loading localization code too early on WordPress 6.7.0+.
 * Dev - Bump WooCommerce "tested up to" version 9.6.

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

@@ -243,7 +243,7 @@ public static function output() {
 						<td>
 							<?php
 							if ( ! $data->validated ) {
-								echo '<span class="tips" data-tip="' . wc_sanitize_tooltip( __( 'Validation was not possible', 'woocommerce-eu-vat-number' ) ) . '">?<span>';
+								echo '<span class="tips" data-tip="' . wc_sanitize_tooltip( __( 'Validation was not possible', 'woocommerce-eu-vat-number' ) ) . '">?<span>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 							} else {
 								echo $data->valid ? '&#10004;' : '&#10008;';
 							}

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

@@ -32,7 +32,7 @@ class WC_EU_VAT_Number {
 	 */
 	private static $country_codes_patterns = array(
 		'AT' => 'U[A-Z\d]{8}',
-		'BE' => '0\d{9}',
+		'BE' => '[01]\d{9}',
 		'BG' => '\d{9,10}',
 		'CY' => '\d{8}[A-Z]',
 		'CZ' => '\d{8,10}',
@@ -294,6 +294,26 @@ public static function get_vat_number_prefix( $country ) {
 		return $vat_prefix;
 	}
 
+	/**
+	 * Extract the 2-letter country code from a VAT number.
+	 *
+	 * @param string $vat_number The VAT number to extract the country code from.
+	 *
+	 * @return string|null The 2-letter country code if found, or null if not.
+	 */
+	public static function get_country_code_from_vat( $vat_number ) {
+		// Define the regex pattern.
+		$pattern = '/^[A-Z]{2}/';
+
+		// Perform the regex match.
+		if ( preg_match( $pattern, $vat_number, $matches ) ) {
+			return $matches[0]; // Return the matched country code.
+		}
+
+		// Return null if no match is found.
+		return null;
+	}
+
 	/**
 	 * Remove unwanted chars and the prefix from a VAT number.
 	 *
@@ -496,6 +516,52 @@ public static function is_base_country_match( $billing_country, $shipping_countr
 		return in_array( $base_country, array( $billing_country, $shipping_country ), true );
 	}
 
+	/**
+	 * Set tax exception based on the vat number and store country.
+	 *
+	 * @param string $vat_number VAT Number.
+	 * @param string $exempt     Boolean to exempt VAT.
+	 *
+	 * @return void
+	 */
+	public static function maybe_apply_vat_exemption( $vat_number = '', $exempt = null ) {
+		if ( empty( $vat_number ) ) {
+			return;
+		}
+
+		$vat_country_code = self::get_country_code_from_vat( $vat_number );
+
+		if ( ! $vat_country_code ) {
+			return;
+		}
+
+		$store_country_code = WC()->countries->get_base_country();
+
+		/**
+		 * Filters the VAT exception.
+		 *
+		 * @since 2.9.14
+		 *
+		 * @param bool   $exempt             Is VAT exempt?.
+		 * @param bool   $store_country_code Store's location country code.
+		 * @param string $vat_country_code   Country code from the VAT number.
+		 */
+		$exempt             = apply_filters( 'woocommerce_eu_vat_maybe_apply_vat_exemption', $exempt, $store_country_code, $vat_country_code );
+		$is_valid_condition = $exempt;
+
+		$should_deduct_in_base = 'yes' === get_option( 'woocommerce_eu_vat_number_deduct_in_base', 'yes' );
+
+		if ( $vat_country_code === $store_country_code && $should_deduct_in_base ) {
+			$is_valid_condition = true;
+		} elseif ( $vat_country_code === $store_country_code ) {
+			$is_valid_condition = false;
+		}
+
+		if ( $is_valid_condition ) {
+			WC()->customer->set_is_vat_exempt( $exempt );
+		}
+	}
+
 	/**
 	 * Set tax exception based on countries.
 	 *
@@ -834,14 +900,14 @@ public static function validate_checkout( $data, $doing_checkout = false ) {
 			self::validate( $billing_vat_number, $country, $postcode );
 
 			if ( true === (bool) self::$data['validation']['valid'] ) {
-				self::maybe_set_vat_exempt( true, $billing_country, $shipping_country );
+				self::maybe_apply_vat_exemption( $billing_vat_number, true );
 			} else {
 				switch ( $fail_handler ) {
 					case 'accept_with_vat':
-						self::maybe_set_vat_exempt( false, $billing_country, $shipping_country );
+						self::maybe_apply_vat_exemption( $billing_vat_number, false );
 						break;
 					case 'accept':
-						self::maybe_set_vat_exempt( true, $billing_country, $shipping_country );
+						self::maybe_apply_vat_exemption( $billing_vat_number, true );
 						break;
 					default:
 						if ( false === self::$data['validation']['valid'] ) {

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

@@ -342,7 +342,7 @@ public function get_main_chart() {
 					<th><?php esc_html_e( 'Country', 'woocommerce-eu-vat-number' ); ?></th>
 					<th><?php esc_html_e( 'Code', 'woocommerce-eu-vat-number' ); ?></th>
 					<th><?php esc_html_e( 'Tax Rate', 'woocommerce-eu-vat-number' ); ?></th>
-					<th class="total_row"><?php esc_html_e( 'Amount', 'woocommerce-eu-vat-number-eu-vat' ); ?></th>
+					<th class="total_row"><?php esc_html_e( 'Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Refunded Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Final Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Tax Amount', 'woocommerce-eu-vat-number' ); ?></th>

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

@@ -54,7 +54,7 @@ public function check_vat_number( $vat_number ) {
 		);
 
 		if ( is_wp_error( $response ) ) {
-			throw new Exception( $response->get_error_message() );
+			throw new Exception( esc_html( $response->get_error_message() ) );
 		}
 
 		// Check if VAT number is valid.

includes/class-wc-non-eu-sales-report.php

@@ -322,7 +322,7 @@ public function get_main_chart() {
 					<th><?php esc_html_e( 'Country', 'woocommerce-eu-vat-number' ); ?></th>
 					<th><?php esc_html_e( 'Code', 'woocommerce-eu-vat-number' ); ?></th>
 					<th><?php esc_html_e( 'Tax Rate', 'woocommerce-eu-vat-number' ); ?></th>
-					<th class="total_row"><?php esc_html_e( 'Amount', 'woocommerce-eu-vat-number-eu-vat' ); ?></th>
+					<th class="total_row"><?php esc_html_e( 'Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Refunded Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Final Amount', 'woocommerce-eu-vat-number' ); ?></th>
 					<th class="total_row"><?php esc_html_e( 'Tax Amount', 'woocommerce-eu-vat-number' ); ?></th>

languages/woocommerce-eu-vat-number.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce EU VAT Number 2.9.13\n"
+"Project-Id-Version: WooCommerce EU VAT Number 2.9.14\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/woocommerce-eu-vat-number\n"
-"POT-Creation-Date: 2025-01-20 13:49:21+00:00\n"
+"POT-Creation-Date: 2025-02-18 15:14:58+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 #: includes/class-wc-eu-vat-my-account.php:276
 #: includes/class-wc-eu-vat-my-account.php:293
 #: includes/class-wc-eu-vat-number.php:224
-#: includes/class-wc-eu-vat-number.php:852
-#: includes/class-wc-eu-vat-number.php:875
+#: includes/class-wc-eu-vat-number.php:918
+#: includes/class-wc-eu-vat-number.php:941
 #: includes/class-wc-eu-vat-privacy.php:157
 #: includes/class-wc-eu-vat-report-ec-sales-list.php:216
 #: templates/my-account/my-vat-number.php:22
@@ -91,15 +91,15 @@ msgstr ""
 
 #: includes/class-wc-eu-vat-admin.php:424
 #: includes/class-wc-eu-vat-my-account.php:270
-#: includes/class-wc-eu-vat-number.php:854
-#: includes/class-wc-eu-vat-number.php:876
+#: includes/class-wc-eu-vat-number.php:920
+#: includes/class-wc-eu-vat-number.php:942
 msgid "billing"
 msgstr ""
 
 #: includes/class-wc-eu-vat-admin.php:428
 #: includes/class-wc-eu-vat-my-account.php:270
-#: includes/class-wc-eu-vat-number.php:854
-#: includes/class-wc-eu-vat-number.php:876
+#: includes/class-wc-eu-vat-number.php:920
+#: includes/class-wc-eu-vat-number.php:942
 msgid "shipping"
 msgstr ""
 
@@ -189,45 +189,45 @@ msgstr ""
 msgid "VAT number updated successfully!"
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:337
+#: includes/class-wc-eu-vat-number.php:357
 msgid "VAT number is required."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:355
+#: includes/class-wc-eu-vat-number.php:375
 msgid "The VAT number is incomplete."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:361
+#: includes/class-wc-eu-vat-number.php:381
 #. translators: %1$s - VAT number field label, %2$s - VAT Number from user,
 #. %3$s - Billing country.
 msgid ""
 "You have entered an invalid country code for %1$s (%2$s) for your country "
 "(%3$s)."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:375
-#: includes/class-wc-eu-vat-number.php:393
+#: includes/class-wc-eu-vat-number.php:395
+#: includes/class-wc-eu-vat-number.php:413
 #: includes/vies/class-vies-client.php:92
 msgid "Error communicating with the VAT validation server - please try again."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:708
+#: includes/class-wc-eu-vat-number.php:774
 #. translators: %s: VAT Number
 msgid "VAT Number: %s"
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:851
+#: includes/class-wc-eu-vat-number.php:917
 #. translators: 1: VAT number field label, 2: VAT Number, 3: Address type, 4:
 #. Country
 msgid "You have entered an invalid %1$s (%2$s) for your %3$s country (%4$s)."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:874
+#: includes/class-wc-eu-vat-number.php:940
 #. translators: 1: VAT number field label, 2: Address type, 3: Billing country
 msgid "%1$s is a required field for your %2$s country (%3$s)."
 msgstr ""
 
-#: includes/class-wc-eu-vat-number.php:893
+#: includes/class-wc-eu-vat-number.php:959
 #. translators: 1: Ip Address.
 msgid ""
 "Your IP Address (%1$s) does not match your billing country (%2$s). European "

woocommerce-eu-vat-number.php

@@ -4,15 +4,15 @@
  * Requires Plugins: woocommerce
  * Plugin URI: https://woocommerce.com/products/eu-vat-number/
  * Description: The EU VAT Number extension lets you collect and validate EU VAT numbers during checkout to identify B2B transactions verses B2C. IP Addresses can also be validated to ensure they match the billing address. EU businesses with a valid VAT number can have their VAT removed prior to payment.
- * Version: 2.9.13
+ * Version: 2.9.14
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: woocommerce-eu-vat-number
  * Domain Path: /languages
- * Requires at least: 6.5
+ * Requires at least: 6.6
  * Tested up to: 6.7
- * WC requires at least: 9.4
- * WC tested up to: 9.6
+ * WC requires at least: 9.5
+ * WC tested up to: 9.7
  * Requires PHP: 7.4
  * PHP tested up to: 8.3
  *
@@ -26,7 +26,7 @@
 
 // phpcs:disable WordPress.Files.FileName
 
-define( 'WC_EU_VAT_VERSION', '2.9.13' ); // WRCS: DEFINED_VERSION.
+define( 'WC_EU_VAT_VERSION', '2.9.14' ); // WRCS: DEFINED_VERSION.
 define( 'WC_EU_VAT_FILE', __FILE__ );
 define( 'WC_EU_ABSPATH', __DIR__ . '/' );
 define( 'WC_EU_VAT_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );