From d0131b81d32e0bfd857d7ba8f7c16a352c7ed9d1 Mon Sep 17 00:00:00 2001 From: Jeroen Gehlen <32011812+JeroenGehlen@users.noreply.github.com> Date: Sat, 5 Oct 2019 06:32:30 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ca50fe..105a275 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ We make shipping any parcel, pallet and document easy, personal and efficient. A More info regarding the installation: https://wearewuunder.com/woocommerce-info-documents/ ## Before you start ## -* You need to create a free Wuunder account: https://app.wearewuunder.com and request an API-key to use the module: https://wearewuunder.com/en/contact/ +* You need to create a free Wuunder account: https://my.wearewuunder.com/account/login and request an API-key to use the module: https://wearewuunder.com/en/contact/ * You can download and install the latest release before you sign-up: https://github.com/wuunder/wuunder-webshopplugin-woocommerce/releases/latest * With this module you connect your WooCommerce store to your Wuunder account. From 4706f86013d1c8505b9dc4c60cb21bc494ba00e5 Mon Sep 17 00:00:00 2001 From: TimD <45198517+Mittows@users.noreply.github.com> Date: Fri, 18 Oct 2019 09:38:55 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 105a275..9c770e1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ More info regarding the installation: https://wearewuunder.com/woocommerce-info- * With this module you connect your WooCommerce store to your Wuunder account. ## Install ## -* Download the .zip from this repository and unpack. +* Download the latest __composer-installed__ [release](https://github.com/wuunder/wuunder-webshopplugin-woocommerce/releases/latest) from this repository and unpack. * Use FTP to transfer the folder with the plugin to the `/wp-content/plugins/` folder. * When the transfer is finished go to your admin area __Plugins__ page. * Locate the __WooCommerce Wuunder__ plugin and activate it. From ad7d6b379463f4ccc7d404b75719fc8305e5cd27 Mon Sep 17 00:00:00 2001 From: Tim Dohmen Date: Thu, 2 Jul 2020 12:39:10 +0200 Subject: [PATCH 3/3] Multi site support Parcelshop error --- CHANGELOG.md | 10 ++++++++++ assets/js/parcelshop.js | 2 +- includes/wcwuunder-shipping-method.php | 4 ++-- readme.txt | 3 +++ woocommerce-wuunder.php | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-) 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-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() {