RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-22 05:06:07 +03:00
Code Issues Projects Releases Wiki Activity
368 Commits 4 Branches 52 Tags 1.7 MiB
bb23c4cc40
Commit Graph

368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Lushpai
4ba6f6ce83
Update README.md 2018-06-18 14:05:15 +03:00
Alex Lushpai
1440c9fdbf
Update README.ru.md 2018-06-14 13:02:34 +03:00
Alex Lushpai
0dcededd62
Merge pull request #92 from iyzoer/master 
Travis tests
 2018-06-14 12:41:53 +03:00
Akolzin Dmitry
2c4306dad1 Bug fix 2018-06-14 11:26:15 +03:00
Akolzin Dmitry
26a6a0731c Makefile, edit travis.yml 2018-06-13 17:35:29 +03:00
Akolzin Dmitry
a9c8a96101 Edit Robofile 2018-06-13 17:18:06 +03:00
Akolzin Dmitry
f006561d3e Edit travis.yml 2018-06-13 16:26:07 +03:00
Akolzin Dmitry
c49070ea6f Update readme 2018-06-13 16:19:33 +03:00
Akolzin Dmitry
c454db172f Tests 2018-06-13 16:14:44 +03:00
Alex Lushpai
65459af91b
Merge pull request #85 from iyzoer/master 
Bonus points, fix customer group in history
 2018-03-23 13:20:16 +03:00
Akolzin Dmitry
b6d04fe04d Bonus points, fix customer group in history 2018-03-23 11:59:47 +03:00
Alex Lushpai
003a2e5797
Merge pull request #79 from iyzoer/master 2018-03-13 15:08:53 +03:00
Akolzin Dmitry
97a75c1950 Fix customer password 2018-03-13 14:47:04 +03:00
Akolzin Dmitry
1e71be6b7a
Upload specials prices, new model for history handler (#74) 2018-02-26 13:22:13 +03:00
Akolzin Dmitry
bf5a5b9e15
Transferring order number, added library retailcrm, check events in db, transferring order status for missing order (#65) 2018-01-23 16:34:20 +03:00
Alex Lushpai
68f11d3197
Update README.ru.md 2017-12-04 12:19:48 +03:00
Akolzin Dmitry
9535f2de8e
Bug fix, error logs in admin interface (#63) 2017-11-17 16:32:18 +03:00
Akolzin Dmitry
51404a5533
Status in orders upload (#61) 2017-11-10 17:22:42 +03:00
Akolzin Dmitry
680e1c28fe
Bug fix (#59) 2017-10-30 16:49:49 +03:00
Akolzin Dmitry
afc2c9156c Minor fixes (#57) 
* fix history, new objects in object.xml

* Custom fields for v5, default payment and shipping methods for history upload

* edit changelog

* add .gitignore
 2017-10-26 17:04:27 +03:00
Akolzin Dmitry
ef86e4579e Merge pull request #51 from iyzoer/master 
edit changelog
 2017-09-25 10:00:47 +02:00
Akolzin Dmitry
68636d50f6 Merge pull request #50 from iyzoer/master 
Custom fields for v5, default payment and shipping methods for histor…
 2017-09-22 16:53:41 +02:00
Akolzin Dmitry
2ddc8b50d1 edit changelog 2017-09-22 17:40:29 +03:00
Akolzin Dmitry
6875bc5f61 Custom fields for v5, default payment and shipping methods for history upload 2017-09-21 10:09:26 +03:00
Akolzin Dmitry
c526a07ea1 Merge pull request #48 from iyzoer/master 
Fix history, new objects in object.xml
 2017-09-15 15:49:21 +03:00
Akolzin Dmitry
cdc1c9cf6b fix history, new objects in object.xml 2017-09-15 15:47:38 +03:00
Akolzin Dmitry
0e32063eb6 Merge pull request #47 from iyzoer/master 
Fix for opencart version > 3.0
 2017-09-06 13:14:34 +03:00
Akolzin Dmitry
45fde808b7 fix for opencart version > 3.0 2017-09-06 13:08:39 +03:00
Akolzin Dmitry
55c458dcac Merge pull request #46 from iyzoer/master 
Custom folder for catalog model
 2017-09-01 16:24:05 +02:00
iyzoer
e69c4c11d9 added custom folder for catalog model 2017-09-01 17:19:38 +03:00
Akolzin Dmitry
73ea249145 Merge pull request #45 from iyzoer/master 
Bug fixes
 2017-08-29 16:19:08 +02:00
iyzoer
3841072727 Bug fixes 2017-08-29 17:18:04 +03:00
Akolzin Dmitry
14049caf67 Merge pull request #44 from iyzoer/master 
Fix param method in customFieldsEdit
 2017-08-29 09:20:40 +02:00
iyzoer
9f74543988 add load model 2017-08-29 10:19:34 +03:00
iyzoer
3d3cbd715b Merge branch 'master' of https://github.com/iyzoer/opencart-module 
merge
 2017-08-29 09:53:19 +03:00
iyzoer
0185de6dc3 fix param method in customFieldsEdit 2017-08-29 09:49:43 +03:00
Akolzin Dmitry
05a47a90b5 Fix validate form on saved settings (#43) 2017-08-18 15:44:01 +03:00
Akolzin Dmitry
626d3a1763 Merge branch 'master' into master 2017-08-18 14:42:47 +02:00
iyzoer
2b2dbc4a48 fix call API method in admin controller 2017-08-18 15:40:37 +03:00
iyzoer
9245f35b83 fix validate form 2017-08-18 14:39:18 +03:00