diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ceaa05..40ef348 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ## Released +## [2.7.19](https://github.com/wuunder/wuunder-webshopplugin-woocommerce/tag/2.7.19) - 2020-07-02 + +### Added +- Support multi-site wordpress + +### Fixed + +- Parcelshop shipping method error when disabled + + ## [2.7.18](https://github.com/wuunder/wuunder-webshopplugin-woocommerce/tag/2.7.18) - 2020-06-02 ### Fixed diff --git a/assets/js/parcelshop.js b/assets/js/parcelshop.js index 61fbd24..015c916 100644 --- a/assets/js/parcelshop.js +++ b/assets/js/parcelshop.js @@ -32,7 +32,7 @@ function initParcelshopLocator(url, apiUrl, carrierList, chooseParcelshopTxt, ch } function _onShippingMethodChange() { - if (document.getElementById('shipping_method_0_wuunder_parcelshop').checked) { + if (document.getElementById('shipping_method_0_wuunder_parcelshop') && document.getElementById('shipping_method_0_wuunder_parcelshop').checked) { if (window.parent.document.getElementsByClassName('chooseParcelshop').length < 1) { var container = document.createElement('tr'); container.className += "chooseParcelshop"; diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php index 8c7de03..f6504f3 100644 --- a/includes/wcwuunder-create.php +++ b/includes/wcwuunder-create.php @@ -13,7 +13,7 @@ public function __construct() $this->version_obj = array( 'product' => 'Woocommerce extension', 'version' => array( - 'build' => '2.7.10 ', + 'build' => '2.7.19', 'plugin' => '2.0'), 'platform' => array( 'name' => 'Woocommerce', diff --git a/includes/wcwuunder-shipping-method.php b/includes/wcwuunder-shipping-method.php index 57cec59..d97efd6 100644 --- a/includes/wcwuunder-shipping-method.php +++ b/includes/wcwuunder-shipping-method.php @@ -4,8 +4,8 @@ die; } -if (in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option('active_plugins')))) { - +if (in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option('active_plugins'))) || (is_multisite() && is_plugin_active_for_network('woocommerce/woocommerce.php'))) { + function wc_wuunder_parcelshop_method() { if (!class_exists('WC_wuunder_parcelshop')) { diff --git a/readme.txt b/readme.txt index 05d5671..1c5e65c 100644 --- a/readme.txt +++ b/readme.txt @@ -97,6 +97,9 @@ You can best contact us via info@wearewuunder.com 7. Eenvoudig labels printen == Changelog == += 2.7.19 = +* Fix rparcelshop error +* Added support for multi-site Wordpress = 2.7.18 = * Fix remembering parcelshop id = 2.7.17 = diff --git a/woocommerce-wuunder.php b/woocommerce-wuunder.php index 288c09b..146314b 100644 --- a/woocommerce-wuunder.php +++ b/woocommerce-wuunder.php @@ -3,7 +3,7 @@ * Plugin Name: Wuunder for-woocommerce * Plugin URI: https://wearewuunder.com/wuunder-voor-webshops/ * Description: Wuunder shipping plugin - * Version: 2.7.18 + * Version: 2.7.19 * Author: Wuunder * Author URI: http://wearewuunder.com */ @@ -57,7 +57,7 @@ class Woocommerce_Wuunder { public static $plugin_path; public static $plugin_basename; - const VERSION = '2.7.18'; + const VERSION = '2.7.19'; public function __construct() {