RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2025-04-03 21:33:38 +03:00
Code Issues Projects Releases Wiki Activity

Commit graph

  • 260cb713ad
         Merge branch 'v3.1' into v3.1.0-aplha Akolzin Dmitry 2018-09-27 17:03:29 +03:00
  • d21e917688 Change php version in travis from 7.0 to 7.2 Akolzin Dmitry 2018-09-27 16:46:04 +03:00
  • 6701bc03bb Tests Akolzin Dmitry 2018-09-27 16:46:04 +03:00
  • 3c37df0d9e Add composer.lock Akolzin Dmitry 2018-09-27 11:33:33 +03:00
  • 4885897f14 New library classes, refactoring for OC 3.1 Akolzin Dmitry 2018-09-27 11:32:33 +03:00
  • a3b10b6eda
         Merge pull request #114 from iyzoer/patch-2 Alex Lushpai 2018-09-12 11:32:26 +03:00
  • f8dc960026
         Update README.ru.md Akolzin Dmitry 2018-09-12 11:07:59 +03:00
  • 30a2600b7b
         Merge pull request #112 from sergeygw1990/master Alex Lushpai 2018-08-31 17:02:32 +03:00
  • fe5a2abcba v3.1.2 Sergey 2018-08-31 14:14:01 +03:00
  • a6abd523bb Add enitities for customers and orders Akolzin Dmitry 2018-08-29 17:45:35 +03:00
  • 4174195128
         Merge pull request #108 from iyzoer/master Alex Lushpai 2018-08-03 12:12:59 +03:00
  • 57c2ca99c9 v3.1.1 Akolzin Dmitry 2018-08-03 11:54:56 +03:00
  • 86064c775f
         Merge pull request #107 from iyzoer/master Alex Lushpai 2018-08-01 09:37:44 +03:00
  • 8b8350a290 Bug fixes Akolzin Dmitry 2018-08-01 09:31:40 +03:00
  • 761bffef76
         Merge pull request #106 from iyzoer/master Alex Lushpai 2018-07-31 17:28:01 +03:00
  • 6b1cdd5d42 Update test Akolzin Dmitry 2018-07-31 17:22:29 +03:00
  • d08519f673 Исправлена ошибка при выгрузке заказа через админку, улучшена передача типа доставки, доработан дизайн страницы настроек, добавлена настройка передачи номера заказа Akolzin Dmitry 2018-07-31 17:17:36 +03:00
  • caa6a03b14
         Merge pull request #105 from klaos27/master Alex Lushpai 2018-07-30 17:10:43 +03:00
  • c3120a723d
         Merge pull request #102 from klaos27/patch-1 Alex Lushpai 2018-07-30 17:10:28 +03:00
  • 7b05d975a4
         Update retailcrm.php klaos27 2018-07-30 15:03:29 +02:00
  • 93641e82ef
         Update retailcrm.tpl klaos27 2018-07-30 14:43:46 +02:00
  • 5cd191b6a4
         Update retailcrm.tpl klaos27 2018-07-26 15:14:59 +02:00
  • a829cb8f17
         Update retailcrm.tpl klaos27 2018-07-24 10:30:59 +02:00
  • 9eecfcffb8
         Merge pull request #99 from iyzoer/master Alex Lushpai 2018-07-19 17:07:06 +03:00
  • 7151814da8 Update changelog Akolzin Dmitry 2018-07-19 17:05:10 +03:00
  • 6506dc716f Fix bugs in twig template, fix saving settings with empty history. Fixes #93 Akolzin Dmitry 2018-07-19 16:53:08 +03:00
  • f684770861
         Update README.md Alex Lushpai 2018-06-18 14:06:57 +03:00
  • 4ba6f6ce83
         Update README.md Alex Lushpai 2018-06-18 14:05:15 +03:00
  • 1440c9fdbf
         Update README.ru.md Alex Lushpai 2018-06-14 13:02:34 +03:00
  • 0dcededd62
         Merge pull request #92 from iyzoer/master Alex Lushpai 2018-06-14 12:41:53 +03:00
  • 2c4306dad1 Bug fix Akolzin Dmitry 2018-06-14 11:26:15 +03:00
  • 26a6a0731c Makefile, edit travis.yml Akolzin Dmitry 2018-06-13 17:35:29 +03:00
  • a9c8a96101 Edit Robofile Akolzin Dmitry 2018-06-13 17:18:06 +03:00
  • f006561d3e Edit travis.yml Akolzin Dmitry 2018-06-13 16:26:07 +03:00
  • c49070ea6f Update readme Akolzin Dmitry 2018-06-13 16:19:33 +03:00
  • c454db172f Tests Akolzin Dmitry 2018-06-13 16:13:08 +03:00
  • ee912d7b02
         Update README.ru.md Alex Lushpai 2018-03-26 13:28:18 +03:00
  • e2856a4bf1
         Update README.md Alex Lushpai 2018-03-26 13:26:37 +03:00
  • 8763be0133
         Merge pull request #86 from iyzoer/v2.2 v2.4.1 Alex Lushpai 2018-03-23 13:21:07 +03:00
  • 65459af91b
         Merge pull request #85 from iyzoer/master v3.0.4 Alex Lushpai 2018-03-23 13:20:16 +03:00
  • 98b485cba0 Bonus points, fix customer group in history Akolzin Dmitry 2018-03-23 13:08:01 +03:00
  • 784677cc9c Edit changelog Akolzin Dmitry 2018-03-12 09:34:39 +03:00
  • b6d04fe04d Bonus points, fix customer group in history Akolzin Dmitry 2018-03-23 11:59:27 +03:00
  • 003a2e5797
         Merge pull request #79 from iyzoer/master Alex Lushpai 2018-03-13 15:08:53 +03:00
  • 97a75c1950 Fix customer password Akolzin Dmitry 2018-03-13 14:40:30 +03:00
  • 43656e4004
         Merge pull request #77 from iyzoer/v2.2 Alex Lushpai 2018-02-28 17:27:25 +03:00
  • 2d1e9f820c Fix session for api methods Akolzin Dmitry 2018-02-28 17:02:13 +03:00
  • ab06d10a81
         New model for history, api auth by key or pass (#75) Akolzin Dmitry 2018-02-26 13:23:36 +03:00
  • 1e71be6b7a
         Upload specials prices, new model for history handler (#74) Akolzin Dmitry 2018-02-26 13:22:13 +03:00
  • 9878a27ca4
         Update README.ru.md Akolzin Dmitry 2018-02-26 13:18:30 +03:00
  • 5f6e287541 Fix for opencart 3.0 Akolzin Dmitry 2018-02-26 13:15:10 +03:00
  • 4eab1fb269 New model for history, api auth by key or pass Akolzin Dmitry 2018-02-26 11:23:29 +03:00
  • f2fd22ecba New model for history handler, bug fix Akolzin Dmitry 2018-02-22 14:20:41 +03:00
  • a92c9c4260 Job for upload specials price to CRM Akolzin Dmitry 2018-02-20 16:50:36 +03:00
  • bf5a5b9e15
         Transferring order number, added library retailcrm, check events in db, transferring order status for missing order (#65) Akolzin Dmitry 2018-01-23 16:34:20 +03:00
  • 6390c66e4a Transferring order number, added library retailcrm, check events in db, transferring order status for missing order Akolzin Dmitry 2018-01-23 16:31:18 +03:00
  • 68f11d3197
         Update README.ru.md Alex Lushpai 2017-12-04 12:19:48 +03:00
  • 1bf6d6f41a
         Fix admin order model (#64) Akolzin Dmitry 2017-11-21 13:02:47 +03:00
  • bdf8e2a05a Fix admin order model Akolzin Dmitry 2017-11-21 12:54:47 +03:00
  • 9535f2de8e
         Bug fix, error logs in admin interface (#63) Akolzin Dmitry 2017-11-17 16:32:18 +03:00
  • d9087e1f5b Bug fix, error logs in admin interface Akolzin Dmitry 2017-11-17 16:27:53 +03:00
  • 6eecca5f93
         Status in orders upload (#62) Akolzin Dmitry 2017-11-10 17:23:12 +03:00
  • 51404a5533
         Status in orders upload (#61) Akolzin Dmitry 2017-11-10 17:22:42 +03:00
  • f9d2043854 Status in orders upload Akolzin Dmitry 2017-11-10 17:16:26 +03:00
  • 850905ad46 Status in orders upload Akolzin Dmitry 2017-11-10 17:13:35 +03:00
  • 680e1c28fe
         Bug fix (#59) Akolzin Dmitry 2017-10-30 16:49:49 +03:00
  • 76d64807fa Bug fix Akolzin Dmitry 2017-10-30 16:47:59 +03:00
  • dd3c32ea4c
         Coupon discount (#58) Akolzin Dmitry 2017-10-30 13:33:57 +03:00
  • b48b8f226d Coupon discount Akolzin Dmitry 2017-10-30 13:32:36 +03:00
  • afc2c9156c Minor fixes (#57) Akolzin Dmitry 2017-10-26 17:04:27 +03:00
  • 372ac3e1a9 add .gitignore Akolzin Dmitry 2017-10-26 16:58:54 +03:00
  • 093696ecd3 Merge branch 'master' of https://github.com/retailcrm/opencart-module Akolzin Dmitry 2017-10-26 16:57:27 +03:00
  • 3b00e8b37d Merge branch 'master' of https://github.com/iyzoer/opencart-module Akolzin Dmitry 2017-10-26 16:56:21 +03:00
  • a00b8c2064 edit changelog Akolzin Dmitry 2017-09-22 17:40:29 +03:00
  • f39cfae9ee Custom fields for v5, default payment and shipping methods for history upload Akolzin Dmitry 2017-09-21 10:09:26 +03:00
  • a710fe3372 fix history, new objects in object.xml Akolzin Dmitry 2017-09-15 15:47:38 +03:00
  • 023f7f7677 fix bug (#55) Sergey 2017-10-04 21:38:54 +03:00
  • 466d7e504f fix bug Sergey 2017-10-04 11:53:15 +03:00
  • ef86e4579e Merge pull request #51 from iyzoer/master Akolzin Dmitry 2017-09-25 10:00:47 +02:00
  • 68636d50f6 Merge pull request #50 from iyzoer/master Akolzin Dmitry 2017-09-22 16:53:41 +02:00
  • 1ae106d7ad Merge pull request #49 from iyzoer/v2.2 Akolzin Dmitry 2017-09-22 16:53:05 +02:00
  • 9ac3fe699b Merge branch 'v2.2' into v2.2 Akolzin Dmitry 2017-09-22 16:52:55 +02:00
  • 2ddc8b50d1 edit changelog Akolzin Dmitry 2017-09-22 17:40:29 +03:00
  • 1ebc6e04f6 edit changelog Akolzin Dmitry 2017-09-22 17:34:40 +03:00
  • db00b14872 fix getting shipping methods Akolzin Dmitry 2017-09-22 11:24:35 +03:00
  • 6875bc5f61 Custom fields for v5, default payment and shipping methods for history upload Akolzin Dmitry 2017-09-21 10:09:26 +03:00
  • c526a07ea1 Merge pull request #48 from iyzoer/master Akolzin Dmitry 2017-09-15 15:49:21 +03:00
  • cdc1c9cf6b fix history, new objects in object.xml Akolzin Dmitry 2017-09-15 15:47:38 +03:00
  • 0e32063eb6 Merge pull request #47 from iyzoer/master Akolzin Dmitry 2017-09-06 13:14:34 +03:00
  • 45fde808b7 fix for opencart version > 3.0 Akolzin Dmitry 2017-09-06 13:08:39 +03:00
  • 55c458dcac Merge pull request #46 from iyzoer/master Akolzin Dmitry 2017-09-01 16:24:05 +02:00
  • e69c4c11d9 added custom folder for catalog model iyzoer 2017-09-01 17:19:38 +03:00
  • 73ea249145 Merge pull request #45 from iyzoer/master Akolzin Dmitry 2017-08-29 16:19:08 +02:00
  • 3841072727 Bug fixes iyzoer 2017-08-29 17:18:04 +03:00
  • 14049caf67 Merge pull request #44 from iyzoer/master Akolzin Dmitry 2017-08-29 09:20:40 +02:00
  • 9f74543988 add load model iyzoer 2017-08-29 10:19:34 +03:00
  • 3d3cbd715b Merge branch 'master' of https://github.com/iyzoer/opencart-module iyzoer 2017-08-29 09:53:19 +03:00
  • 0185de6dc3 fix param method in customFieldsEdit iyzoer 2017-08-29 09:49:43 +03:00
  • 05a47a90b5 Fix validate form on saved settings (#43) v2.4.0 Akolzin Dmitry 2017-08-18 14:44:01 +02:00
  • 626d3a1763 Merge branch 'master' into master Akolzin Dmitry 2017-08-18 14:42:47 +02:00