Merge branch 'hotfix/3.3.2'

Nosto · Nov 27, 2017 · 86e7865 · 86e7865
2 parents 8bb227b + 07b3a04
commit 86e7865
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 141 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 3.3.2
+* Update composer dependencies
+* Update Magento package dependencies
+* Define PHP requirements
+
 ### 3.3.1
 * Fix the issue that new product url contains '_ignore_category' when flat catalog is enabled
 

diff --git a/app/code/community/Nosto/Tagging/Model/Meta/Variation.php b/app/code/community/Nosto/Tagging/Model/Meta/Variation.php
@@ -62,7 +62,7 @@ public function loadData(
         $tmpProduct->setCustomerGroupId($group->getCustomerGroupId());
         /* @var Nosto_Tagging_Helper_Variation $variationHelper  */
         $variationHelper = Mage::helper('nosto_tagging/variation');
-        $this->setId($variationHelper->generateVariationId($group));
+        $this->setVariationId($variationHelper->generateVariationId($group));
         $this->setAvailability($productAvailability);
         $this->setPriceCurrencyCode($currencyCode);
 

diff --git a/app/code/community/Nosto/Tagging/etc/config.xml b/app/code/community/Nosto/Tagging/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Nosto_Tagging>
-            <version>3.3.1</version>
+            <version>3.3.2</version>
         </Nosto_Tagging>
     </modules>
     <global>

diff --git a/app/design/frontend/base/default/template/nostotagging/product.phtml b/app/design/frontend/base/default/template/nostotagging/product.phtml
@@ -129,7 +129,7 @@ $priceHelper = Mage::helper('nosto_tagging/price');
             <?php /* @var Nosto_Types_Product_VariationInterface $variation */ ?>
             <?php foreach ($product->getVariations() as $variation) : ?>
                 <div class="variation">
-                    <span class="variation_id"><?php echo $helper->escapeHtml($variation->getId()); ?></span>
+                    <span class="variation_id"><?php echo $helper->escapeHtml($variation->getVariationId()); ?></span>
                     <span class="price_currency_code"><?php echo $helper->escapeHtml($variation->getPriceCurrencyCode()); ?></span>
                     <span class="price"><?php echo $helper->escapeHtml($variation->getPrice()); ?></span>
                     <span class="list_price"><?php echo $helper->escapeHtml($variation->getListPrice()); ?></span>

diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
         }
     },
     "require": {
-        "nosto/php-sdk": "3.0.12"
+        "php": ">=5.4.0",
+        "nosto/php-sdk": "3.1.1"
     },
     "require-dev": {
         "mridang/magazine": "0.1",