From 10ba338d9cb67697419115d5619c90856857481a Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Thu, 27 Jul 2017 11:57:53 +0200 Subject: [PATCH 1/3] Address data was not correctly saved in orders (#1828) --- system/modules/isotope/docs/CHANGELOG-2.4.md | 9 +++++++++ .../isotope/library/Isotope/Model/ProductCollection.php | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/system/modules/isotope/docs/CHANGELOG-2.4.md b/system/modules/isotope/docs/CHANGELOG-2.4.md index 5c164f1b2c..b70b2ef0da 100644 --- a/system/modules/isotope/docs/CHANGELOG-2.4.md +++ b/system/modules/isotope/docs/CHANGELOG-2.4.md @@ -1,6 +1,15 @@ Isotope eCommerce Changelog =========================== + +Version 2.4.3 (2017-07-??) +-------------------------- + +### Fixed + +- Address data was not correctly saved in orders (#1828) + + Version 2.4.2 (2017-07-26) -------------------------- diff --git a/system/modules/isotope/library/Isotope/Model/ProductCollection.php b/system/modules/isotope/library/Isotope/Model/ProductCollection.php index 732c60f39a..9bb67572d8 100644 --- a/system/modules/isotope/library/Isotope/Model/ProductCollection.php +++ b/system/modules/isotope/library/Isotope/Model/ProductCollection.php @@ -1828,8 +1828,7 @@ protected function createPrivateAddresses() ) { $arrData = array_intersect_key( $objBillingAddress->row(), - array_flip($billingFields), - ['country' => ''] + array_merge(array_flip($billingFields), ['country' => '']) ); $objNew = new Address(); @@ -1856,8 +1855,7 @@ protected function createPrivateAddresses() ) { $arrData = array_intersect_key( $objShippingAddress->row(), - array_flip($shippingFields), - ['country' => ''] + array_merge(array_flip($shippingFields), ['country' => '']) ); $objNew = new Address(); From 4138d745fe5918c288baf3c613df648013ce2bea Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Thu, 27 Jul 2017 12:40:19 +0200 Subject: [PATCH 2/3] Remove edit button if product in collection has errors (#1829) --- system/modules/isotope/docs/CHANGELOG-2.4.md | 1 + system/modules/isotope/library/Isotope/Module/Cart.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/modules/isotope/docs/CHANGELOG-2.4.md b/system/modules/isotope/docs/CHANGELOG-2.4.md index b70b2ef0da..be34a3e297 100644 --- a/system/modules/isotope/docs/CHANGELOG-2.4.md +++ b/system/modules/isotope/docs/CHANGELOG-2.4.md @@ -8,6 +8,7 @@ Version 2.4.3 (2017-07-??) ### Fixed - Address data was not correctly saved in orders (#1828) +- Remove edit button if product in collection has errors (#1829) Version 2.4.2 (2017-07-26) diff --git a/system/modules/isotope/library/Isotope/Module/Cart.php b/system/modules/isotope/library/Isotope/Module/Cart.php index 3a442c1f2f..860929c7a1 100755 --- a/system/modules/isotope/library/Isotope/Module/Cart.php +++ b/system/modules/isotope/library/Isotope/Module/Cart.php @@ -106,7 +106,7 @@ protected function updateItemTemplate( ) { $data = parent::updateItemTemplate($collection, $item, $data, $quantity, $hasChanges); - if (isset($data['configuration'])) { + if (isset($data['configuration']) && !$item->hasErrors()) { list($baseUrl,) = explode('?', $data['href'], 2); $data['edit_href'] = Url::addQueryString('collection_item=' . $item->id, $baseUrl); $data['edit_title'] = specialchars(sprintf($GLOBALS['TL_LANG']['MSC']['editProductLinkTitle'], $data['name'])); From 5f099bb6ae634bac4ceead5845a202d6758e0fbd Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Thu, 27 Jul 2017 12:45:35 +0200 Subject: [PATCH 3/3] Release 2.4.3 --- system/modules/isotope/docs/CHANGELOG-2.4.md | 2 +- system/modules/isotope/library/Isotope/Isotope.php | 2 +- system/modules/isotope/library/Isotope/Model/Config.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/system/modules/isotope/docs/CHANGELOG-2.4.md b/system/modules/isotope/docs/CHANGELOG-2.4.md index be34a3e297..2d6b57f1d8 100644 --- a/system/modules/isotope/docs/CHANGELOG-2.4.md +++ b/system/modules/isotope/docs/CHANGELOG-2.4.md @@ -2,7 +2,7 @@ Isotope eCommerce Changelog =========================== -Version 2.4.3 (2017-07-??) +Version 2.4.3 (2017-07-28) -------------------------- ### Fixed diff --git a/system/modules/isotope/library/Isotope/Isotope.php b/system/modules/isotope/library/Isotope/Isotope.php index 3928cb763b..12cec3f924 100644 --- a/system/modules/isotope/library/Isotope/Isotope.php +++ b/system/modules/isotope/library/Isotope/Isotope.php @@ -41,7 +41,7 @@ class Isotope extends \Controller /** * Isotope version */ - const VERSION = '2.4.2'; + const VERSION = '2.4.3'; /** * True if the system has been initialized diff --git a/system/modules/isotope/library/Isotope/Model/Config.php b/system/modules/isotope/library/Isotope/Model/Config.php index 245f46826b..ab45ce87c5 100644 --- a/system/modules/isotope/library/Isotope/Model/Config.php +++ b/system/modules/isotope/library/Isotope/Model/Config.php @@ -135,7 +135,6 @@ function($field) { }, $this->getBillingFieldsConfig() )); - } return $this->arrCache['billingFields'];