Merge pull request #87 from Nosto/feature/add-if-config-to-template

Render layouts only when CM configuration is enabled

Author: olsi-qose

.github/workflows/action.yml

@@ -15,7 +15,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.2'
-        tools: composer, prestissimo
+        tools: composer:v1, prestissimo
         extensions: ast
         coverage: none
 
@@ -69,7 +69,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.2'
-        tools: composer, prestissimo
+        tools: composer:v1, prestissimo
         extensions: ast
         coverage: none
 
@@ -120,7 +120,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.2'
-        tools: composer, prestissimo
+        tools: composer:v1, prestissimo
         extensions: ast
         coverage: none
 

.github/workflows/ide.yml

@@ -16,7 +16,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.2'
-        tools: composer, prestissimo, pecl
+        tools: composer:v1, prestissimo, pecl
         coverage: none
 
     - name: Install AST extension

.github/workflows/phan.yml

@@ -16,7 +16,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.2'
-        tools: composer, prestissimo, pecl
+        tools: composer:v1, prestissimo, pecl
         coverage: none
         extensions: ast
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+## 3.1.0-rc5
+* Render frontend layouts only when CM configuration is enabled
+* Upgrade PHP-SDK version to fix CM not displaying Nosto sorting when batchToken is null
+
 ## 3.1.0-rc4
 * Fix issue where filters were not passed when using MySQL
 

composer.json

@@ -2,7 +2,7 @@
   "name": "nosto/module-nostocmp",
   "description": "Nosto Category Merchandising extension for Magento 2",
   "type": "magento2-module",
-  "version": "3.1.0-rc4",
+  "version": "3.1.0-rc5",
   "require-dev": {
     "magento-ecg/coding-standard": "3.*",
     "magento/module-store": "101.0.4",
@@ -25,7 +25,7 @@
   "minimum-stability": "dev",
   "require": {
     "nosto/module-nostotagging": "^5.0.3",
-    "nosto/php-sdk": ">=5.3.3",
+    "nosto/php-sdk": ">=5.3.5",
     "php": ">=7.1",
     "ext-json": "*"
   },