From 24db2cddc5dce2106e4d45ecef3b14ccddc5f6bd Mon Sep 17 00:00:00 2001 From: Timo Janssen Date: Tue, 18 Jun 2019 11:45:50 +0200 Subject: [PATCH 1/4] fix config --- .../controllers/WebhookController.php | 4 +- .../Wuunder/WuunderConnector/etc/system.xml | 301 ++++++++++++------ 2 files changed, 199 insertions(+), 106 deletions(-) diff --git a/app/code/community/Wuunder/WuunderConnector/controllers/WebhookController.php b/app/code/community/Wuunder/WuunderConnector/controllers/WebhookController.php index 883306b..7d80acb 100644 --- a/app/code/community/Wuunder/WuunderConnector/controllers/WebhookController.php +++ b/app/code/community/Wuunder/WuunderConnector/controllers/WebhookController.php @@ -124,7 +124,7 @@ private function ship($orderId, $carrier, $label_id) function _isWebhookEnabled() { $storeId = Mage::app()->getStore()->getStoreId(); - $enabled = (int)Mage::getStoreConfig('wuunderconnector/connect/enabled', $storeId); - return $enabled ? true : false; + $enabled = (int)Mage::getStoreConfig('wuunderconnector/advanced/webhookenable', $storeId); + return $enabled == 1 ? true : false; } } \ No newline at end of file diff --git a/app/code/community/Wuunder/WuunderConnector/etc/system.xml b/app/code/community/Wuunder/WuunderConnector/etc/system.xml index c5ef6ee..8a26fe5 100755 --- a/app/code/community/Wuunder/WuunderConnector/etc/system.xml +++ b/app/code/community/Wuunder/WuunderConnector/etc/system.xml @@ -79,6 +79,99 @@ 1 1 + + + text + 40 + 1 + 1 + 1 + validate-length maximum-length-30 + Maximum length: 30 + + + + text + 50 + 1 + 1 + 1 + validate-length maximum-length-30 + Maximum length: 30 + + + + text + 51 + 1 + 1 + 1 + validate-length maximum-length-30 + Maximum length: 30 + + + + text + 60 + 1 + 1 + 1 + + + + Phonenumber with country code prefix e.g. +31612345678 + text + 70 + 1 + 1 + 1 + + + + text + 80 + 1 + 1 + 1 + validate-length maximum-length-30 + Maximum length: 30 + + + + text + 81 + 1 + 1 + 1 + + + + text + 90 + 1 + 1 + 1 + + + + text + 100 + 1 + 1 + 1 + validate-length maximum-length-30 + Maximum length: 30 + + + + Country code, use ISO 3166-1 alpha-2 format e.g. NL + text + 110 + 1 + 1 + 1 + validate-length maximum-length-2 + If empty, description will be dynamic, from product info @@ -237,110 +330,110 @@ -
- - text - 5 - 1 - 1 - 1 - 1 - - - - text - 40 - 1 - 1 - 1 - validate-length maximum-length-30 - Maximum length: 30 - - - - text - 50 - 1 - 1 - 1 - validate-length maximum-length-30 - Maximum length: 30 - - - - text - 51 - 1 - 1 - 1 - validate-length maximum-length-30 - Maximum length: 30 - - - - text - 60 - 1 - 1 - 1 - - - - Phonenumber with country code prefix e.g. +31612345678 - text - 70 - 1 - 1 - 1 - - - - text - 80 - 1 - 1 - 1 - validate-length maximum-length-30 - Maximum length: 30 - - - - text - 81 - 1 - 1 - 1 - - - - text - 90 - 1 - 1 - 1 - - - - text - 100 - 1 - 1 - 1 - validate-length maximum-length-30 - Maximum length: 30 - - - - Country code, use ISO 3166-1 alpha-2 format e.g. NL - text - 110 - 1 - 1 - 1 - validate-length maximum-length-2 - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text From 5089f24094eb5ab7da09fa96b68ad8197f5f2485 Mon Sep 17 00:00:00 2001 From: Timo Janssen Date: Tue, 18 Jun 2019 11:50:42 +0200 Subject: [PATCH 2/4] config update, added comment --- .../Wuunder/WuunderConnector/etc/system.xml | 218 +++++++++--------- 1 file changed, 113 insertions(+), 105 deletions(-) diff --git a/app/code/community/Wuunder/WuunderConnector/etc/system.xml b/app/code/community/Wuunder/WuunderConnector/etc/system.xml index 8a26fe5..01bfc4b 100755 --- a/app/code/community/Wuunder/WuunderConnector/etc/system.xml +++ b/app/code/community/Wuunder/WuunderConnector/etc/system.xml @@ -331,108 +331,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -489,6 +489,10 @@ 1 1 1 + Wanneer enabled zullen shipment updates naar de shop gestuurd worden. Wanneer + disabled, dan zal de shop geen shipment updates ontvangen en zal er ook geen order + status veranderen na het boeken. + @@ -643,18 +647,22 @@ - wuunderconnector/adminhtml_system_config_source_parcelshopCarriers + wuunderconnector/adminhtml_system_config_source_parcelshopCarriers + wuunderconnector/parcelshopsTable - wuunderconnector/adminhtml_system_config_backend_parcelshopConfigGrid + wuunderconnector/adminhtml_system_config_backend_parcelshopConfigGrid + 5 1 1 1 - Select the parcelshops you want your customer to be able to select for pickup (cmd/ctrl for multiple) + Select the parcelshops you want your customer to be able to select for pickup + (cmd/ctrl for multiple) + From 1c527faef82cd2c7461612139c38d13f82b5f8b6 Mon Sep 17 00:00:00 2001 From: Mittows Date: Tue, 18 Jun 2019 12:06:25 +0200 Subject: [PATCH 3/4] versioning --- app/code/community/Wuunder/WuunderConnector/Helper/Data.php | 2 +- app/code/community/Wuunder/WuunderConnector/etc/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/community/Wuunder/WuunderConnector/Helper/Data.php b/app/code/community/Wuunder/WuunderConnector/Helper/Data.php index 0e71a9e..f775914 100755 --- a/app/code/community/Wuunder/WuunderConnector/Helper/Data.php +++ b/app/code/community/Wuunder/WuunderConnector/Helper/Data.php @@ -453,7 +453,7 @@ public function buildWuunderData($infoArray, $order, $bookingToken) $sourceObj = array( "product" => "Magento 1 extension", "version" => array( - "build" => "4.3.2", + "build" => "4.3.3", "plugin" => "4.0" ), "platform" => array( diff --git a/app/code/community/Wuunder/WuunderConnector/etc/config.xml b/app/code/community/Wuunder/WuunderConnector/etc/config.xml index 17f4e82..9ca87eb 100755 --- a/app/code/community/Wuunder/WuunderConnector/etc/config.xml +++ b/app/code/community/Wuunder/WuunderConnector/etc/config.xml @@ -2,7 +2,7 @@ - 4.3.2 + 4.3.3 From 4e04ca590d57cd0b01d4893112c48825e19886ed Mon Sep 17 00:00:00 2001 From: TimD <45198517+Mittows@users.noreply.github.com> Date: Tue, 18 Jun 2019 12:08:45 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 894a2f3..cbe3498 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ Please file changes under `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed` o The format is based on [Keep a Changelog](http://keepachangelog.com/). ## Unreleased +## [4.3.3](https://github.com/wuunder/wuunder-webshopplugin-magento/releases/tag/4.3.3) - 2019-06-18 + +### Added +- Added config to enable/disable webhook functionality (default= enabled) + ## [4.3.2](https://github.com/wuunder/wuunder-webshopplugin-magento/releases/tag/4.3.2) - 2019-06-13 ### Added