diff --git a/Makefile b/Makefile index 6b4894d1b1f9cc865250ad81141659c8f69297eb..3f0a31e11e13f8ac6660c4c155072da4ba1e4823 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=ordernumbers PLATTFORM=woocommerce VENDOR=opentools -VERSION=1.4.2 +VERSION=1.4.3 DIR = $(shell pwd) SVNDIR=wordpress-plugin-svn diff --git a/ordernumbers_woocommerce_basic.php b/ordernumbers_woocommerce_basic.php index 4d3c3beb261f9ce24907e55838b09eb5e7b2abb6..4720b9dc4ddb713ea5b729271d8d3078bc233e68 100644 --- a/ordernumbers_woocommerce_basic.php +++ b/ordernumbers_woocommerce_basic.php @@ -518,7 +518,7 @@ class OpenToolsOrdernumbersBasic { * The hook to assign a customized order number (unless the order already has one assigned) */ function assign_new_ordernumber($orderid, $order, $update=true) { - if ((!$update) /*&& ($order->post_status == 'auto-draft')*/) { + if ((!$update) /*&& ($order->get_status() == 'auto-draft')*/) { // New order => assign placeholder, which will later be overwritten the real order number $this->update_order_meta($orderid, $this->ordernumber_meta.'ordernumber', $this->ordernumber_new_placeholder); } @@ -528,7 +528,7 @@ class OpenToolsOrdernumbersBasic { return; } $number = $this->get_order_meta( $order, $this->ordernumber_meta.'ordernumber'); - if ($number == $this->ordernumber_new_placeholder/* && $order->post_status != 'auto-draft'*/) { + if ($number == $this->ordernumber_new_placeholder && $order->get_status() != 'auto-draft') { $number = $this->generateNumber($orderid, $order, 'ordernumber'); // Assign a new number } diff --git a/readme.txt b/readme.txt index daf21917803dfe94e3c286683d6269a8daa30d0c..f1913efd108584c9b7d892e9988fe8106570976a 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Contributors: opentools Tags: WooCommerce, Order numbers, orders Requires at least: 4.0 Tested up to: 4.8 -Stable tag: 1.4.2 +Stable tag: 1.4.3 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl.html @@ -78,6 +78,9 @@ The Advanced Ordernumbers for WooCommerce plugin supports some invoicing plugins == Changelog == += 1.4.3 = +* Delay order number creation when creating orders manually in the backend (broken with 1.4.0) + = 1.4.2 = * Allow comparing arrays with empty value in the variable definitions diff --git a/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.3.zip b/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..7e109614f5f118aeeac47548d8af2b43ff86f953 Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.3.zip differ diff --git a/releases/opentools-woocommerce-ordernumbers-basic_v1.4.3.zip b/releases/opentools-woocommerce-ordernumbers-basic_v1.4.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..7a3438c9685312515fa28da70a0ccaa01d1afadc Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-basic_v1.4.3.zip differ diff --git a/woocommerce-advanced-ordernumbers.php b/woocommerce-advanced-ordernumbers.php index e40dc8b33944d013bdeea0f22ceb101416601050..bb226b4548151dde5fd5eba75788e19c59872a3e 100644 --- a/woocommerce-advanced-ordernumbers.php +++ b/woocommerce-advanced-ordernumbers.php @@ -3,7 +3,7 @@ * Plugin Name: Woocommerce Advanced Ordernumbers * Plugin URI: http://open-tools.net/woocommerce/advanced-ordernumbers-for-woocommerce.html * Description: Lets the user freely configure the order numbers in WooCommerce. - * Version: 1.4.2 + * Version: 1.4.3 * Author: Open Tools * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-ordernumbers diff --git a/woocommerce-basic-ordernumbers.php b/woocommerce-basic-ordernumbers.php index 5a59c1fd66287221a9a995f7fee9fb077ba79757..f984f71cb82a60fae708d09c832b00a7ff42fb17 100644 --- a/woocommerce-basic-ordernumbers.php +++ b/woocommerce-basic-ordernumbers.php @@ -3,7 +3,7 @@ * Plugin Name: WooCommerce Basic Ordernumbers * Plugin URI: http://open-tools.net/woocommerce/advanced-ordernumbers-for-woocommerce.html * Description: Configure WooCommerce ordernumbers to have a running counter and arbitrary, fixed text (prefix / postfix). - * Version: 1.4.2 + * Version: 1.4.3 * Author: Open Tools * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-ordernumbers