diff --git a/Makefile b/Makefile index 87b5dedbbd235b3725a7b5e7f58e1c590d9d2d06..e3fb79b025f873b5addf02fab9b2845f6ac74886 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=shipping-by-rules PLATTFORM=woocommerce VENDOR=opentools -VERSION=1.2.4 +VERSION=1.2.5 DIR = $(shell pwd) SVNDIR=wordpress-plugin-svn diff --git a/includes/rules_shipping_framework_woocommerce.php b/includes/rules_shipping_framework_woocommerce.php index 1e593ad6f9054f7f80cf83bf812f26eac0113242..b400a92a32c6b1d316cc68f73259d7d3aa1829d0 100644 --- a/includes/rules_shipping_framework_woocommerce.php +++ b/includes/rules_shipping_framework_woocommerce.php @@ -307,6 +307,11 @@ class RulesShippingFrameworkWooCommerce extends RulesShippingFramework { /* Get the user from the package information and extract further information about the buyer */ $user = $cart['user']; $data['userid'] = $user['ID']; + $data['userroles'] = array(); + $data['username'] = ''; + $data['first_name'] = ''; + $data['last_name'] = ''; + $data['email'] = ''; if ($user['ID']>0) { $userinfo = get_userdata($user['ID']); $data['userroles'] = $userinfo->roles; diff --git a/readme-adv.txt b/readme-adv.txt index 8ffee78437208ed284678f03c49a53ca9178bb2d..abf495bc83d80f4478408329981c9852bce066ee 100644 --- a/readme-adv.txt +++ b/readme-adv.txt @@ -3,7 +3,7 @@ Contributors: opentools Tags: WooCommerce, Shipment, Shipping Requires at least: 4.0 Tested up to: 4.5 -Stable tag: 1.2.4 +Stable tag: 1.2.5 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl.html diff --git a/readme.txt b/readme.txt index f4596963a5eed5fb3a03d8719bc342351cdca9fa..97b12da2c1747903d12f277b1818c0c4f7861454 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.5 -Stable tag: 1.2.4 +Stable tag: 1.2.5 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl.html @@ -69,6 +69,11 @@ Please see our support forum at http://open-tools.net/forum/. It might also be a == Changelog == += 1.2.5 = +* Add variables username, first_name, last_name, email +* Add list variable userroles (advanced version only) +* Fix issue with debug_variables + = 1.2.4 = * Fix incompatibility with Cash on Delivery (returned id should be prefixed with the method ID) * Fix opentools_shipping_by_rules_get_cart_values filter using indefined argument diff --git a/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.5.zip b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..1bd2a250d369598cb6ff0077d9d231885c92d54a Binary files /dev/null and b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.5.zip differ diff --git a/releases/opentools-woocommerce-shipping-by-rules_v1.2.5.zip b/releases/opentools-woocommerce-shipping-by-rules_v1.2.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..3340bbb7e70906fd4d4fb78608848917cfc37fd8 Binary files /dev/null and b/releases/opentools-woocommerce-shipping-by-rules_v1.2.5.zip differ diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php index b298db9f256a6145b258d2728847bf7ea48b7772..8378fb7cfd99919bf5c504691ca9309851719a05 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.4 + * Version: 1.2.5 * 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.2.4'; + public $version = '1.2.5'; /** diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php index aeedd91fa7e177f5e6eb241cd5f9426d2c771059..56d2b0bbad35bc5f443ae0df02cda7e7c9b02bc4 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.4 + * Version: 1.2.5 * 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.2.4'; + public $version = '1.2.5'; /**