258 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alex Lushpai	c057540b9d	Merge pull request #145 from iyzoer/master ... bug fix	2019-03-21 10:10:32 +03:00
Akolzin Dmitry	adf390c286	bug fix	2019-03-21 10:00:00 +03:00
Alex Lushpai	41ac83aeff	Merge pull request #143 from iyzoer/master ... History fix, orders history setting	2019-03-20 09:44:43 +03:00
Akolzin Dmitry	d58b66a01b	History fix, orders history setting	2019-03-19 16:43:54 +03:00
Alex Lushpai	08d071edda	Merge pull request #137 from KMityai/master ... retailcrm_special customer group fixed	2019-03-05 15:06:45 +03:00
dmitry	068c444c73	retailcrm_special customer group fixed	2019-03-05 14:24:27 +03:00
Alex Lushpai	03679ea62e	Merge pull request #135 from sergeygw1990/master ... v3.2.4	2019-03-01 16:25:53 +03:00
Sergey	9fedcb096c	fix model prices	2019-03-01 14:27:46 +03:00
Sergey	48ccded014	fix model prices	2019-03-01 11:07:16 +03:00
Sergey	8a823cf3ad	v3.2.4 Отправка нулевой цены при отсутсвтующей акционной цене	2019-02-28 16:48:41 +03:00
Sergey	6443e10330	v3.2.4 Добавлена возможность передачи фкционных цен нескольких групп пользователей	2019-02-28 16:48:41 +03:00
Alex Lushpai	24c6de76ec	Merge pull request #132 from sergeygw1990/master ... v3.2.2	2019-02-14 13:26:27 +03:00
Sergey	3521bb603e	v3.2.2	2019-02-13 17:34:30 +03:00
Alex Lushpai	f79ed21018	Merge pull request #130 from iyzoer/master ... Fixes #129 Fix catalog order controller	2019-01-25 15:36:20 +03:00
Akolzin Dmitry	615d9c7c17	Fixes #129 Fix catalog order controller	2019-01-25 09:52:12 +03:00
Alex Lushpai	db80810584	Merge pull request #127 from iyzoer/master ... v3.2.1	2019-01-18 10:25:35 +03:00
Akolzin Dmitry	c27383154b	Update .travis.yml	2019-01-18 09:53:27 +03:00
Akolzin Dmitry	ed5de5186e	v3.2.1	2019-01-18 09:52:21 +03:00
Alex Lushpai	ee36226b31	Merge pull request #126 from iyzoer/master ... v3.2.0	2018-12-25 10:06:03 +03:00
Akolzin Dmitry	dfd6c4a76d	Closes #123 v3.2.0	2018-12-25 09:54:03 +03:00
Alex Lushpai	d54e5e8c19	Merge pull request #122 from iyzoer/master ... v3.1.6	2018-12-05 17:21:45 +03:00
Akolzin Dmitry	0498e4d761	v3.1.6	2018-12-05 17:11:24 +03:00
Akolzin Dmitry	cfcac1e013	Добавил полчение события из БД для OC 3.0	2018-12-05 17:10:09 +03:00
Alex Lushpai	3e55de0e3a	Merge pull request #120 from iyzoer/master ... v3.1.5	2018-11-02 20:18:39 +03:00
Akolzin Dmitry	bceb2069ac	Bug fix	2018-11-02 09:29:46 +03:00
Alex Lushpai	5b700332b6	Merge pull request #119 from iyzoer/master ... v3.1.4	2018-11-01 15:34:50 +03:00
Akolzin Dmitry	9fb324188b	v3.1.4	2018-11-01 15:18:59 +03:00
Alex Lushpai	bca86cc51c	Merge pull request #118 from iyzoer/master ... 3.1.3	2018-10-25 12:03:30 +03:00
Akolzin Dmitry	0787d4a997	Update VERSION	2018-10-25 11:33:49 +03:00
Akolzin Dmitry	75aed59403	Update CHANGELOG.md	2018-10-25 11:33:35 +03:00
Akolzin Dmitry	273499acdc	Update generation clientId	2018-10-25 11:31:19 +03:00
Akolzin Dmitry	0854d36155	Send to crm marketplace activate/deactivate information	2018-10-25 11:31:19 +03:00
Alex Lushpai	30a2600b7b	Merge pull request #112 from sergeygw1990/master ... v3.1.2	2018-08-31 17:02:32 +03:00
Sergey	fe5a2abcba	v3.1.2	2018-08-31 14:14:01 +03:00
Alex Lushpai	4174195128	Merge pull request #108 from iyzoer/master ... v3.1.1	2018-08-03 12:12:59 +03:00
Akolzin Dmitry	57c2ca99c9	v3.1.1	2018-08-03 11:55:21 +03:00
Alex Lushpai	86064c775f	Merge pull request #107 from iyzoer/master ... Bug fixes	2018-08-01 09:37:44 +03:00
Akolzin Dmitry	8b8350a290	Bug fixes	2018-08-01 09:31:40 +03:00
Alex Lushpai	761bffef76	Merge pull request #106 from iyzoer/master ... v3.1.0	2018-07-31 17:28:01 +03:00
Akolzin Dmitry	6b1cdd5d42	Update test	2018-07-31 17:22:29 +03:00
Akolzin Dmitry	d08519f673	Исправлена ошибка при выгрузке заказа через админку, улучшена передача типа доставки, доработан дизайн страницы настроек, добавлена настройка передачи номера заказа	2018-07-31 17:17:36 +03:00
Alex Lushpai	caa6a03b14	Merge pull request #105 from klaos27/master ... Update retailcrm.php	2018-07-30 17:10:43 +03:00
Alex Lushpai	c3120a723d	Merge pull request #102 from klaos27/patch-1 ... Update retailcrm.tpl	2018-07-30 17:10:28 +03:00
klaos27	7b05d975a4	Update retailcrm.php	2018-07-30 15:03:29 +02:00
klaos27	93641e82ef	Update retailcrm.tpl	2018-07-30 14:43:46 +02:00
klaos27	5cd191b6a4	Update retailcrm.tpl	2018-07-26 15:14:59 +02:00
klaos27	a829cb8f17	Update retailcrm.tpl	2018-07-24 10:30:59 +02:00
Alex Lushpai	9eecfcffb8	Merge pull request #99 from iyzoer/master ... Bug fix twig template	2018-07-19 17:07:06 +03:00
Akolzin Dmitry	7151814da8	Update changelog	2018-07-19 17:05:10 +03:00
Akolzin Dmitry	6506dc716f	Fix bugs in twig template, fix saving settings with empty history. Fixes #93	2018-07-19 16:56:35 +03:00