2.3.11

changelog.txt

@@ -1,6 +1,12 @@
 *** EU VAT Number Changelog ***
 
-2018-08-20 - version 2.3.9
+2018-09-26 - version 2.3.11
+* Update - WC tested up to 3.5
+
+2018-08-21 - version 2.3.10
+* Fix - Re-deployment to fix VAT numbers being removed when order is saved.
+
+2018-08-21 - version 2.3.9
 * Fix - VAT numbers were removed when order is saved.
 
 2018-08-02 - version 2.3.8

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

@@ -42,10 +42,23 @@ public static function init() {
 	 * @return array
 	 */
 	public static function admin_billing_fields( $fields ) {
+		global $theorder;
+
+		$vat_number = '';
+
+		if ( is_object( $theorder ) ) {
+			$vat_number = get_post_meta( $theorder->get_id(), '_vat_number', true );
+
+			if ( empty( $vat_number ) ) {
+				$vat_number = get_post_meta( $theorder->get_id(), '_billing_vat_number', true );
+			}
+		}
+
 		$fields['vat_number'] = array(
 			'label' => __( 'VAT Number', 'woocommerce-eu-vat-number' ),
 			'show'  => false,
-			'id'    => '_billing_vat_number',
+			'id'    => '_vat_number',
+			'value' => $vat_number,
 		);
 		return $fields;
 	}

woocommerce-eu-vat-number.php

@@ -3,15 +3,15 @@
  * Plugin Name: WooCommerce EU VAT Number
  * 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.3.9
+ * Version: 2.3.11
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: woocommerce-eu-vat-number
  * Domain Path: /languages
  * Requires at least: 4.4
  * Tested up to: 4.7
  * WC requires at least: 2.6
- * WC tested up to: 3.4
+ * WC tested up to: 3.5
  *
  * Copyright: © 2018 WooCommerce.
  * License: GNU General Public License v3.0
@@ -25,7 +25,7 @@
 	require_once( 'woo-includes/woo-functions.php' );
 }
 
-define( 'WC_EU_VAT_VERSION', '2.3.9' );
+define( 'WC_EU_VAT_VERSION', '2.3.11' );
 define( 'WC_EU_VAT_FILE', __FILE__ );
 define( 'WC_EU_VAT_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );