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

merge fixes

Browse Source
This commit is contained in:
Alex Lushpai 2014-08-20 00:20:37 +04:00
commit f2bb313c16
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,6 +9,8 @@ Module allows:
* Configure relations between dictionaries of IntaroCRM and Opencart (statuses, payments, delivery types and etc) * Configure relations between dictionaries of IntaroCRM and Opencart (statuses, payments, delivery types and etc)
* Generate [ICML](http://docs.intarocrm.ru/index.php?n=Пользователи.ФорматICML) (IntaroCRM Markup Language) for catalog loading by IntaroCRM * Generate [ICML](http://docs.intarocrm.ru/index.php?n=Пользователи.ФорматICML) (IntaroCRM Markup Language) for catalog loading by IntaroCRM
#### Documentation
* [Install](doc/Install.md) * [Install](doc/Install.md)
* [Changelog](doc/Changelog.md) * [Changelog](doc/Changelog.md)
* [TODO](doc/TODO.md) * [TODO](doc/TODO.md)

1
doc/Install.md
View File

@ -70,5 +70,6 @@ protected function crmOrderAction($order, $order_id, $action=null)
Setup cron job for exchange between CRM & your shop Setup cron job for exchange between CRM & your shop
``` ```
<<<<<<< HEAD
*/5 * * * * /usr/bin/php /path/to/opencart/cli/cli_export.php >> /path/to/opencart/system/logs/cronjob_history.log 2>&1 */5 * * * * /usr/bin/php /path/to/opencart/cli/cli_export.php >> /path/to/opencart/system/logs/cronjob_history.log 2>&1
``` ```