Skip to content

Commit

Permalink
v3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@algoritmika
algoritmika committed Oct 30, 2024
1 parent ab4b9ba commit fa2cffc
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 118 deletions.
4 changes: 2 additions & 2 deletions eu-vat-for-woocommerce.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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: 3.0.0
Version: 3.0.1
Author: WPFactory
Author URI: https://wpfactory.com/
Text Domain: eu-vat-for-woocommerce
Expand Down Expand Up @@ -31,7 +31,7 @@ final class Alg_WC_EU_VAT {
* @var string
* @since 1.0.0
*/
public $version = '3.0.0';
public $version = '3.0.1';

/**
* core object.
Expand Down
135 changes: 48 additions & 87 deletions includes/class-alg-wc-eu-vat-core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* EU VAT for WooCommerce - Core Class
*
* @version 3.0.0
* @version 3.0.1
* @since 1.0.0
*
* @author WPFactory
Expand Down Expand Up @@ -45,7 +45,7 @@ class Alg_WC_EU_VAT_Core {
/**
* Constructor.
*
* @version 3.0.0
* @version 3.0.1
* @since 1.0.0
*
* @todo [dev] (maybe) "eu vat number" to "eu vat"
Expand Down Expand Up @@ -181,11 +181,22 @@ function __construct() {
}
}

// Hook into 'init' to ensure proper loading order
add_action( 'init', array( $this, 'init_hooks' ) );

}

/**
* Init hooks.
*
* @version 3.0.1
* @since 3.0.1
*/
function init_hooks() {
// Keep vat for individual product
add_action( 'woocommerce_product_options_tax', array( $this, 'add_keep_vat_individual_product' ) );
add_action( 'woocommerce_admin_process_product_object', array( $this, 'save_keep_vat_individual_product' ) );
add_action( 'alg_wc_eu_vat_exempt_applied', array( $this, 'handle_keep_vat_individual_product' ) );

}

/**
Expand Down Expand Up @@ -291,32 +302,32 @@ function register_additional_checkout_block_field() {
* @since 2.10.4
*/
function alg_wc_eu_woocommerce_store_api_register_update_callback() {
woocommerce_store_api_register_update_callback(
woocommerce_store_api_register_update_callback(
[
'namespace' => 'alg-wc-eu-vat-extention-namespace',
'callback' => function( $data ) {
$country = $data['eu_country'];
$same_billing_shipping = $data['same_billing_shipping'];
if(isset($country) && !empty($country)) {
WC()->customer->set_billing_country(wc_clean( $country ));
if(isset($same_billing_shipping) && $same_billing_shipping == 'yes') {
WC()->customer->set_shipping_country(wc_clean( $country ));
'namespace' => 'alg-wc-eu-vat-extention-namespace',
'callback' => function ( $data ) {
$country = $data['eu_country'];
$same_billing_shipping = $data['same_billing_shipping'];
if ( isset( $country ) && ! empty( $country ) ) {
WC()->customer->set_billing_country( wc_clean( $country ) );
if ( isset( $same_billing_shipping ) && 'yes' == $same_billing_shipping ) {
WC()->customer->set_shipping_country( wc_clean( $country ) );
}
}
}

return;
}
return;
}
]
);
);

woocommerce_store_api_register_update_callback(
woocommerce_store_api_register_update_callback(
[
'namespace' => 'alg-wc-eu-vat-extention-namespace-reload-first',
'callback' => function( $data ) {
return;
}
'namespace' => 'alg-wc-eu-vat-extention-namespace-reload-first',
'callback' => function ( $data ) {
return;
}
]
);
);

}

Expand All @@ -339,7 +350,6 @@ function alg_eu_vat_update_block_order_meta_eu_vat( $order, $request ) {
$posted_shipping_country = $shipping_address['country'];

$posted_billing_company = $billing_address['company'];
// $posted_eu_vat_id = $data['billing_eu_vat_number'];

$posted_eu_vat_id = $order->get_meta('_wc_other/alg_eu_vat/billing_eu_vat_number');

Expand Down Expand Up @@ -532,7 +542,6 @@ function filter_users_by_billing_eu_vat( $query ) {
*/
function alg_extend_wcpdf_after_billing_address($type, $pdf_order){
if( function_exists( 'alg_wc_eu_vat_get_field_id' ) ){
/*$vat_id = get_post_meta( $pdf_order->ID, '_' . alg_wc_eu_vat_get_field_id(), true );*/
$vat_id = $pdf_order->get_meta( '_' . alg_wc_eu_vat_get_field_id() );
if( $vat_id && !empty( $vat_id ) ){
?><div class="eu-vat"><?php echo $vat_id; ?></div><?php
Expand All @@ -552,48 +561,12 @@ function set_eu_vat_country_locale_core( $country_locales, $show_in_countries, $
$required_eu_vat_field_countries = array_map( 'strtoupper', array_map( 'trim', explode( ',', $required_in_countries ) ) );

$eu_vat_required = get_option( 'alg_wc_eu_vat_field_required', 'no' );
/*
if (in_array($eu_vat_required, array('no_for_countries','yes_for_countries', 'yes_for_company'))){
$hidden = false;
}else{
$hidden = true;
}
*/

$original_hidden = false;

// Disable field in existing locales
/*
foreach ( $country_locales as $country_code => &$country_locale ) {
if ( ! in_array( $country_code, $show_eu_vat_field_countries ) ) {
$country_locale[ alg_wc_eu_vat_get_field_id( true ) ] = array(
'required' => false,
'hidden' => $hidden,
);
}
}
*/

// Enable field in selected locales
$original_required = ( 'yes' === $eu_vat_required );

/*
foreach ( $show_eu_vat_field_countries as $country_code ) {
$is_required = ( 'yes' === $eu_vat_required );
if ('yes_for_countries' === $eu_vat_required){
if ( in_array( $country_code, $show_eu_vat_field_countries ) ) {
$is_required = true;
}
}
$country_locales[ $country_code ][ alg_wc_eu_vat_get_field_id( true ) ] = array(
'required' => $is_required,
'hidden' => false,
);
}
*/

if(!empty($show_eu_vat_field_countries)){
$country_locales_keys = array_keys($country_locales);
$ky2 = $country_locales_keys;
Expand Down Expand Up @@ -905,9 +878,8 @@ function eu_vat_admin_footer() {
* @since 2.9.13
*/
function admin_woocommerce_order_is_vat_exempt( $is_exempt, $instance ) {
//custom code here

$order_id = $instance->get_id();
/*$exempt_vat_from_admin = get_post_meta($order_id, 'exempt_vat_from_admin', true);*/

$exempt_vat_from_admin = $instance->get_meta( 'exempt_vat_from_admin' );
if($exempt_vat_from_admin == 'yes'){
Expand All @@ -925,7 +897,6 @@ function admin_woocommerce_order_is_vat_exempt( $is_exempt, $instance ) {
*/
function admin_function_to_add_the_button( $order ) {
$order_id = $order->get_id();
// $exempt_vat_from_admin = get_post_meta($order_id, 'exempt_vat_from_admin', true);
$exempt_vat_from_admin = $order->get_meta( 'exempt_vat_from_admin' );
if($exempt_vat_from_admin == 'yes'){
$exempt_vat_from_admin = 'yes';
Expand Down Expand Up @@ -956,7 +927,6 @@ function current_url() {
$current_url .= $_SERVER["REQUEST_URI"];

if(strpos($current_url,'wp-json/siteground-optimizer/v1/test-url-cache') !== false || strpos($current_url,'wp-json/siteground-optimizer') !== false) {
// return get_option('siteurl');
return 'test-url-cache';
} else {
return $current_url;
Expand Down Expand Up @@ -1017,7 +987,6 @@ function alg_wc_eu_vat_validate_vat_admin() {
success: function( resp ) {
var response = resp.res;
response = response.trim();
// $( 'body' ).trigger( 'update_checkout' );
$("#woocommerce-order-data").unblock();
},
} );
Expand Down Expand Up @@ -1225,7 +1194,6 @@ function get_field_data() {

if ( ! empty( WC()->checkout ) ) {

/*if ( '' != ( $this->required_in_countries = apply_filters( 'alg_wc_eu_vat_required_in_countries', '' ) ) ) {*/
if ( '' != $this->required_in_countries ) {
$required_eu_vat_field_countries = array_map( 'strtoupper', array_map( 'trim', explode( ',', $this->required_in_countries ) ) );
if ('yes_for_countries' === $eu_vat_required){
Expand Down Expand Up @@ -1289,9 +1257,6 @@ function add_eu_vat_number_to_editable_fields( $address, $load_address ) {
if ( 'billing' === $load_address ) {
$field_id = alg_wc_eu_vat_get_field_id();

// $address[ $field_id . '_customer_decide' ] = $this->get_customer_decide_field_data();
// $address[ $field_id . '_customer_decide' ]['value'] = get_user_meta( get_current_user_id(), $field_id . '_customer_decide', true );

$address[ $field_id ] = $this->get_field_data();
$address[ $field_id ]['value'] = get_user_meta( get_current_user_id(), $field_id, true );
}
Expand Down Expand Up @@ -1323,18 +1288,17 @@ function save_eu_vat_number_from_editable_fields( $user_id, $load_address ) {
* @version 2.11.5
* @since 2.9.18
*/

function is_tax_status_none(){
if( function_exists('WC') ) {
if( isset( WC()->cart ) ) {
if ( function_exists( 'WC' ) ) {
if ( isset( WC()->cart ) ) {
foreach( WC()->cart->get_cart() as $cart_item ) {

$product_in_cart = $cart_item['product_id'];
$product_info = wc_get_product( $product_in_cart );
$tax_status = $product_info->get_tax_status();
if( $tax_status == 'none' ){
return true;
}
$product_in_cart = $cart_item['product_id'];
$product_info = wc_get_product( $product_in_cart );
$tax_status = $product_info->get_tax_status();
if ( 'none' == $tax_status ) {
return true;
}

}
}
Expand Down Expand Up @@ -1385,7 +1349,6 @@ function replace_eu_vat_number_in_address_formats( $replacements, $args ) {
$field_name = alg_wc_eu_vat_get_field_id();
$the_label = do_shortcode( get_option( 'alg_wc_eu_vat_field_label', __( 'EU VAT Number', 'eu-vat-for-woocommerce' ) ) );
$field_name_cd = alg_wc_eu_vat_get_field_id() . '_customer_decide';
// $replacements['{' . $field_name_cd . '}'] = ( isset( $args[ $field_name_cd ] ) ) ? $args[ $field_name_cd ] : '';
if(isset( $args[ $field_name ] ) && !empty( $args[ $field_name ] )){
$replacements['{' . $field_name . '}'] = ( isset( $args[ $field_name ] ) ) ? $the_label . ': ' . $args[ $field_name ] : '';
}else{
Expand All @@ -1398,10 +1361,15 @@ function replace_eu_vat_number_in_address_formats( $replacements, $args ) {
/**
* add_eu_vat_number_to_address_formats.
*
* @version 1.0.0
* @version 3.0.1
* @since 1.0.0
*/
function add_eu_vat_number_to_address_formats( $address_formats ) {

if ( is_checkout() ) {
return $address_formats;
}

$field_name = alg_wc_eu_vat_get_field_id();
$modified_address_formats = array();
foreach ( $address_formats as $country => $address_format ) {
Expand All @@ -1420,7 +1388,6 @@ function add_eu_vat_number_to_my_account_billing_address( $fields, $customer_id,
if ( 'billing' === $name ) {
$field_name = alg_wc_eu_vat_get_field_id();
$fields[ $field_name ] = get_user_meta( $customer_id, $field_name, true );
// $fields[ $field_name . '_customer_decide' ] = get_user_meta( $customer_id, $field_name .'_customer_decide', true );
}
return $fields;
}
Expand All @@ -1434,9 +1401,7 @@ function add_eu_vat_number_to_my_account_billing_address( $fields, $customer_id,
function add_eu_vat_number_to_order_billing_address( $fields, $_order ) {
$field_name = alg_wc_eu_vat_get_field_id();
$field_value = $_order->get_meta( '_' . $field_name );
// $fields[ $field_name ] = get_post_meta( alg_wc_eu_vat_get_order_id( $_order ), '_' . $field_name, true );
$fields[ $field_name ] = $field_value;
// $fields[ $field_name . '_customer_decide' ] = get_post_meta( alg_wc_eu_vat_get_order_id( $_order ), '_' . $field_name . '_customer_decide', true );
return $fields;
}

Expand All @@ -1451,10 +1416,6 @@ function add_eu_vat_number_to_order_display( $order ) {
$html = '';
$option_name = '_' . alg_wc_eu_vat_get_field_id();
$option_name_customer_decide = '_' . alg_wc_eu_vat_get_field_id() . '_customer_decide';
/*
$the_eu_vat_number = get_post_meta( $order_id, $option_name, true );
$customer_decide = get_post_meta( $order_id, $option_name_customer_decide, true );
*/

$the_eu_vat_number = $order->get_meta( $option_name );
$customer_decide = $order->get_meta( $option_name_customer_decide );
Expand Down
23 changes: 22 additions & 1 deletion includes/js/alg-wc-eu-vat.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* alg-wc-eu-vat.js
*
* @version 3.0.0
* @version 3.0.1
* @since 1.0.0
*
* @author WPFactory
Expand Down Expand Up @@ -302,3 +302,24 @@ jQuery( function ( $ ) {
}

} );

/**
* Move VAT validation process message section into `wc-block-components-address-form__alg_eu_vat-billing_eu_vat_number`.
*
* @version 3.0.1
* @since 3.0.1
*/
// Wait for all resources to load
window.onload = () => {
const sourceDiv = document.getElementById( 'alg_eu_vat_for_woocommerce_field' );
const targetDiv = document.querySelector( '.wc-block-components-address-form__alg_eu_vat-billing_eu_vat_number' );

// Check if both elements exist
if ( sourceDiv && targetDiv ) {
// Set margin-top style
sourceDiv.style.marginTop = '16px';

// Move the sourceDiv into the targetDiv
targetDiv.appendChild( sourceDiv ); // Append sourceDiv as a child of targetDiv
}
};
Loading

0 comments on commit fa2cffc

Please sign in to comment.