RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-25 14:46:06 +03:00
Code Issues Projects Releases Wiki Activity
317 Commits 4 Branches 52 Tags 1.7 MiB
5d6fd908f2
Commit Graph

317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iyzoer
1190fec934 Merge branch 'master' of https://github.com/iyzoer/opencart-module 
merge
 2017-08-16 15:05:35 +03:00
iyzoer
0797b9b7f1 fix check api version 2017-08-16 15:04:57 +03:00
Akolzin Dmitry
1052781689 Merge pull request #39 from iyzoer/master 
Multi module
 2017-07-28 09:45:21 +02:00
Akolzin Dmitry
fec2c3495c Merge branch 'master' into master 2017-07-28 09:45:06 +02:00
iyzoer
4890619c9a delete api client library 2017-07-28 10:34:38 +03:00
iyzoer
cbbfc67cd8 fixes for API v5 2017-07-27 14:41:58 +03:00
iyzoer
5b7b2c3c36 fix for api v3-v5 2017-07-21 10:27:08 +03:00
iyzoer
71537c7482 compatibility with opencart versions 2.3-3.0 and RetailCRM API v3, v4, v5 2017-07-11 17:39:48 +03:00
Akolzin Dmitry
9949e0fcea Check coupon (#37) 2017-06-26 15:35:14 +03:00
Akolzin Dmitry
0aff088a69 Merge branch 'master' into master 2017-06-26 11:35:24 +02:00
iyzoer
12cc1c620a Check the existence of the coupon 2017-06-26 12:21:11 +03:00
iyzoer
dca2b67a5b fix country and region in delivery address on update order 2017-06-05 12:49:29 +03:00
iyzoer
84b851d79b fix icml and daemon collector (#33) 2017-06-02 23:36:34 +03:00
iyzoer
b1f0835b9c fix icml 2017-06-02 15:49:43 +03:00
iyzoer
647d5e8427 fix icml 2017-06-02 15:33:05 +03:00
iyzoer
1484071122 quantity for offers in icml 2017-06-02 15:21:46 +03:00
iyzoer
9146ebd2f6 fix items property 2017-06-02 15:04:22 +03:00
iyzoer
19ceeae2b0 Daemon Collector settings interface, update contoller Daemon Collector 2017-05-31 13:08:07 +03:00
iyzoer
a1cd3aa6b7 Merge branch 'master' of https://github.com/iyzoer/opencart-module 2017-05-29 15:52:17 +03:00
iyzoer
c51e4a35a4 Changed user interface, implemented Daemon Collector 2017-05-29 15:48:56 +03:00
iyzoer
d75366274a Fix externalId (#30) 2017-05-24 17:21:52 +03:00
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