Changeset 2389903

Timestamp:

09/28/2020 08:24:11 PM (5 years ago)

Author:

taxjar

Message:

Preparing for 3.2.3 release

Location:

taxjar-simplified-taxes-for-woocommerce/trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• includes/class-wc-taxjar-nexus.php (modified) (3 diffs)
• includes/class-wc-taxjar-transaction-sync.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• taxjar-woocommerce.php (modified) (2 diffs)

taxjar-simplified-taxes-for-woocommerce/trunk/CHANGELOG.md

@@ +1 @@
+# 3.2.3 (2020-09-28)
+* Add filter to nexus check
+* Decouple tax calculation and transaction sync settings
+
 # 3.2.2 (2020-09-02)
 * Fix international store address validation

taxjar-simplified-taxes-for-woocommerce/trunk/includes/class-wc-taxjar-nexus.php

@@ -51 +51 @@
 
     public function has_nexus_check( $country, $state = null ) {
+        $has_nexus = false;
         $store_settings   = $this->integration->get_store_settings();
         $from_country     = $store_settings['country'];
@@ -58 +59 @@
 
         if ( count( $nexus_areas ) == 0 ) {
-            return true;
+            $has_nexus = true;
         }
 
@@ -72 +73 @@
             if ( isset( $nexus->country_code ) && isset( $nexus->region_code ) && 'US' == $nexus->country_code ) {
                 if ( $country == $nexus->country_code && $state == $nexus->region_code ) {
-                    return true;
+                    $has_nexus = true;
                 }
             } elseif ( isset( $nexus->country_code ) ) {
                 if ( $country == $nexus->country_code ) {
-                    return true;
+                    $has_nexus = true;
                 }
 
                 if ( 'GB' == $country && 'UK' == $nexus->country_code ) {
-                    return true;
+                    $has_nexus = true;
                 }
 
                 if ( 'GR' == $country && 'EL' == $nexus->country_code ) {
-                    return true;
+                    $has_nexus = true;
                 }
             }
         }
 
-        return false;
+        return apply_filters( 'taxjar_nexus_check', $has_nexus, $country, $state, $nexus_areas );
     }
 

taxjar-simplified-taxes-for-woocommerce/trunk/includes/class-wc-taxjar-transaction-sync.php

