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

236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Lushpai
17140b16c5
Merge pull request #136 from sergeygw1990/v3.1 
v3.1.3
 2019-03-01 16:23:40 +03:00
Sergey
1ec5e14ddf fix model prices 2019-03-01 14:33:52 +03:00
Sergey
5e85d9a958 Added zeroing promotion price from OpenCart and adjustment of price types for different user groups 2019-03-01 10:52:49 +03:00
Alex Lushpai
dbb353be03
Merge pull request #115 from iyzoer/v3.1.0-aplha 
V3.1.0 aplha
 2018-09-28 17:51:00 +03:00
Akolzin Dmitry
260cb713ad
Merge branch 'v3.1' into v3.1.0-aplha 2018-09-27 17:03:29 +03:00
Akolzin Dmitry
d21e917688 Change php version in travis from 7.0 to 7.2 2018-09-27 16:52:52 +03:00
Akolzin Dmitry
6701bc03bb Tests 2018-09-27 16:46:04 +03:00
Akolzin Dmitry
3c37df0d9e Add composer.lock 2018-09-27 11:33:33 +03:00
Akolzin Dmitry
4885897f14 New library classes, refactoring for OC 3.1 2018-09-27 11:32:33 +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
Akolzin Dmitry
a6abd523bb Add enitities for customers and orders 2018-08-29 17:45:35 +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
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