Merge pull request #318 from Nosto/revert-317-revert-316-hotfix/3.9.2

Revert "Revert "Show correct price based on include_tax""

.github/workflows/action.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.3'
         tools: composer, prestissimo
         extensions: ast
         coverage: none
@@ -64,7 +64,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.3'
         tools: composer, prestissimo
         extensions: ast
         coverage: none
@@ -111,7 +111,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.3'
         tools: composer, prestissimo
         extensions: ast
         coverage: none
@@ -162,7 +162,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.3'
         tools: composer, prestissimo
         extensions: ast
         coverage: none

.github/workflows/phan.yml

@@ -15,9 +15,10 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
-        tools: composer, prestissimo, pecl
+        php-version: '7.3'
+        tools: composer:v2, prestissimo, pecl
         coverage: none
+        extensions: ast, bcmath, gd, pdo_mysql, zip, soap
 
       #https://github.com/actions/cache/blob/master/examples.md#php---composer
     - name: Cache composer packages

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to Semantic Versioning(http://semver.org/).
 
+## 3.9.2
+- Set correct price to variation based on tax include configuration 
+
 ### 3.9.1
 - Add PHPStorm Inspections as a CI build step
 

classes/helpers/NostoHelperPrice.php

@@ -152,7 +152,7 @@ public static function getProductPriceForGroup(
             NostoHelperContext::getCurrencyId(),
             $groupId,
             2,
-            true,
+            Group::getPriceDisplayMethod($groupId) == PS_TAX_INC, 
             $decimals,
             false,
             $useReduction,

classes/helpers/NostoHelperVariation.php

@@ -127,6 +127,11 @@ public static function getGroupsBeingUsedInSpecificPrices()
             $groupIds[] = 0;
         }
 
+        //make sure it always has 'visitor'
+        if (!in_array(1, $groupIds, false)) {
+            $groupIds[] = 1;
+        }
+
         /** @noinspection PhpParamsInspection */
         // @phan-suppress-next-line PhanTypeMismatchArgument
         Cache::store($cacheKey, $groupIds);

composer.json

@@ -5,12 +5,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "nosto/php-sdk": "5.1.*",
-    "ext-json": "*",
-    "ext-dom": "*",
-    "ext-libxml": "*",
-    "ext-simplexml": "*",
-    "ext-posix": "*"
+    "nosto/php-sdk": "5.3.*"
   },
   "require-dev": {
     "phan/phan": "^2.6",