Commit Graph

246 Commits

Author SHA1 Message Date
iyzoer
7d97895729 Merge branch 'master' into master 2017-05-23 13:06:10 +03:00
iyzoer
276024a5e5 fix htaccess 2017-05-23 13:04:49 +03:00
iyzoer
07a04ecfca fix offer externalId in admin model 2017-05-23 09:53:08 +03:00
iyzoer
5bc88cc118 Upload updates customers in CRM (#29) 2017-05-22 12:01:31 +03:00
iyzoer
ac98d0fc0e Merge branch 'master' of https://github.com/iyzoer/opencart-module
update master
2017-05-22 11:38:10 +03:00
iyzoer
06932a7540 .htaccess in system/cron 2017-05-22 11:35:50 +03:00
iyzoer
c43e901170 Merge branch 'master' into master 2017-05-18 18:43:08 +04:00
iyzoer
d860f6203c upload in CRM of the customer's address after registration, upload updates customers 2017-05-18 17:29:28 +03:00
iyzoer
80c96f4981 Update a customer's from history (#28) 2017-05-18 13:11:11 +03:00
iyzoer
95152eebd7 check of paid order 2017-05-18 11:38:40 +03:00
iyzoer
1ffbd61162 rename vars 2017-05-18 09:11:53 +03:00
iyzoer
47e205b988 updates customers from history 2017-05-17 17:48:50 +03:00
iyzoer
00f273ff3c Product properties in the order (#27) 2017-05-15 16:58:45 +03:00
iyzoer
3c2f9fe4e1 fix history 2017-05-15 15:41:52 +03:00
Dmitry Akolzin
93b4c0e9d7 properties in products order 2017-05-05 14:52:01 +03:00
Dmitry Akolzin
bb2896aefe fixed button text in template 2017-04-28 15:52:14 +03:00
Dmitry Akolzin
bcd319df05 back 2017-04-25 13:06:17 +03:00
Dmitry Akolzin
6a9b2a7e59 update: admin/controller/extension/module/retailcrm.php
update:      admin/view/template/extension/module/retailcrm.tpl
	update:      catalog/controller/api/retailcrm.php
	update:      system/cron/export.php
2017-04-12 15:04:24 +03:00
Dmitry Akolzin
d308996fed Merge branch 'master' of github.com:iyzoer/opencart-module
изменено:      admin/controller/extension/module/retailcrm.php
	изменено:      admin/language/en-gb/extension/module/retailcrm.php
	изменено:      admin/view/template/extension/module/retailcrm.tpl
	изменено:      catalog/model/extension/retailcrm/order.php
2017-04-12 11:30:56 +03:00
Dmitry Akolzin
6c6baaec71 Merge branch 'master' of github.com:retailcrm/opencart-module 2017-04-12 11:18:53 +03:00
Cybernick
82e6d62076 Fix catalog export (#26) 2017-04-10 14:58:26 +03:00
iyzoer
c724392c36 Advanced search for delivery methods (#25)
Plugin's deliveries
ICML export
Order export
2017-04-07 12:35:53 +03:00
Alex Lushpai
b84739162c Merge branch 'master' into master 2017-04-07 12:35:06 +03:00
Dmitry Akolzin
25158bc2c2 update: admin/controller/extension/module/retailcrm.php
update:      admin/view/template/extension/module/retailcrm.tpl
	update:      system/cron/export.php
2017-04-07 11:58:04 +03:00
Dmitry Akolzin
eb1d80304e add date in log: system/library/retailcrm/RetailcrmProxy.php 2017-04-06 16:54:52 +03:00
Dmitry Akolzin
707a3a1783 fix: admin/view/template/extension/module/retailcrm.tpl 2017-04-06 16:47:29 +03:00
Dmitry Akolzin
0c4d2a577e update: admin/controller/extension/module/retailcrm.php
update:      admin/language/en-gb/extension/module/retailcrm.php
	update:      admin/language/ru-ru/extension/module/retailcrm.php
	update:      admin/model/extension/retailcrm/order.php
	update:      admin/view/template/extension/module/retailcrm.tpl
2017-04-06 16:40:06 +03:00
Dmitry Akolzin
a84925fd19 update logs derictory: README.md
update logs derictory:      README.ru.md
	add coupon processing:      admin/model/extension/retailcrm/history.php
	add coupon processing:      catalog/controller/extension/module/retailcrm.php
	add coupon processing:      catalog/model/extension/retailcrm/order.php
2017-04-05 17:08:53 +03:00
Dmitry Akolzin
f92d6aaf54 update: admin/controller/extension/module/retailcrm.php 2017-04-04 16:56:39 +03:00
Dmitry Akolzin
c5f1194bca update: admin/controller/extension/module/retailcrm.php 2017-04-04 16:53:04 +03:00
Dmitry Akolzin
be14df7c7a update: admin/controller/extension/module/retailcrm.php
update:      admin/language/en-gb/extension/module/retailcrm.php
	update:      admin/language/ru-ru/extension/module/retailcrm.php
	update:      admin/model/extension/retailcrm/icml.php
	update:      admin/model/extension/retailcrm/order.php
	update:      admin/view/template/extension/module/retailcrm.tpl
2017-04-04 16:45:39 +03:00
Dmitry Akolzin
83fb02bf09 update installer 2017-03-27 17:07:54 +03:00
Dmitry Akolzin
fd3793b812 last edit 2017-03-27 16:48:39 +03:00
Dmitry Akolzin
617ee4491c изменено: admin/language/en-gb/extension/module/retailcrm.php
изменено:      admin/language/ru-ru/extension/module/retailcrm.php
2017-03-27 16:37:03 +03:00
Dmitry Akolzin
6605472329 изменено: admin/controller/extension/module/retailcrm.php
изменено:      admin/model/extension/retailcrm/references.php
	изменено:      admin/view/stylesheet/retailcrm.css
	изменено:      admin/view/template/extension/module/retailcrm.tpl
	новый файл:    catalog/controller/api/retailcrm.php
2017-03-27 16:09:27 +03:00
iyzoer
3be4ac76a9 Update to v2.3 (#22)
* restruct for 2.3
* new files for 2.3
2017-03-22 12:12:54 +03:00
Dmitry Akolzin
cbbf80bb44 docs 2017-03-22 12:06:44 +03:00
Dmitry Akolzin
3e70d2efad docs 2017-03-22 12:04:42 +03:00
Dmitry Akolzin
9d9218cf77 new files for 2.3 2017-03-22 11:52:11 +03:00
Dmitry Akolzin
e21486e7b2 restruct for 2.3 2017-03-22 11:51:48 +03:00
Alex Lushpai
10459281f7 Merge pull request #19 from VitalyArt/master
fix generatedAt
2016-12-29 15:47:33 +03:00
Vitaly Artemev
a9f257b058 fix generatedAt 2016-12-28 20:24:27 +04:00
Alex Lushpai
e429fb9915 Merge pull request #17 from VitalyArt/master
fix createdAt and email
2016-10-17 15:48:05 +04:00
VitalyArt
3dc8ae3245 fix createdAt and email 2016-10-14 18:13:16 +03:00
Alex Lushpai
b4c386b069 Merge pull request #15 from DmitryKorol/master
fixed bug in customer_create method
2016-09-07 15:30:05 +03:00
dkorol
43a8304aa9 fixed bug in customer_create method 2016-09-05 12:16:37 +03:00
Alex Lushpai
54e8807c2c v4, offers, customers 2016-08-31 17:28:11 +03:00
Alex Lushpai
74993334c5 Merge pull request #12 from DmitryKorol/version2
module for opencart v2.x
2016-08-02 14:36:24 +03:00
Alex Lushpai
fcfe1ea641 Merge pull request #11 from cyradin/master
fix order send fail when delivery code is an empty string
2016-08-02 14:34:54 +03:00
dkorol
82e3a4334b added opencart 2.2 compatibility 2016-08-02 14:20:56 +03:00