@@ -30 +30 @@
      */
     public function init() {
-        if ( apply_filters( 'taxjar_enabled', isset( $this->taxjar_integration->settings['enabled'] ) && 'yes' == $this->taxjar_integration->settings['enabled'] ) ) {
+        $sales_tax_enabled = apply_filters( 'taxjar_enabled', isset( $this->taxjar_integration->settings['enabled'] ) && 'yes' == $this->taxjar_integration->settings['enabled'] );
+        $transaction_sync_enabled = isset( $this->taxjar_integration->settings['taxjar_download'] ) && 'yes' == $this->taxjar_integration->settings['taxjar_download'];
+
+        if ( $sales_tax_enabled || $transaction_sync_enabled ) {
             add_action( 'init', array( __CLASS__, 'schedule_process_queue' ) );
             add_action( self::PROCESS_QUEUE_HOOK, array( $this, 'process_queue' ) );
-
-            if ( isset( $this->taxjar_integration->settings['taxjar_download'] ) && 'yes' == $this->taxjar_integration->settings['taxjar_download'] ) {
-                add_action( 'woocommerce_new_order', array( __CLASS__, 'order_updated' ) );
-                add_action( 'woocommerce_update_order', array( __CLASS__, 'order_updated' ) );
-
-                add_action( 'woocommerce_order_refunded', array( __CLASS__, 'refund_created' ), 10, 2 );
-
-                add_filter( 'woocommerce_order_actions', array( $this, 'add_order_meta_box_action' ) );
-                add_action( 'woocommerce_order_action_taxjar_sync_action', array( $this, 'manual_order_sync' ) );
-
-                add_action( 'wp_trash_post', array( $this, 'maybe_delete_transaction_from_taxjar' ), 9, 1 );
-                add_action( 'before_delete_post', array( $this, 'maybe_delete_transaction_from_taxjar' ), 9, 1 );
-                add_action( 'before_delete_post', array( $this, 'maybe_delete_refund_from_taxjar' ), 9, 1 );
-                add_action( 'untrashed_post', array( $this, 'untrash_post' ), 11 );
-
-                add_action( 'woocommerce_order_status_cancelled', array( $this, 'order_cancelled' ), 10, 2 );
-
-                add_action( 'woocommerce_product_options_tax', array( $this, 'display_notice_after_product_options_tax' ), 5 );
-                add_action( 'woocommerce_variation_options_tax', array( $this, 'display_notice_after_product_options_tax' ), 5 );
-            }
+        }
+
+        if ( $transaction_sync_enabled ) {
+            add_action( 'woocommerce_new_order', array( __CLASS__, 'order_updated' ) );
+            add_action( 'woocommerce_update_order', array( __CLASS__, 'order_updated' ) );
+
+            add_action( 'woocommerce_order_refunded', array( __CLASS__, 'refund_created' ), 10, 2 );
+
+            add_filter( 'woocommerce_order_actions', array( $this, 'add_order_meta_box_action' ) );
+            add_action( 'woocommerce_order_action_taxjar_sync_action', array( $this, 'manual_order_sync' ) );
+
+            add_action( 'wp_trash_post', array( $this, 'maybe_delete_transaction_from_taxjar' ), 9, 1 );
+            add_action( 'before_delete_post', array( $this, 'maybe_delete_transaction_from_taxjar' ), 9, 1 );
+            add_action( 'before_delete_post', array( $this, 'maybe_delete_refund_from_taxjar' ), 9, 1 );
+            add_action( 'untrashed_post', array( $this, 'untrash_post' ), 11 );
+
+            add_action( 'woocommerce_order_status_cancelled', array( $this, 'order_cancelled' ), 10, 2 );
+
+            add_action( 'woocommerce_product_options_tax', array( $this, 'display_notice_after_product_options_tax' ), 5 );
+            add_action( 'woocommerce_variation_options_tax', array( $this, 'display_notice_after_product_options_tax' ), 5 );
         }
     }

taxjar-simplified-taxes-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.2
 Tested up to: 5.5.1
-Stable tag: 3.2.2
+Stable tag: 3.2.3
 License: GPLv2 or later
 URI: http://www.gnu.org/licenses/gpl-2.0.html
 WC requires at least: 3.2.0
-WC tested up to: 4.4.1
+WC tested up to: 4.5.2
 
 Trusted by more than 20,000 businesses, TaxJar’s award-winning solution makes it easy to automate sales tax reporting and filing, and determine economic nexus with a single click.
@@ -96 +96 @@
 
 == Changelog ==
+
+= 3.2.3 (2020-09-28)
+* Add filter to nexus check
+* Decouple tax calculation and transaction sync settings
 
 = 3.2.2 (2020-09-02)

taxjar-simplified-taxes-for-woocommerce/trunk/taxjar-woocommerce.php

@@ -4 +4 @@
  * Plugin URI: https://www.taxjar.com/woocommerce-sales-tax-plugin/
  * Description: Save hours every month by putting your sales tax on autopilot. Automated, multi-state sales tax calculation, collection, and filing.
- * Version: 3.2.2
+ * Version: 3.2.3
  * Author: TaxJar
  * Author URI: https://www.taxjar.com
  * WC requires at least: 3.2.0
- * WC tested up to: 4.4.1
+ * WC tested up to: 4.5.2
  *
  * Copyright: © 2014-2019 TaxJar. TaxJar is a trademark of TPS Unlimited, Inc.
@@ -43 +43 @@
 final class WC_Taxjar {
 
-    static $version = '3.2.2';
+    static $version = '3.2.3';
     public static $minimum_woocommerce_version = '3.2.0';