Merge pull request #46 from Evgeniy-Goroh/master

added use VAT inclusion settings in price product

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v2.3.2
+* Добавлен учет настройки включения НДС в стоимость товара
+
 ## v2.3.1
 * Исправлены баги, связанные с передачей заказов при их оформлении
 

VERSION

@@ -1 +1 @@
-2.3.1
+2.3.2

retailcrm/retailcrm.php

@@ -441,6 +441,10 @@ class RetailCRM extends Module
                 'purchasePrice' => round($product['purchase_supplier_price'], 2)
             );
 
+            if (true == Configuration::get('PS_TAX')) {
+                $item['initialPrice'] = round($product['product_price_wt'], 2);
+            }
+
             if (isset($arProp)) {
                 $item['properties'] = $arProp;
             }

tests/bin/before_script.sh

@@ -9,7 +9,12 @@ PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
 cd $PRESTASHOP_DIR
 
 if [ -z $BRANCH ]; then
-    cp tests/parameters.yml.travis app/config/parameters.yml
+	if [ -f "tests/parameters.yml.travis" ]; then
+	    cp tests/parameters.yml.travis app/config/parameters.yml
+    else
+        cp tests-legacy/parameters.yml.travis app/config/parameters.yml
+    fi
+
     bash travis-scripts/install-prestashop
 else
     bash travis-scripts/install-prestashop.sh