Skip to content

Commit

Permalink
Merge pull request #729 from Nosto/release/5.2.4
Browse files Browse the repository at this point in the history
Release/5.2.4
  • Loading branch information
olsi-qose authored Mar 12, 2021
2 parents aa3d3ac + 549a659 commit d476baa
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 24 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/ide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer:v1, prestissimo, pecl
extensions: bcmath, gd, pdo_mysql, zip, soap
tools: composer:v2, prestissimo, pecl
extensions: bcmath, gd, pdo_mysql, zip, soap, ast
coverage: none

- name: Install AST extension
run: sudo pecl install -f ast

#https://github.com/actions/cache/blob/master/examples.md#php---composer
- name: Cache composer packages
id: composer-cache
Expand All @@ -46,16 +43,10 @@ jobs:
composer install --prefer-dist --no-progress --no-suggest
############################################################################

# Not removing HHVM will lead to the following error:
# > Installation request for hhvm 4.49.0 -> satisfiable by hhvm[4.49.0].
- name: Remove HHVM
id: remove-hhvm
run: sudo apt remove hhvm

- name: Install Magento
id: install-magento
run: |
composer create-project magento/community-edition=2.4.1 magento
composer create-project magento/community-edition=2.4.2 magento --no-dev
cd magento
composer config minimum-stability dev
composer config prefer-stable true
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/phan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer:v1, prestissimo, pecl
tools: composer:v2, prestissimo, pecl
coverage: none
extensions: ast, bcmath, gd, pdo_mysql, zip, soap

Expand All @@ -42,16 +42,10 @@ jobs:
composer install --prefer-dist --no-progress --no-suggest
############################################################################

# Not removing HHVM will lead to the following error:
# > Installation request for hhvm 4.49.0 -> satisfiable by hhvm[4.49.0].
- name: Remove HHVM
id: remove-hhvm
run: sudo apt remove hhvm

- name: Install Magento
id: install-magento
run: |
composer create-project magento/community-edition=2.4.1 magento
composer create-project magento/community-edition=2.4.2 magento --no-dev
cd magento
composer config minimum-stability dev
composer config prefer-stable true
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.

### 5.2.4
* Fix order tagging rendering in case variation tags were missing

### 5.2.3
* Pass correct product id when adding grouped product to cart

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nosto/module-nostotagging",
"description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
"type": "magento2-module",
"version": "5.2.3",
"version": "5.2.4",
"require-dev": {
"phpmd/phpmd": "^2.5",
"sebastian/phpcpd": "*",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
<!--suppress XmlUnboundNsPrefix -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Nosto_Tagging" setup_version="5.2.3"/>
<module name="Nosto_Tagging" setup_version="5.2.4"/>
</config>
6 changes: 4 additions & 2 deletions view/frontend/web/js/view/variation-tagging.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ define([
reloadRecommendations: function () {
// Remove the static variation if it exists - it should not but as a safeguard we rename the class
const element = document.querySelector(".nosto_variation");
element.classList.remove('nosto_variation');
element.classList.add('nosto_variation_static');
if (element) {
element.classList.remove('nosto_variation');
element.classList.add('nosto_variation_static');
}
document.querySelector(".nosto_variation_dynamic").classList.add("nosto_variation")
if (typeof nostojs === 'function') {
nostojs(function (api) {
Expand Down

0 comments on commit d476baa

Please sign in to comment.