From 30d7b1fac410a10f9be9a5baaf213656e6b124c5 Mon Sep 17 00:00:00 2001
From: gorokh <gorokh@retailcrm.ru>
Date: Mon, 15 Jul 2019 15:48:20 +0300
Subject: [PATCH 1/2] added use VAT inclusion settings in price product

---
 CHANGELOG.md            | 3 +++
 VERSION                 | 2 +-
 retailcrm/retailcrm.php | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 927e530..dff1ac9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v2.3.2
+* Добавлен учет настройки включения НДС в стоимость товара
+
 ## v2.3.1
 * Исправлены баги, связанные с передачей заказов при их оформлении
 
diff --git a/VERSION b/VERSION
index a625450..f90b1af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.1
\ No newline at end of file
+2.3.2
diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php
index 7f47dc2..a2106fb 100644
--- a/retailcrm/retailcrm.php
+++ b/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;
             }

From 9100c25ce2454792d088034d4be9369c09fccc42 Mon Sep 17 00:00:00 2001
From: gorokh <gorokh@retailcrm.ru>
Date: Thu, 18 Jul 2019 12:13:32 +0300
Subject: [PATCH 2/2] fix travis

---
 tests/bin/before_script.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/bin/before_script.sh b/tests/bin/before_script.sh
index 3fe6e86..0c5dacd 100644
--- a/tests/bin/before_script.sh
+++ b/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