Changeset 2593377

Timestamp:

09/03/2021 07:00:57 PM (4 years ago)

Author:

taxjar

Message:

Preparing for 3.3.0 release

Location:

taxjar-simplified-taxes-for-woocommerce/trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• composer.json (modified) (1 diff)
• includes/class-taxjar-settings.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• taxjar-woocommerce.php (modified) (2 diffs)

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

@@ +1 @@
+# 3.3.0 (2021-09-02)
+* Fix php warning when store settings are not set
+* Update minimum WordPress version to 5.4
+* Update minimum WooCommerce version to 5.1
+* WooCommerce tested up to version 5.6
+* Update minimum PHP version to 7.0
+
 # 3.2.11 (2021-07-23)
 * Fix fatal error when no line items present on tax response.

taxjar-simplified-taxes-for-woocommerce/trunk/composer.json

@@ -6 +6 @@
   "license": "GPL-2.0+",
   "require": {
-    "composer/installers": "~1.2"
+    "composer/installers": "v2.0.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "*",
+    "squizlabs/php_codesniffer": "3.6.0",
     "wp-coding-standards/wpcs": "2.3.0",
-    "phpunit/phpunit": "5.7.19"
+    "phpunit/phpunit": "7.5.20"
   },
   "scripts": {

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

@@ -490 +490 @@
      */
     public static function get_store_settings() {
-        $taxjar_settings = self::get_taxjar_settings();
-        $store_address   = get_option( 'woocommerce_store_address' ) ? get_option( 'woocommerce_store_address' ) : $taxjar_settings['store_street'];
-        $store_city      = get_option( 'woocommerce_store_city' ) ? get_option( 'woocommerce_store_city' ) : $taxjar_settings['store_city'];
+        $store_address   = self::get_store_setting('woocommerce_store_address', 'store_street' );
+        $store_city      = self::get_store_setting('woocommerce_store_city', 'store_city' );
+        $store_postcode  = self::get_store_setting('woocommerce_store_postcode', 'store_postcode' );
         $store_country   = explode( ':', get_option( 'woocommerce_default_country' ) );
-        $store_postcode  = get_option( 'woocommerce_store_postcode' ) ? get_option( 'woocommerce_store_postcode' ) : $taxjar_settings['store_postcode'];
+
 
         $store_settings = array(
@@ -508 +508 @@
         }
 
-        return apply_filters( 'taxjar_store_settings', $store_settings, $taxjar_settings );
+        return apply_filters( 'taxjar_store_settings', $store_settings, self::get_taxjar_settings() );
+    }
+
+    /**
+     * Gets the woocommerce store setting if present, otherwise gets the TaxJar store setting.
+     *
+     * @param string $woocommerce_option_name WooCommerce option name
+     * @param string $taxjar_setting_key TaxJar setting key
+     *
+     * @return mixed
+     */
+    public static function get_store_setting( string $woocommerce_option_name, string $taxjar_setting_key ) {
+        if ( $woo_setting = get_option( $woocommerce_option_name ) ) {
+            return $woo_setting;
+        }
+
+        $taxjar_settings = self::get_taxjar_settings();
+        if ( isset( $taxjar_settings[ $taxjar_setting_key ] ) ) {
+            return $taxjar_settings[ $taxjar_setting_key ];
+        }
+
+        return null;
     }
 

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

@@ -2 +2 @@
 Contributors: taxjar, tonkapark, fastdivision
 Tags: woocommerce, taxjar, tax, taxes, sales tax, tax calculation, sales tax compliance, sales tax filing
-Requires at least: 5.3
+Requires at least: 5.4
 Tested up to: 5.8
-Stable tag: 3.2.11
+Stable tag: 3.3.0
 License: GPLv2 or later
 URI: http://www.gnu.org/licenses/gpl-2.0.html
-WC requires at least: 5.0.0
-WC tested up to: 5.5.2
+WC requires at least: 5.1.0
+WC tested up to: 5.6.0
 
 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.
@@ -36 +36 @@
 * Simple onboarding accelerates the time it takes to get up and running (typically within 7 days)
 * Award-Winning support. Our TaxJar experts are here to help troubleshoot and answer questions with industry-leading support.
-* Compatible with WooCommerce 3.0+ and WordPress 4.2+.
 * Exempt non-taxable products and take advantage of TaxJar's built-in [sales tax categories](https://developers.taxjar.com/api/reference/#categories) for product exemptions such as clothing, food, software, and more.
 * If you sell on other marketplaces or platforms beyond WooCommerce, get your sales tax data all in one spot.
@@ -96 +95 @@
 
 == Changelog ==
+
+= 3.3.0 (2021-09-02)
+* Fix php warning when store settings are not set
+* Update minimum WordPress version to 5.4
+* Update minimum WooCommerce version to 5.1
+* WooCommerce tested up to version 5.6
+* Update minimum PHP version to 7.0
 
 = 3.2.11 (2021-07-23)

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.11
+ * Version: 3.3.0
  * Author: TaxJar
  * Author URI: https://www.taxjar.com
- * WC requires at least: 5.0.0
- * WC tested up to: 5.5.2
+ * WC requires at least: 5.1.0
+ * WC tested up to: 5.6.0
+ * Requires PHP: 7.0
  *
  * Copyright: © 2014-2019 TaxJar. TaxJar is a trademark of TPS Unlimited, Inc.
@@ -43 +44 @@
 final class WC_Taxjar {
 
-    static $version = '3.2.11';
-    public static $minimum_woocommerce_version = '5.0.0';
+    static $version = '3.3.0';
+    public static $minimum_woocommerce_version = '5.1.0';
 
     /**