RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-02 19:33:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46 from Evgeniy-Goroh/master

Browse Source 
added use VAT inclusion settings in price product
This commit is contained in:
Alex Lushpai 2019-07-18 12:59:34 +03:00 committed by GitHub
commit 4db4703141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.3.1 2.3.2

4
retailcrm/retailcrm.php
View File

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

7
tests/bin/before_script.sh
View File

@ -9,7 +9,12 @@ PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
cd $PRESTASHOP_DIR cd $PRESTASHOP_DIR
if [ -z $BRANCH ]; then 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 bash travis-scripts/install-prestashop
else else
bash travis-scripts/install-prestashop.sh bash travis-scripts/install-prestashop.sh