Merge pull request #513 from Nosto/release/3.10.0

Release/3.10.0
Nosto · Apr 17, 2019 · adb2daf · adb2daf
2 parents c30ebea + 4fe3fc1
commit adb2daf
Show file tree

Hide file tree

Showing 162 changed files with 327 additions and 208 deletions.
diff --git a/.github/pull-request-template.md b/.github/pull-request-template.md
@@ -30,4 +30,6 @@
 - [ ] I have correctly labeled this pull request.
 - [ ] I have linked the corresponding issue in this description.
 - [ ] I have updated the corresponding Jira ticket.
-- [ ] I have requested a review from at least 2 reviewers
+- [ ] I have requested a review from at least 2 reviewers
+- [ ] I have checked the base branch of this pull request
+- [ ] I have checked my code for any possible security vulnerabilities
diff --git a/.phan/stubs/Mage.php b/.phan/stubs/Mage.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/.phan/stubs/Yotpo.php b/.phan/stubs/Yotpo.php
@@ -22,7 +22,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 class Yotpo_Yotpo_Helper_RichSnippets extends Mage_Core_Helper_Abstract

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 3.10.0
+* Add Nosto category personalization in the default Magento category sorting options
+
 ### 3.9.0
 * Feature flag to set the a percentage of total PHP available memory that can be used by Nosto indexer
 * Exit indexer gracefully if the memory consumption goes over the predefined amount

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -20,7 +20,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Addtocart.php b/app/code/community/Nosto/Tagging/Block/Addtocart.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/Iframe.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/Iframe.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/Notifications.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/Notifications.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/CronFrequency.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/CronFrequency.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/Formats.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/Formats.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/Method.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Currency/Method.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Inventory/Switch.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Inventory/Switch.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Ratings/Provider.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Ratings/Provider.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Variation/Switch.php b/app/code/community/Nosto/Tagging/Block/Adminhtml/System/Config/Variation/Switch.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Cart.php b/app/code/community/Nosto/Tagging/Block/Cart.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Category.php b/app/code/community/Nosto/Tagging/Block/Category.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Customer.php b/app/code/community/Nosto/Tagging/Block/Customer.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Element.php b/app/code/community/Nosto/Tagging/Block/Element.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Embed.php b/app/code/community/Nosto/Tagging/Block/Embed.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Meta.php b/app/code/community/Nosto/Tagging/Block/Meta.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Order.php b/app/code/community/Nosto/Tagging/Block/Order.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Pagetype.php b/app/code/community/Nosto/Tagging/Block/Pagetype.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Product.php b/app/code/community/Nosto/Tagging/Block/Product.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Product/List/Toolbar.php b/app/code/community/Nosto/Tagging/Block/Product/List/Toolbar.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -40,6 +40,7 @@ class Nosto_Tagging_Block_Product_List_Toolbar
      *
      * @param Varien_Data_Collection $collection
      * @return Mage_Catalog_Block_Product_List_Toolbar
+     * @throws Mage_Core_Model_Store_Exception
      */
     public function setCollection($collection)
     {
@@ -54,24 +55,23 @@ public function setCollection($collection)
             || !$accountHelper->find($store)
         ) {
             return parent::setCollection($collection);
-        } else {
-            $this->_collection = $collection;
-            $limit = (int)$this->getLimit();
-            if ($limit) {
-                $this->_collection->setPageSize($limit);
-            }
-            $this->_collection->setCurPage($this->getCurrentPage());
-            $sortIds = array_reverse($this->getSortIds($this->getCurrentOrder()));
-            if (!empty($sortIds)) {
-                $orderByIds = sprintf(
-                    'FIELD(product_id, %s) DESC',
-                    implode(',', $sortIds)
-                );
-                $this->_collection->getSelect()->order($orderByIds);
-            }
-
-            return $this;
         }
+        $this->_collection = $collection;
+        $limit = (int)$this->getLimit();
+        if ($limit) {
+            $this->_collection->setPageSize($limit);
+        }
+        $this->_collection->setCurPage($this->getCurrentPage());
+        $sortIds = array_reverse($this->getSortIds($this->getCurrentOrder()));
+        if (!empty($sortIds)) {
+            $orderByIds = sprintf(
+                'FIELD(product_id, %s) DESC',
+                implode(',', $sortIds)
+            );
+            $this->_collection->getSelect()->order($orderByIds);
+        }
+
+        return $this;
     }
 
     /**
@@ -100,4 +100,4 @@ protected function getSortIds($type)
             $type
         );
     }
-}
+}
diff --git a/app/code/community/Nosto/Tagging/Block/Searchterm.php b/app/code/community/Nosto/Tagging/Block/Searchterm.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Stub.php b/app/code/community/Nosto/Tagging/Block/Stub.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Block/Variation.php b/app/code/community/Nosto/Tagging/Block/Variation.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Helper/Account.php b/app/code/community/Nosto/Tagging/Helper/Account.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -323,7 +323,7 @@ public function resetAccountSettings(Mage_Core_Model_Store $store = null)
     }
 
     /**
-     * Returns all store views that have Nosto intsalled
+     * Returns all store views that have Nosto installed
      *
      * @return Mage_Core_Model_Store[]
      */
@@ -340,4 +340,18 @@ public function getAllStoreViewsWithNostoAccount()
 
         return $storesWithNosto;
     }
+
+    /**
+     * Returns the id of the first store that has nosto installed
+     *
+     * @return int|null
+     */
+    public function getFirstNostoStoreId()
+    {
+        $storesWithNosto = $this->getAllStoreViewsWithNostoAccount();
+        if (!empty($storesWithNosto) && $storesWithNosto[0] instanceof Mage_Core_Model_Store) {
+            return $storesWithNosto[0]->getId();
+        }
+        return null;
+    }
 }
diff --git a/app/code/community/Nosto/Tagging/Helper/Bootstrap.php b/app/code/community/Nosto/Tagging/Helper/Bootstrap.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Helper/Cache.php b/app/code/community/Nosto/Tagging/Helper/Cache.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Helper/Class.php b/app/code/community/Nosto/Tagging/Helper/Class.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Helper/Currency.php b/app/code/community/Nosto/Tagging/Helper/Currency.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/community/Nosto/Tagging/Helper/Customer.php b/app/code/community/Nosto/Tagging/Helper/Customer.php
@@ -21,7 +21,7 @@
  * @category  Nosto
  * @package   Nosto_Tagging
  * @author    Nosto Solutions Ltd <magento@nosto.com>
- * @copyright Copyright (c) 2013-2017 Nosto Solutions Ltd (http://www.nosto.com)
+ * @copyright Copyright (c) 2013-2019 Nosto Solutions Ltd (http://www.nosto.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */