diff --git a/Makefile b/Makefile
index 9305a9474f07e0d2baf640355f24dd6a6d36b453..0e923a7045e345064b75607b44f5d9b915fb4cb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
BASE=shipping-by-rules
PLATTFORM=woocommerce
VENDOR=opentools
-VERSION=1.2.8
+VERSION=1.3.0
DIR = $(shell pwd)
SVNDIR=wordpress-plugin-svn
diff --git a/readme-adv.txt b/readme-adv.txt
index 99fadff441fc3a496a36a8746b84b890286df8dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/readme-adv.txt
+++ b/readme-adv.txt
@@ -1,81 +0,0 @@
-=== Advanced Shipping by Rules for WooCommerce ===
-Contributors: opentools
-Tags: WooCommerce, Shipment, Shipping
-Requires at least: 4.0
-Tested up to: 4.5
-Stable tag: 1.2.8
-License: GPLv3 or later
-License URI: http://www.gnu.org/licenses/gpl.html
-
-Describe shipping costs with general rules on the order properties. Very complex shipping cost structures (depending on the amount, postal code, weight, number of products and/or articles etc.) can be easily implemented.
-
-
-== Description ==
-Determine shipping costs according to general conditions (bounds on the order properties). Shipping costs can depend on e.g.:
-* Total amount of the order
-* Total weight of the order
-* Number of articles or different products in the order
-* Volume or minimal and maximal extensions of the products
-* Postal code of the delivery address (the Advanced version also supports alphanumeric postal codes from the UK, Canana and Netherlands)
-* Coupon Code (Advanced version only)
-
-The plugin exists in two different versions, this free version, which supports fixed bounds for all properties, and a paid version, which allows all conditions and shipping rules to contain arbitrary mathematical expressions (like an OR operator, multiplication, addition, subtraction, functions like rounding etc.). See the documentation for all the differences.
-
-Each rule is described as one line of text with an easy structure (semicolons separate the parts of the rule). For example:
-
-`Name=Free Shipping; 100<=Amount; 0
-Name=Domestic Small; Articles<5; Amount<100; Shipping=1.50
-Name=Domestic Standard; Amount<100; Shipping=3.50`
-
-This set of rules describes three shipping costs: Orders of 100€ and more are free, otherwise orders with less than five articles have shipping costs of 1.5€, all others 3.50€.
-
-=== Limitations and common misconceptions ===
-
-* The plugin is not designed to calculte shipping costs on a per-product level (e.g. it is not possible that Article A has shipping costs of 3€, Article B 5€ and if you order both you pay 8€ shipping)
-* The plugin allows only limited support for category-based shipping. You can only find out if an article from a particular category is in the order, but NOT how many articles from a given category (e.g. it is not possible to have all articles from Category X ship for 3€ and all articles from Category Y ship for 5€)
-* The plugin does NOT sum the results of all rules, but uses the FIRST matching rule it finds.
-* The plugin does NOT use the lowest result of all rules, but it uses the FIRST matching rule it finds. (In particular, if you want to provide free shipping under certain conditions, you usually need to place the rule for free shipping FIRST rather than last, because the last rule will only be used if none of the other rules matches).
-
-For the full documentation of both the basic and the advanced ordernumbers plugin for WooCommerce, see:
-http://open-tools.net/documentation/advanced-shipping-by-rules-for-woocommerce.html
-
-
-
-== Installation ==
-
-1. To install the plugin, either:
- 1. use WordPress' plugin manager to find it in the WordPress plugin directory and directly install it from the WP plugin manager, or
- 1. use WordPress' plugin manager to upload the plugin's zip file.
-1. After installation, activate the plugin through the 'Plugins' menu in WordPress
-1. Go to WooCommerce's shipment configuration page, open the "Shipping by Rules" method and set up a your rule-based methods there
-
-
-
-== Frequently Asked Questions ==
-
-= What about invoice numbers? =
-
-The Advanced Ordernumbers for WooCommerce plugin supports some invoicing plugins. This functionality is not available in the free version, though.
-
-
-== Screenshots ==
-
-1. The shipping method configuration page. Here you can set up multiple shipping methods (think carriers) using the Shipping by Rules plugin. Each method can have an arbitrary number of rulesets and rules. Each method can independently offer a shipping rate.
-2. The shipping method edit page. Give the shipping method a title that will be shown in the cart and the invoice. You can add an arbitrary number of rulesets, each applying to different countries. Each ruleset can have an arbitrary number of rules of the form 'Name="Name to be displayed to the user"; Amount<14; Weight>5; Shipping=9.9'. Do not forget to press "Update" to save your changes. The rulesets can be reordered by simply dragging them.
-3. An example of two shipping methods offered in the cart. Notice that the displayed shipping name has the form "Shipping Method name (Optional Rule name)".
-4. If a matching rule has NoShipping set as shipping costs, its name will be displayed as a warning message to the user and the method will not offer any shipping.
-5. The plugin's entry in WordPress' plugin management page contains direct links to the configuration page, to the documentation and to the support forum.
-
-
-== Changelog ==
-
-= 1.1 =
-* Add time variables, Quantity/MaxQuantity/MinQuantity
-
-= 1.0 =
-* Initial release
-
-== Upgrade Notice ==
-
-To install the Shipping by Rules plugin for WooCommerce, proceed as described in the Installation section.
-Upgrades to new versions are automatically offered in the WordPress plugin page.
diff --git a/readme.txt b/readme.txt
index 91b7288f0d544653a84587f3b867f30bfd9a7e68..15f293e765f1a39d4e47a62fb364b406bc032f08 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: opentools
Tags: WooCommerce, Shipment, Shipping, Rules shipping
Requires at least: 4.0
Tested up to: 4.7
-Stable tag: 1.2.8
+Stable tag: 1.3.0
License: GPLv3 or later
License URI: http://www.gnu.org/licenses/gpl.html
@@ -69,6 +69,10 @@ Please see our support forum at http://open-tools.net/forum/. It might also be a
== Changelog ==
+= 1.3.0 =
+* Update for full compatibility with WooCommerce 3.0
+* Transition to Shipping zones
+
= 1.2.8 =
* Fix issues with UK_* variables when no address is entered yet
diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php
index d1841f2d8ebcf52b7a3ab4a1eb633e943cddc4f7..b669db2ed07a7a39e69436e080a4d8b363df9343 100644
--- a/woocommerce-advanced-shipping-by-rules.php
+++ b/woocommerce-advanced-shipping-by-rules.php
@@ -3,14 +3,14 @@
* Plugin Name: WooCommerce Advanced Shipping By Rules
* Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
* Description: Define Shipping cost by very general and flexible (text-based) rules. The advanced version also provides mathematical expressions and functions
- * Version: 1.2.8
+ * Version: 1.3.0
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-advanced-shipping-by-rules
* Domain Path: woocommerce-shipping-by-rules
* License: GPL2+
* WC requires at least: 2.2
- * WC tested up to: 2.7
+ * WC tested up to: 3.0
* Copyright (C) 2015 Reinhold Kainhofer
@@ -75,7 +75,7 @@ class WooCommerce_Shipping_By_Rules_Advanced {
* @since 1.0.0
* @var string $version Plugin version number.
*/
- public $version = '1.2.8';
+ public $version = '1.3.0';
/**
diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php
index f08a4a8ca3801880fdaf8085676dbd2753fb2930..d1f94729d489a14fac81deaa40329cfcfc5f9b4b 100644
--- a/woocommerce-shipping-by-rules.php
+++ b/woocommerce-shipping-by-rules.php
@@ -3,14 +3,14 @@
* Plugin Name: WooCommerce Shipping By Rules
* Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
* Description: Define Shipping cost by very general and flexible (text-based) rules.
- * Version: 1.2.8
+ * Version: 1.3.0
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-shipping-by-rules
* Domain Path:
* License: GPL2+
* WC requires at least: 2.2
- * WC tested up to: 2.7
+ * WC tested up to: 3.0
* Copyright (C) 2015 Reinhold Kainhofer
@@ -48,7 +48,7 @@ class WooCommerce_Shipping_By_Rules {
* @since 1.0.0
* @var string $version Plugin version number.
*/
- public $version = '1.2.8';
+ public $version = '1.3.0';
/**