Merge branch 'hotfix/2.4.3'

isotope · Jul 28, 2017 · 20b2425 · 20b2425
2 parents 84075c4 + 5f099bb
commit 20b2425
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/system/modules/isotope/docs/CHANGELOG-2.4.md b/system/modules/isotope/docs/CHANGELOG-2.4.md
@@ -1,6 +1,16 @@
 Isotope eCommerce Changelog
 ===========================
 
+
+Version 2.4.3 (2017-07-28)
+--------------------------
+
+### 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/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
@@ -135,7 +135,6 @@ function($field) {
                 },
                 $this->getBillingFieldsConfig()
             ));
-
         }
 
         return $this->arrCache['billingFields'];

diff --git 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();

diff --git 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']));