diff --git a/Makefile b/Makefile
index 62fafffe832dda5ae4f29a83d1437fe86667f6c4..b2a7080de8dc945adb60f9358a5df553ec5d4e90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
BASE=shipping-by-rules
PLATTFORM=woocommerce
VENDOR=opentools
-VERSION=1.2.99
+VERSION=2.0
DIR = $(shell pwd)
SVNDIR=wordpress-plugin-svn
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone1.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone1.png
new file mode 100644
index 0000000000000000000000000000000000000000..722120318887a9e0f1bc8fef1ca040565669f3f8
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone1.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone2.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e2f511bad666f8436241099432546ab57d2e196
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone2.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone3.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone3.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb04d3f9b509c7036ff727be25320ce3152369b9
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone3.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone4.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c538a87f02160c2e89156ea0e481cf0a74a2b38
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone4.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone5.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone5.png
new file mode 100644
index 0000000000000000000000000000000000000000..f76604825c158c5c00825690f1c94dac1dbfeb2b
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone5.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone6.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone6.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe2d9a4a59c495a1d8eefca4df1a7c66940d235
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone6.png differ
diff --git a/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone7.png b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e37741073217e199d85b02c168a5d9f9ca8a3b
Binary files /dev/null and b/Screenshots/Opentools_Woocommerce_ShippingRules_ShippingZone7.png differ
diff --git a/legacy-woocommerce-advanced-shipping-by-rules.php b/legacy-woocommerce-advanced-shipping-by-rules.php
index 9925eb0195cf72757026d84e43c8cdebf99a6ac3..e9edc10777bfecbf54a5cd9baf57915082096b0c 100644
--- a/legacy-woocommerce-advanced-shipping-by-rules.php
+++ b/legacy-woocommerce-advanced-shipping-by-rules.php
@@ -30,7 +30,7 @@
* @author Reinhold Kainhofer
*/
class Legacy_WooCommerce_Shipping_By_Rules_Advanced {
- public $version = '1.2.4';
+ public $version = '2.0';
private static $instance;
public function __construct() {
diff --git a/legacy-woocommerce-shipping-by-rules.php b/legacy-woocommerce-shipping-by-rules.php
index 49878ff305023bf7d03bc99d8e8d7a76e8a8e5aa..c8b008cb1b5da0ca9ed710adbcb58423f5b5b784 100644
--- a/legacy-woocommerce-shipping-by-rules.php
+++ b/legacy-woocommerce-shipping-by-rules.php
@@ -29,7 +29,7 @@
* @author Reinhold Kainhofer
*/
class Legacy_WooCommerce_Shipping_By_Rules {
- public $version = '1.2.4';
+ public $version = '2.0';
private static $instance;
public function __construct() {
diff --git a/readme.txt b/readme.txt
index a938490f5d4d659650561672b09ca57ac81bfde8..236875075db447cb06e887be860aefb0ca9d790f 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.3.0
+Stable tag: 2.0
License: GPLv3 or later
License URI: http://www.gnu.org/licenses/gpl.html
@@ -69,9 +69,10 @@ Please see our support forum at http://open-tools.net/forum/. It might also be a
== Changelog ==
-= 1.3.0 =
+= 2.0 =
* Transition to WooCommerce's Shipping Zones. Existing methods (not using zones) are preserved and legacy mode is enabled.
* Update for full compatibility with WooCommerce 3.0
+* Fix non-latin category SLUGs
= 1.2.8 =
* Fix issues with UK_* variables when no address is entered yet
diff --git a/releases/opentools-woocommerce-advanced-shipping-by-rules_v2.0.zip b/releases/opentools-woocommerce-advanced-shipping-by-rules_v2.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..958087ac68e79ba066106e6938065e70a0d8bc8b
Binary files /dev/null and b/releases/opentools-woocommerce-advanced-shipping-by-rules_v2.0.zip differ
diff --git a/releases/opentools-woocommerce-shipping-by-rules_v2.0.zip b/releases/opentools-woocommerce-shipping-by-rules_v2.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..fb08f3268ae2651a0338b61515e0edcb8b3c5271
Binary files /dev/null and b/releases/opentools-woocommerce-shipping-by-rules_v2.0.zip differ
diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php
index 24362bd7815d4cdaad83a384941bae499b3aa3b9..aa3a2befa0d9191b65b83adcac892172b0c6cda0 100644
--- a/woocommerce-advanced-shipping-by-rules.php
+++ b/woocommerce-advanced-shipping-by-rules.php
@@ -3,7 +3,7 @@
* 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.99
+ * Version: 2.0
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-advanced-shipping-by-rules
@@ -75,7 +75,7 @@ class WooCommerce_Shipping_By_Rules_Advanced {
* @since 1.0.0
* @var string $version Plugin version number.
*/
- public $version = '1.3.0';
+ public $version = '2.0';
/**
diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php
index 32490d9e072c47188f15acc59d36a3a94a750839..06424a6228b4923ff9595399bd601de8136492f2 100644
--- a/woocommerce-shipping-by-rules.php
+++ b/woocommerce-shipping-by-rules.php
@@ -3,7 +3,7 @@
* 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.99
+ * Version: 2.0
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-shipping-by-rules
@@ -48,7 +48,7 @@ class WooCommerce_Shipping_By_Rules {
* @since 1.0.0
* @var string $version Plugin version number.
*/
- public $version = '1.3.0';
+ public $version = '2.0';
/**