1
0
mirror of synced 2024-11-25 14:36:08 +03:00
Commit Graph

77 Commits

Author SHA1 Message Date
Alex Lushpai
cd1061dfd1 update php version for travis 2019-10-17 14:23:19 +03:00
Alex Lushpai
033817af84 fix version & travis config 2019-10-17 13:40:32 +03:00
Alex Lushpai
4e9c9c087e
Merge pull request #26 from Evgeniy-Goroh/master
Поддержка функции добавления одинакового товара в заказ как разные позиции
2019-10-17 13:36:05 +03:00
Alex Lushpai
43c3e5be80
Merge branch 'master' into master 2019-10-17 13:35:30 +03:00
Alex Lushpai
227b0eb827
Update .travis.yml 2019-10-17 13:15:24 +03:00
Alex Lushpai
56deb86d1c
Update VERSION 2019-10-17 13:11:00 +03:00
Alex Lushpai
2756b8e797
Update CHACNGELOG.md 2019-10-17 13:10:42 +03:00
Alex Lushpai
99ff83c83c
Update .travis.yml 2019-10-17 13:09:47 +03:00
gorokh
fc1e208b08 fix price 2019-10-01 14:40:42 +03:00
gorokh
06ddf9a807 Поддержка функции добавления одинакового товара в заказ как разные товарные позиции из CRM 2019-09-26 16:39:02 +03:00
Alex Lushpai
23602a7b71
Merge pull request #25 from iyzoer/master
Delete duplicate injection
2019-05-07 11:50:59 +03:00
Akolzin Dmitry
7b3b49e563 Fix test 2019-03-21 10:37:20 +03:00
Akolzin Dmitry
2ed36df9f1 Delete duplicate injection 2019-03-21 10:10:55 +03:00
Alex Lushpai
6e9629efef
Merge pull request #22 from sergeygw1990/master
v2.4.1
2019-02-14 13:23:14 +03:00
Sergey
3b97a7f06c v2.4.1 2019-02-12 15:35:53 +03:00
Alex Lushpai
fd2524b207
Merge pull request #21 from iyzoer/master
Fixes for marketplace
2019-01-24 16:11:07 +03:00
Akolzin Dmitry
ccb1a6e77d Fixes for marketplace 2019-01-24 16:01:09 +03:00
Alex Lushpai
86124b1978
Merge pull request #20 from sergeygw1990/master
v2.4.0
2019-01-24 14:33:56 +03:00
Sergey
950f00ac5c fix version change in composer.json 2019-01-24 13:40:33 +03:00
Sergey
6f47b16cbd fix Add constant inventories in src/Helper/Data.php 2019-01-24 12:34:09 +03:00
Sergey
a6d80bf154 v2.4.0 2019-01-24 11:39:40 +03:00
Alex Lushpai
b15f8ec5a8
Merge pull request #19 from iyzoer/master
Изменена логика передачи данных по заказам и клиентам
2019-01-23 13:46:36 +03:00
Akolzin Dmitry
2c8a87c582 Добавлены настройки Daemon Collector 2019-01-22 10:00:52 +03:00
Akolzin Dmitry
f4eca5a7b0 Изменена логика передачи данных по заказам и клиентам 2019-01-18 11:46:10 +03:00
Alex Lushpai
6dd54014ae
Merge pull request #18 from iyzoer/master
Выгрузка габаритов и веса в ICML
2019-01-16 10:36:27 +03:00
Akolzin Dmitry
6e66eb3aea Выгрузка габаритов и веса в ICML 2019-01-15 14:13:20 +03:00
Alex Lushpai
23bfe5c6fb
Merge pull request #17 from iyzoer/master
v2.3.2
2018-12-25 15:34:06 +03:00
Akolzin Dmitry
09090fdd5f v2.3.2 2018-12-25 15:07:54 +03:00
Alex Lushpai
5b6a9762d8
Merge pull request #16 from iyzoer/master
v2.3.1
2018-10-25 13:09:48 +03:00
Akolzin Dmitry
5ecedd12f0 Unit test update 2018-10-25 12:55:32 +03:00
Akolzin Dmitry
ef12474dfc Update changelog 2018-10-25 12:38:17 +03:00
Akolzin Dmitry
15da35916a Добавлена возможность создания нескольких модулей в маркетплейсе 2018-10-25 12:35:40 +03:00
Akolzin Dmitry
f47af54f1a Send to CRM activate/deactivate information in marketplace 2018-10-25 12:35:40 +03:00
Alex Lushpai
520ad44dce
Merge pull request #14 from iyzoer/master
Update version in composer.json
2018-08-31 12:54:14 +03:00
Akolzin Dmitry
c052dc2437 Update version in composer.json 2018-08-31 12:23:47 +03:00
Alex Lushpai
0ed0795be4
Merge pull request #13 from iyzoer/master
v2.3.0
2018-08-21 11:16:07 +03:00
Akolzin Dmitry
e93d2e2018 Update README, update tests 2018-08-21 10:47:31 +03:00
Akolzin Dmitry
cc995b83f5 v2.3.0 2018-08-21 10:19:08 +03:00
Alex Lushpai
9ef3f038c2
Update README.md 2018-06-18 14:02:20 +03:00
Alex Lushpai
2dd34395a3
Update VERSION 2018-06-14 13:19:00 +03:00
Alex Lushpai
9d402797fa
Update README.ru.md 2018-06-14 12:56:00 +03:00
Alex Lushpai
9ef2baf81d
Merge pull request #11 from iyzoer/master
Multisite, tests
2018-06-14 12:42:34 +03:00
Akolzin Dmitry
4cb74ededa
Update Makefile 2018-06-14 12:11:29 +03:00
Akolzin Dmitry
4c23faf1f4 Added script.sh, updated travis config 2018-05-15 16:44:45 +03:00
Akolzin Dmitry
7e7556fef3 Multisite, tests, travis 2018-05-15 15:54:55 +03:00
Akolzin Dmitry
6b83c72f93 Update system.xml 2018-05-11 10:04:51 +03:00
Akolzin Dmitry
364b12e6d4 Update travis.yml 2018-05-04 17:42:17 +03:00
Akolzin Dmitry
2d96fcc531 Update database name in install.sh 2018-05-04 17:14:06 +03:00
Akolzin Dmitry
5c8fa3ee01 Update magento install 2018-05-04 17:07:37 +03:00
Akolzin Dmitry
ad4b469548 Delete pass from install.sh 2018-05-04 17:03:31 +03:00