RetailCRM-Mirror/magento-module
1
0
Fork 0
mirror of synced 2024-11-24 14:06:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Alex Lushpai 2019-10-17 13:35:30 +03:00 committed by GitHub
commit 43c3e5be80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -15,14 +15,12 @@ env:
matrix: matrix:
include: include:
- php: 7.0
env: BRANCH=2.2-develop
- php: 7.1 - php: 7.1
env: BRANCH=2.2-develop env: BRANCH=2.2.8
- php: 7.1
env: BRANCH=2.3-develop
- php: 7.2 - php: 7.2
env: BRANCH=2.3-develop env: BRANCH=2.2.8
- php: 7.3
env: BRANCH=2.2.8
before_script: before_script:
- bash bin/install.sh - bash bin/install.sh
@ -37,4 +35,4 @@ deploy:
on: on:
php: 7.2 php: 7.2
branch: master branch: master
condition: "$DEPLOY = true" condition: "$DEPLOY = true"

4
CHACNGELOG.md
View File

@ -1,5 +1,5 @@
## 2019-10-26 v.2.4.2 ## 2018-12-25 v.2.5.0
* Поддержка функции добавления одинакового товара в заказ как разные товарные позиции из CRM * Поддержка передачи в заказе нескольких позиций одного товара
## 2018-12-25 v.2.4.1 ## 2018-12-25 v.2.4.1
* Удалена генерация externalId покупателя при заказе от незарегестрированного пользователя * Удалена генерация externalId покупателя при заказе от незарегестрированного пользователя

2
VERSION
View File

@ -1 +1 @@
2.4.2 2.5.0