322 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Akolzin Dmitry	9496591e8b	update travis config	2020-03-03 17:52:13 +03:00
Akolzin Dmitry	24ea74e21c	update Makefile	2020-03-03 17:50:26 +03:00
Alex Lushpai	d58e11119f	Merge pull request #52 from Neur0toxine/master ... bump version v2.5.0	2019-10-29 11:15:03 +03:00
Pavel	665840fac7	bump version	2019-10-29 10:56:59 +03:00
Alex Lushpai	f6f8d1302b	Merge pull request #51 from Neur0toxine/master ... [feature] send abandoned carts to retailCRM as orders	2019-10-29 10:54:39 +03:00
Pavel	4407d2e55c	ignore minified assets for now	2019-10-29 10:53:48 +03:00
Pavel	42e03ece81	bump version	2019-10-29 10:36:24 +03:00
Pavel	1edd12bc80	abandoned carts upload timeout & JobManager rework	2019-10-29 09:42:34 +03:00
Pavel	a4473d488d	JobManager fix	2019-10-25 10:49:42 +03:00
Pavel	1e20ca316a	run job every hour instead of 10 seconds	2019-10-25 10:09:48 +03:00
Pavel	ec34a62f9f	[feature] send abandoned carts to retailCRM as orders	2019-10-24 16:01:19 +03:00
Alex Lushpai	5ca68822e7	Update .travis.yml	2019-10-17 13:53:47 +03:00
Alex Lushpai	1d3a2e34d9	Merge pull request #50 from Evgeniy-Goroh/master ... Поддержка передачи одинаковых товаров в заказе как разных товарных по… v2.4.0	2019-10-17 12:50:36 +03:00
gorokh	ecfb5f192e	fix	2019-10-14 10:20:16 +03:00
gorokh	fd3914caf9	fix dublicate items	2019-10-03 17:57:07 +03:00
gorokh	660904b885	Поддержка передачи одинаковых товаров в заказе как разных товарных позиций	2019-09-06 13:07:37 +03:00
Alex Lushpai	63e92785cf	Update VERSION v2.3.3	2019-08-23 11:05:52 +03:00
Alex Lushpai	443ce09dd8	Merge pull request #49 from Frosin/master ... fixed offer's article, prices display in catalog	2019-08-23 11:05:38 +03:00
Alex Lushpai	5f64051fe6	Merge pull request #48 from KMityai/master ... fixed updating order	2019-08-23 11:05:24 +03:00
Frosin	d56065a1af	fixed offer'ss article, prices display in catalog	2019-08-21 15:02:23 +03:00
Круглов Дмитрий	db8c0dde17	fixed updating order	2019-07-31 16:48:44 +03:00
Alex Lushpai	ac711b3de3	Merge pull request #47 from iyzoer/master ... Fix tests v2.3.2	2019-07-18 15:06:40 +03:00
Akolzin Dmitry	9174aa121c	Update .travis.yml	2019-07-18 14:43:23 +03:00
Akolzin Dmitry	2011847b92	Apache settings	2019-07-18 14:31:35 +03:00
Akolzin Dmitry	e5c329e898	Fix travis tests	2019-07-18 14:18:10 +03:00
Alex Lushpai	4db4703141	Merge pull request #46 from Evgeniy-Goroh/master ... added use VAT inclusion settings in price product	2019-07-18 12:59:34 +03:00
Alex Lushpai	d2b3299329	Merge pull request #45 from Frosin/master ... fixed incorrect response processing bug in RetailcrmHistory	2019-07-18 12:59:13 +03:00
gorokh	9100c25ce2	fix travis	2019-07-18 12:13:32 +03:00
gorokh	30d7b1fac4	added use VAT inclusion settings in price product	2019-07-15 15:48:20 +03:00
Frosin	9ff3f10866	fixed incorrect response processing bug in RetailcrmHistory	2019-07-04 09:43:59 +03:00
Alex Lushpai	1400687814	Merge pull request #43 from Neur0toxine/master ... Fixed several errors in order generation v2.3.1	2019-07-01 11:40:06 +03:00
Pavel	ef4a4a15a9	Fixed several errors in order generation	2019-06-18 16:42:16 +03:00
Alex Lushpai	3dcc75cb36	Merge pull request #42 from Neur0toxine/master ... v2.3.0 v2.3.0	2019-05-30 14:38:29 +03:00
Pavel	416f9f2329	[feature] Manual orders upload	2019-05-28 15:50:39 +03:00
Alex Lushpai	ab81ffe279	Merge pull request #41 from sergeygw1990/master ... v2.2.11 v2.2.11	2019-02-13 17:31:49 +03:00
Sergey	0cea41e48f	v2.2.11	2019-02-13 10:17:49 +03:00
Alex Lushpai	72edb2767a	Merge pull request #40 from sergeygw1990/master ... v2.2.10 v2.2.10	2019-01-25 15:37:03 +03:00
Sergey	2485e0ec49	правка CHANGELOG	2019-01-25 09:54:58 +03:00
Sergey	8d4ae3bb8f	Исправление передачи цены доставки	2019-01-24 18:18:39 +03:00
Alex Lushpai	dea4a2a51b	Merge pull request #39 from iyzoer/master ... v2.2.9 v2.2.9	2019-01-23 13:41:15 +03:00
Akolzin Dmitry	7a44a96163	Merge branch 'master' of github.com:iyzoer/prestashop-module	2019-01-22 10:18:48 +03:00
Akolzin Dmitry	3050ba7978	Добавлены переводы	2019-01-22 10:12:42 +03:00
Akolzin Dmitry	8e88456b44	Добавлен Daemon Collector	2019-01-22 10:05:39 +03:00
Sergey	a1fc009db6	v2.2.5	2019-01-22 10:04:44 +03:00
Sergey	54d4091f63	v2.2.5	2019-01-22 10:04:44 +03:00
Sergey	b92579e515	v2.2.9	2019-01-21 16:50:46 +03:00
Sergey	b64bb2599c	v2.2.9	2019-01-21 14:42:19 +03:00
Akolzin Dmitry	e13ddff1b5	Добавлен Daemon Collector	2019-01-18 17:04:32 +03:00
Sergey	f520e7b181	v2.2.9	2019-01-18 16:24:10 +03:00
Sergey	058f007b36	v2.2.9	2019-01-18 15:56:22 +03:00