v2.12.5

wpcodefactory · Jul 18, 2024 · 6c2e236 · 6c2e236
1 parent a6319bf
commit 6c2e236
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 76 deletions.
diff --git a/eu-vat-for-woocommerce.php b/eu-vat-for-woocommerce.php
@@ -3,13 +3,13 @@
 Plugin Name: EU/UK VAT for WooCommerce
 Plugin URI: https://wpfactory.com/item/eu-vat-for-woocommerce/
 Description: Manage EU VAT in WooCommerce. Beautifully.
-Version: 2.12.4
+Version: 2.12.5
 Author: WPFactory
 Author URI: https://wpfactory.com/
 Text Domain: eu-vat-for-woocommerce
 Domain Path: /langs
 Copyright: © 2023 WPFactory
-WC tested up to: 8.9
+WC tested up to: 9.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
@@ -22,7 +22,7 @@
  * Main Alg_WC_EU_VAT Class
  *
  * @class   Alg_WC_EU_VAT
- * @version 2.12.4
+ * @version 2.12.5
  * @since   1.0.0
  */
 final class Alg_WC_EU_VAT {
@@ -33,7 +33,7 @@ final class Alg_WC_EU_VAT {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	public $version = '2.12.4';
+	public $version = '2.12.5';
 	public $core = null;
 	public $settings = array();
 

diff --git a/includes/class-alg-wc-eu-vat-core.php b/includes/class-alg-wc-eu-vat-core.php
@@ -2,7 +2,7 @@
 /**
  * EU VAT for WooCommerce - Core Class
  *
- * @version 2.12.4
+ * @version 2.12.5
  * @since   1.0.0
  * @author  WPFactory
  */
@@ -28,7 +28,7 @@ class Alg_WC_EU_VAT_Core {
 	/**
 	 * Constructor.
 	 *
-	 * @version 2.12.4
+	 * @version 2.12.5
 	 * @since   1.0.0
 	 * @todo    [dev] (maybe) "eu vat number" to "eu vat"
 	 * @todo    [feature] `add_eu_vat_verify_button` (`woocommerce_form_field_text`) (`return ( alg_wc_eu_vat_get_field_id() === $key ) ? $field . '<span style="font-size:smaller !important;">' . '[<a name="billing_eu_vat_number_verify" href="">' . __( 'Verify', 'eu-vat-for-woocommerce' ) . '</a>]' . '</span>' : $field;`)
@@ -110,12 +110,16 @@ function __construct() {
 				add_filter( 'wp_enqueue_scripts',                                    array( $this, 'add_place_order_button_confirmation_script' ) );
 			}
 
-			if ( is_admin() ) {
-				add_filter('woocommerce_order_is_vat_exempt',  array( $this, 'admin_order_is_vat_exempt' ), PHP_INT_MAX, 2 );
+			if ( 'yes' === get_option( 'alg_wc_eu_vat_validate_vat_admin_side', 'no' ) ) {
+				if ( is_admin() ) {
+					add_filter('woocommerce_order_is_vat_exempt',  array( $this, 'admin_order_is_vat_exempt' ), PHP_INT_MAX, 2 );
+				}
+				add_filter('woocommerce_order_is_vat_exempt', array( $this, 'admin_woocommerce_order_is_vat_exempt'), PHP_INT_MAX, 2);
 			}
+
+
 			add_action( 'admin_print_scripts', array( $this, 'admin_inline_js' ), PHP_INT_MAX );
 
-			add_filter('woocommerce_order_is_vat_exempt', array( $this, 'admin_woocommerce_order_is_vat_exempt'), PHP_INT_MAX, 2);
 
 			add_action('woocommerce_order_item_add_action_buttons', array( $this, 'admin_function_to_add_the_button'), PHP_INT_MAX);
 

diff --git a/includes/settings/class-alg-wc-eu-vat-settings-admin.php b/includes/settings/class-alg-wc-eu-vat-settings-admin.php
@@ -2,7 +2,7 @@
 /**
  * EU VAT for WooCommerce - Admin Section Settings
  *
- * @version 2.11.12
+ * @version 2.12.5
  * @since   1.5.0
  * @author  WPFactory
  */
@@ -30,7 +30,7 @@ function __construct() {
 	/**
 	 * get_settings.
 	 *
-	 * @version 2.11.12
+	 * @version 2.12.5
 	 * @since   1.5.0
 	 * @todo    [dev] (important) set "Session type" default value to "WC session (recommended)"
 	 */
@@ -58,6 +58,16 @@ function get_settings() {
 				'default'  => 'no',
 				'type'     => 'checkbox',
 			),
+
+			array(
+				'title'    => __( 'VAT Validation for Orders Created Manually from the Admin Side', 'eu-vat-for-woocommerce' ),
+				'desc_tip' => __( 'Validate VAT when an order is created manually from the admin side.', 'eu-vat-for-woocommerce' ),
+				'desc'     => __( 'Enable', 'eu-vat-for-woocommerce' ),
+				'id'       => 'alg_wc_eu_vat_validate_vat_admin_side',
+				'default'  => 'no',
+				'type'     => 'checkbox',
+			),
+
 			array(
 				'type'     => 'sectionend',
 				'id'       => 'alg_wc_eu_vat_admin_options',