From ae16e5b0f086c9a19a44df9aaaa0a9ebc042d7ff Mon Sep 17 00:00:00 2001 From: Akolzin Dmitry Date: Tue, 15 Dec 2020 12:39:38 +0300 Subject: [PATCH] Rebranding (#164) --- CHANGELOG.md | 13 ++++++++----- README.md | 8 ++++---- .../classes/general/ApiClient_v4.php | 14 ++++---------- .../classes/general/ApiClient_v5.php | 14 ++++---------- .../classes/general/Http/Client.php | 14 ++++---------- intaro.retailcrm/classes/general/Logger.php | 4 ---- .../classes/general/Response/ApiResponse.php | 18 ++++++------------ .../classes/general/RestNormalizer.php | 10 +--------- .../general/RetailcrmConfigProvider.php | 16 +++++----------- .../classes/general/RetailcrmConstants.php | 14 ++++---------- .../general/RetailcrmDependencyLoader.php | 14 ++++---------- .../classes/general/ua/RetailCrmUa.php | 4 ++-- intaro.retailcrm/description.ru | 6 +----- .../install/export/retailcrm_run.php | 2 +- .../install/export/retailcrm_setup.php | 2 +- intaro.retailcrm/install/step2.php | 2 +- intaro.retailcrm/install/version.php | 4 ++-- .../general/history/RetailCrmHistory_v4.php | 2 +- .../general/history/RetailCrmHistory_v5.php | 2 +- intaro.retailcrm/lang/en/icml_export_setup.php | 2 +- intaro.retailcrm/lang/en/install/index.php | 6 +++--- intaro.retailcrm/lang/en/install/step1.php | 8 ++++---- intaro.retailcrm/lang/en/install/step11.php | 4 ++-- intaro.retailcrm/lang/en/install/step2.php | 6 +++--- intaro.retailcrm/lang/en/install/step3.php | 4 ++-- intaro.retailcrm/lang/en/install/step4.php | 2 +- intaro.retailcrm/lang/en/install/step5.php | 4 ++-- intaro.retailcrm/lang/en/install/step6.php | 6 +++--- intaro.retailcrm/lang/en/options.php | 10 +++++----- .../general/history/RetailCrmHistory_v4.php | 2 +- .../general/history/RetailCrmHistory_v5.php | 2 +- intaro.retailcrm/lang/ru/icml_export_setup.php | 2 +- intaro.retailcrm/lang/ru/install/index.php | 8 ++++---- intaro.retailcrm/lang/ru/install/step1.php | 12 ++++++------ intaro.retailcrm/lang/ru/install/step11.php | 8 ++++---- intaro.retailcrm/lang/ru/install/step2.php | 6 +++--- intaro.retailcrm/lang/ru/install/step3.php | 4 ++-- intaro.retailcrm/lang/ru/install/step4.php | 2 +- intaro.retailcrm/lang/ru/install/step5.php | 4 ++-- intaro.retailcrm/lang/ru/install/step6.php | 8 ++++---- intaro.retailcrm/lang/ru/options.php | 10 +++++----- 41 files changed, 114 insertions(+), 169 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37444bdc..0aa036f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2020-12-15 v.5.6.1 +* Обновлено наименование бренда + ## 2020-11-24 v.5.6.0 * Добавлена возможность активации онлайн-консультанта * Обновлен список стран @@ -13,7 +16,7 @@ * Исправлена неверная кодировка в настройках модуля ## 2020-09-28 v.5.5.1 -* Исправлена ошибка переноса полей в retailCRM для заказов с интеграционными доставками +* Исправлена ошибка переноса полей в RetailCRM для заказов с интеграционными доставками ## 2020-09-08 v.5.5.0 * Добавлена возможность ручной выгрузки заказов в CRM @@ -29,7 +32,7 @@ ## 2020-08-25 v.5.4.3 * Исправлена ошибка с некорректным ID товара при редактировании заказа -* Исправлены опечатки в API-клиенте retailCRM +* Исправлены опечатки в API-клиенте RetailCRM * Добавлена фильтрация изменений истории по текущему API-ключу ## 2020-07-24 v.5.4.2 @@ -118,7 +121,7 @@ * Добавлено подключение файла RCrmActions.php при удалении модуля ## 2018-10-25 v.2.3.13 -* Добавлен функционал для активации модуля в маркетплейсе retailCRM +* Добавлен функционал для активации модуля в маркетплейсе RetailCRM * Исправлен баг при генерации каталога с подстановкой схемы ## 2018-10-17 v.2.3.12 @@ -161,7 +164,7 @@ ## 2018-03-22 v.2.3.5 * В настройку экспорта добавлена настройка свойств типа "справочник"(highloadblock) -* Добавлена проверка необходимости резервации товаров при выгрузке заказов из retailCRM +* Добавлена проверка необходимости резервации товаров при выгрузке заказов из RetailCRM * Исправлен вызов рекурсивного метода в RCrmActions * Добавлены недостающие поля retailcrm.json @@ -252,7 +255,7 @@ * Небольшие исправления ## 2016-10-31 v.2.1.0 -* Добавлена передача адреса из карточки клиента в retailCRM +* Добавлена передача адреса из карточки клиента в RetailCRM * Добавлено больше информации в журнале битрикса и дополнительное логирование * Небольшие исправления diff --git a/README.md b/README.md index 29a1af5e..7f905736 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Bitrix module ============= -Bitrix module for interaction with [retailCRM](http://www.retailcrm.ru) through [REST API](http://www.retailcrm.ru/docs/Developers/Index). +Bitrix module for interaction with [RetailCRM](http://www.retailcrm.ru) through [REST API](http://www.retailcrm.ru/docs/Developers/Index). Module allows: -* Exchange the orders with retailCRM -* Configure relations between dictionaries of retailCRM and Bitrix (statuses, payments, delivery types and etc) -* Generate [ICML](http://www.retailcrm.ru/docs/Developers/ICML) (Intaro Markup Language) for catalog loading by retailCRM +* Exchange the orders with RetailCRM +* Configure relations between dictionaries of RetailCRM and Bitrix (statuses, payments, delivery types and etc) +* Generate [ICML](http://www.retailcrm.ru/docs/Developers/ICML) (Intaro Markup Language) for catalog loading by RetailCRM Installation ------------- diff --git a/intaro.retailcrm/classes/general/ApiClient_v4.php b/intaro.retailcrm/classes/general/ApiClient_v4.php index 401605d1..8fb2d8dc 100644 --- a/intaro.retailcrm/classes/general/ApiClient_v4.php +++ b/intaro.retailcrm/classes/general/ApiClient_v4.php @@ -5,11 +5,8 @@ * * API client class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ namespace RetailCrm; @@ -22,11 +19,8 @@ use RetailCrm\Response\ApiResponse; * * API client class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ class ApiClient { diff --git a/intaro.retailcrm/classes/general/ApiClient_v5.php b/intaro.retailcrm/classes/general/ApiClient_v5.php index d3358024..9d113c39 100644 --- a/intaro.retailcrm/classes/general/ApiClient_v5.php +++ b/intaro.retailcrm/classes/general/ApiClient_v5.php @@ -5,11 +5,8 @@ * * API client class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion5 + * @category RetailCRM + * @package RetailCRM */ namespace RetailCrm; @@ -22,11 +19,8 @@ use RetailCrm\Response\ApiResponse; * * API client class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion5 + * @category RetailCRM + * @package RetailCRM */ class ApiClient { diff --git a/intaro.retailcrm/classes/general/Http/Client.php b/intaro.retailcrm/classes/general/Http/Client.php index bbd8f2d3..f0bf53e5 100644 --- a/intaro.retailcrm/classes/general/Http/Client.php +++ b/intaro.retailcrm/classes/general/Http/Client.php @@ -5,11 +5,8 @@ * * HTTP client * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion3 + * @category RetailCRM + * @package RetailCRM */ namespace RetailCrm\Http; @@ -23,11 +20,8 @@ use RetailCrm\Response\ApiResponse; * * HTTP client * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion3 + * @category RetailCRM + * @package RetailCRM */ class Client { diff --git a/intaro.retailcrm/classes/general/Logger.php b/intaro.retailcrm/classes/general/Logger.php index 7e84d73b..6db51421 100644 --- a/intaro.retailcrm/classes/general/Logger.php +++ b/intaro.retailcrm/classes/general/Logger.php @@ -2,10 +2,6 @@ /** * Class Logger - * - * @author pavel - * @license https://opensource.org/licenses/MIT MIT License - * @link http://help.retailcrm.pro/docs/Developers */ class Logger { diff --git a/intaro.retailcrm/classes/general/Response/ApiResponse.php b/intaro.retailcrm/classes/general/Response/ApiResponse.php index 70c145aa..5bf81122 100644 --- a/intaro.retailcrm/classes/general/Response/ApiResponse.php +++ b/intaro.retailcrm/classes/general/Response/ApiResponse.php @@ -3,13 +3,10 @@ /** * PHP version 5.3 * - * Response from retailCRM API + * Response from RetailCRM API * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion3 + * @category RetailCRM + * @package RetailCRM */ namespace RetailCrm\Response; @@ -19,13 +16,10 @@ use RetailCrm\Exception\InvalidJsonException; /** * PHP version 5.3 * - * Response from retailCRM API + * Response from RetailCRM API * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion3 + * @category RetailCRM + * @package RetailCRM */ class ApiResponse implements \ArrayAccess { diff --git a/intaro.retailcrm/classes/general/RestNormalizer.php b/intaro.retailcrm/classes/general/RestNormalizer.php index fe08ff4d..36750ab4 100644 --- a/intaro.retailcrm/classes/general/RestNormalizer.php +++ b/intaro.retailcrm/classes/general/RestNormalizer.php @@ -1,16 +1,8 @@ - * @copyright 2015 Dmitry Mamontov - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @version Release: 1.0.0 - * @link https://github.com/dmamontov/restnormalizer/ - * @since Class available since Release 1.0.0 */ - class RestNormalizer { public $clear = true; diff --git a/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php b/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php index 46f74a75..40f623e3 100644 --- a/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php +++ b/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php @@ -5,11 +5,8 @@ * * RetailcrmConfigProvider class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ IncludeModuleLangFile(__FILE__); @@ -19,11 +16,8 @@ IncludeModuleLangFile(__FILE__); * * RetailcrmConfigProvider class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ class RetailcrmConfigProvider { @@ -462,7 +456,7 @@ class RetailcrmConfigProvider } /** - * Returns true if payment amount should be sent from CMS to retailCRM. + * Returns true if payment amount should be sent from CMS to RetailCRM. * * @return bool|string|null */ diff --git a/intaro.retailcrm/classes/general/RetailcrmConstants.php b/intaro.retailcrm/classes/general/RetailcrmConstants.php index e36967a5..88ae0376 100644 --- a/intaro.retailcrm/classes/general/RetailcrmConstants.php +++ b/intaro.retailcrm/classes/general/RetailcrmConstants.php @@ -5,11 +5,8 @@ * * RetailcrmConstants * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ IncludeModuleLangFile(__FILE__); @@ -19,11 +16,8 @@ IncludeModuleLangFile(__FILE__); * * RetailcrmConstants * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ class RetailcrmConstants { diff --git a/intaro.retailcrm/classes/general/RetailcrmDependencyLoader.php b/intaro.retailcrm/classes/general/RetailcrmDependencyLoader.php index b5d2c65c..5f85c977 100644 --- a/intaro.retailcrm/classes/general/RetailcrmDependencyLoader.php +++ b/intaro.retailcrm/classes/general/RetailcrmDependencyLoader.php @@ -5,11 +5,8 @@ * * RetailcrmDependencyLoader class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ IncludeModuleLangFile(__FILE__); @@ -19,11 +16,8 @@ IncludeModuleLangFile(__FILE__); * * RetailcrmDependencyLoader class * - * @category RetailCrm - * @package RetailCrm - * @author RetailCrm - * @license https://opensource.org/licenses/MIT MIT License - * @link http://www.retailcrm.ru/docs/Developers/ApiVersion4 + * @category RetailCRM + * @package RetailCRM */ class RetailcrmDependencyLoader { diff --git a/intaro.retailcrm/classes/general/ua/RetailCrmUa.php b/intaro.retailcrm/classes/general/ua/RetailCrmUa.php index 44c73628..febebc4b 100644 --- a/intaro.retailcrm/classes/general/ua/RetailCrmUa.php +++ b/intaro.retailcrm/classes/general/ua/RetailCrmUa.php @@ -20,13 +20,13 @@ class RetailCrmUa m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '" . $uaKeys[SITE_ID]['ID'] . "', 'auto'); - function getRetailCrmCookie(name) { + function getRetailCRMCookie(name) { var matches = document.cookie.match(new RegExp( '(?:^|; )' + name + '=([^;]*)' )); return matches ? decodeURIComponent(matches[1]) : ''; } - ga('set', 'dimension" . $uaKeys[SITE_ID]['INDEX'] . "', getRetailCrmCookie('_ga')); + ga('set', 'dimension" . $uaKeys[SITE_ID]['INDEX'] . "', getRetailCRMCookie('_ga')); ga('send', 'pageview'); "; if (isset($_GET['ORDER_ID'])) { diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index dc11c54d..fc6b7015 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1,5 +1 @@ -- Добавлена возможность активации онлайн-консультанта -- Обновлен список стран -- Улучшена синхронизация ФИО в истории -- Добавлен перевод на английский язык -- Заменены некорректные символы в списке стран +- Обновлено наименование бренда diff --git a/intaro.retailcrm/install/export/retailcrm_run.php b/intaro.retailcrm/install/export/retailcrm_run.php index 8fca1b03..9e865ea2 100644 --- a/intaro.retailcrm/install/export/retailcrm_run.php +++ b/intaro.retailcrm/install/export/retailcrm_run.php @@ -1,3 +1,3 @@ retailCRM +//RetailCRM require($_SERVER["DOCUMENT_ROOT"] . "/bitrix/modules/intaro.retailcrm/export/export_run.php"); \ No newline at end of file diff --git a/intaro.retailcrm/install/export/retailcrm_setup.php b/intaro.retailcrm/install/export/retailcrm_setup.php index d1fb46f5..57d30133 100644 --- a/intaro.retailcrm/install/export/retailcrm_setup.php +++ b/intaro.retailcrm/install/export/retailcrm_setup.php @@ -1,3 +1,3 @@ retailCRM +//RetailCRM require($_SERVER["DOCUMENT_ROOT"] . "/bitrix/modules/intaro.retailcrm/export/export_setup.php"); \ No newline at end of file diff --git a/intaro.retailcrm/install/step2.php b/intaro.retailcrm/install/step2.php index 78d2d14d..91851bb3 100644 --- a/intaro.retailcrm/install/step2.php +++ b/intaro.retailcrm/install/step2.php @@ -198,7 +198,7 @@ else{ - " . GetMessage('URL_1') . "" . " " . 'retailCRM.'; ?> + " . GetMessage('URL_1') . "" . " " . 'RetailCRM.'; ?> diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 26213407..3923c760 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "5.6.0", - "VERSION_DATE" => "2020-11-24 11:42:00" + "VERSION" => "5.6.1", + "VERSION_DATE" => "2020-12-15 12:00:00" ); diff --git a/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php index 4a19afc5..dd398abf 100644 --- a/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php +++ b/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php @@ -1,4 +1,4 @@ Integration).'; -$MESS ['INFO_3'] = 'Store code in 1C-Bitrix must correspond with the store code in retailCRM (Administration > Stores).'; +$MESS ['INFO_1'] = 'Enter the address of RetailCRM instance (for example, https://demo.retailcrm.ru) and API key.'; +$MESS ['INFO_2'] = 'API key can be generated when the store is registered in RetailCRM (Administration > Integration).'; +$MESS ['INFO_3'] = 'Store code in 1C-Bitrix must correspond with the store code in RetailCRM (Administration > Stores).'; diff --git a/intaro.retailcrm/lang/en/install/step11.php b/intaro.retailcrm/lang/en/install/step11.php index 4c14a3be..e9af525e 100644 --- a/intaro.retailcrm/lang/en/install/step11.php +++ b/intaro.retailcrm/lang/en/install/step11.php @@ -8,5 +8,5 @@ $MESS ['ERR_6'] = 'CRM address may be incorrect.'; $MESS ['ERR_403'] = 'Wrong apiKey.'; $MESS ['ERR_0'] = 'Server connection timeout error.'; $MESS ['ERR_FIELDS_API_HOST'] = 'Fields are filled incorrectly.'; -$MESS ['INFO_1'] = 'Set the correspondence between 1C-Bitrix and retailCRM stores.'; -$MESS ['INFO_2'] = 'All your stores in retailCRM must have a common API key!'; +$MESS ['INFO_1'] = 'Set the correspondence between 1C-Bitrix and RetailCRM stores.'; +$MESS ['INFO_2'] = 'All your stores in RetailCRM must have a common API key!'; diff --git a/intaro.retailcrm/lang/en/install/step2.php b/intaro.retailcrm/lang/en/install/step2.php index 844afe18..d3d75f03 100644 --- a/intaro.retailcrm/lang/en/install/step2.php +++ b/intaro.retailcrm/lang/en/install/step2.php @@ -11,12 +11,12 @@ $MESS ['PAYMENT_LIST'] = 'Payment'; $MESS ['PAYMENT_Y'] = 'Paid'; $MESS ['PAYMENT_N'] = 'Not paid'; $MESS ['CANCELED'] = 'Is «Cancelled»'; -$MESS ['INFO_1'] = 'Set the correspondence between 1C-Bitrix data books and retailCRM data books.'; -$MESS ['INFO_2'] = 'If you can\'t find the appropriate values in the retailCRM data books, you can enter them in the section '; +$MESS ['INFO_1'] = 'Set the correspondence between 1C-Bitrix data books and RetailCRM data books.'; +$MESS ['INFO_2'] = 'If you can\'t find the appropriate values in the RetailCRM data books, you can enter them in the section '; $MESS ['URL_1'] = 'Administration'; $MESS ['INFO_3'] = 'Then load new values by refreshing the page'; $MESS ['UPDATE_CATS'] = 'Update data books'; $MESS ['MESS_5'] = 'A server error occurred, please contact Intaro Software.'; $MESS ['DELIV_TYPES_EXPORT'] = 'Export a list of delivery types from 1C-Bitrix'; -$MESS ['DELIV_TYPES_EXPORT_F'] = 'Set the correspondence between 1C-Bitrix and retailCRM delivery types'; +$MESS ['DELIV_TYPES_EXPORT_F'] = 'Set the correspondence between 1C-Bitrix and RetailCRM delivery types'; $MESS ['STATUS_NOT_SETTINGS'] ='Cannot find suitable statuses in Bitrix'; diff --git a/intaro.retailcrm/lang/en/install/step3.php b/intaro.retailcrm/lang/en/install/step3.php index 72b822df..ab26e127 100644 --- a/intaro.retailcrm/lang/en/install/step3.php +++ b/intaro.retailcrm/lang/en/install/step3.php @@ -4,12 +4,12 @@ $MESS ['STEP_NAME'] = 'Step 3'; $MESS ['STOP'] = 'Suspend export'; $MESS ['MOD_NEXT_STEP'] = 'Next step'; $MESS ['MOD_PREV_STEP'] = 'Previous step'; -$MESS ['INFO_2'] = ' Set the correspondence between 1C-Bitrix and retailCRM order fields.'; +$MESS ['INFO_2'] = ' Set the correspondence between 1C-Bitrix and RetailCRM order fields.'; $MESS ['ORDER_TYPE_INFO'] = 'Order type:'; $MESS ['CONTRAGENT_TYPE'] = 'Contragent type'; $MESS ['ORDER_LEGAL_INFO'] = 'Legal entity and bank details'; $MESS ['ORDER_CUSTOM'] = 'Custom fields'; -$MESS ['ORDER_PROPS'] = 'Correspondence settings between retailCRM order fields and 1C-Bitrix order properties'; +$MESS ['ORDER_PROPS'] = 'Correspondence settings between RetailCRM order fields and 1C-Bitrix order properties'; $MESS ['FIO'] = 'Full name'; $MESS ['ZIP'] = 'Zip code'; $MESS ['ADDRESS'] = 'Address (string)'; diff --git a/intaro.retailcrm/lang/en/install/step4.php b/intaro.retailcrm/lang/en/install/step4.php index 39330e09..b5cfb96d 100644 --- a/intaro.retailcrm/lang/en/install/step4.php +++ b/intaro.retailcrm/lang/en/install/step4.php @@ -1,7 +1,7 @@

New orders will be send by agent RCrmActions::uploadOrdersAgent(); -to retailCRM every 10 minutes (interval can be changed in section Agents). +to RetailCRM every 10 minutes (interval can be changed in section Agents).

If you selected "Export catalog now" option in step 4, your catalog will be generated. -If you did not select this option, you can generate catalog file by «retailCRM» export function +If you did not select this option, you can generate catalog file by «RetailCRM» export function in section Store > Settings > Export data. -retailCRM checks and downloads this catalog file every 3 hours. +RetailCRM checks and downloads this catalog file every 3 hours.

'; diff --git a/intaro.retailcrm/lang/en/options.php b/intaro.retailcrm/lang/en/options.php index 81c5917c..6825c19e 100644 --- a/intaro.retailcrm/lang/en/options.php +++ b/intaro.retailcrm/lang/en/options.php @@ -4,7 +4,7 @@ $MESS ['ICRM_OPTIONS_GENERAL_TAB'] = 'General settings'; $MESS ['ICRM_OPTIONS_IMPORT_TAB'] = 'Import settings'; $MESS ['ICRM_OPTIONS_ORDER_PROPS_TAB'] = 'Order property fields conformity'; $MESS ['ICRM_CONN_SETTINGS'] = 'Connection settings'; -$MESS ['ICRM_API_HOST'] = 'Address of retailCRM:'; +$MESS ['ICRM_API_HOST'] = 'Address of RetailCRM:'; $MESS ['ICRM_API_KEY'] = 'API key:'; $MESS ['ICRM_SITES'] = 'Active sites'; $MESS ['ICRM_OPTIONS_CATALOG_TAB'] = 'Data books settings'; @@ -30,13 +30,13 @@ $MESS ['ERR_0'] = 'Server connection timeout error.'; $MESS ['ICRM_OPTIONS_OK'] = 'Changes are successfully saved.'; $MESS ['CANCELED'] = 'Is «Cancelled»'; $MESS ['STATUS_NOT_SETTINGS'] ='Cannot find suitable statuses in Bitrix'; -$MESS ['INFO_1'] = ' Set the correspondence between 1C-Bitrix data books and retailCRM data books.'; +$MESS ['INFO_1'] = ' Set the correspondence between 1C-Bitrix data books and RetailCRM data books.'; $MESS ['ICRM_OPTIONS_ORDER_DISCHARGE_TAB'] = 'Orders uploading mode'; $MESS ['ORDER_DISCH'] = 'Orders uploading mode'; $MESS ['DISCHARGE_AGENT'] = 'Upload orders using agent'; $MESS ['DISCHARGE_EVENTS'] = 'Upload orders by events'; -$MESS ['INFO_2'] = ' Set the correspondence between 1C-Bitrix and retailCRM order fields.'; -$MESS ['ORDER_PROPS'] = 'Correspondence settings between retailCRM order fields and 1C-Bitrix order properties'; +$MESS ['INFO_2'] = ' Set the correspondence between 1C-Bitrix and RetailCRM order fields.'; +$MESS ['ORDER_PROPS'] = 'Correspondence settings between RetailCRM order fields and 1C-Bitrix order properties'; $MESS ['FIO'] = 'Full name'; $MESS ['ZIP'] = 'Zip code'; $MESS ['ADDRESS'] = 'Address (string)'; @@ -91,6 +91,6 @@ $MESS['ROUND_PRICE_FOR_SAME_POSITIONS'] = "Rounding up the product price for ide $MESS['PURCHASE_ICML'] = "If enabled, ICML generation will reset the purchase price to 0 if it is not specified"; $MESS['PURCHASE_HEADER'] = "Reset purchase price in ICML"; $MESS['PHONE_REQUIRED'] = "In the main module settings «Phone Number is required» option was enabled, so it may cause problems with reverse synchronization. For proper work you must disable this option."; -$MESS['CHANGE_SHIPMENT_STATUS_FROM_CRM'] = "Change the shipment status when corresponding flag is received from retailCRM"; +$MESS['CHANGE_SHIPMENT_STATUS_FROM_CRM'] = "Change the shipment status when corresponding flag is received from RetailCRM"; $MESS ['ONLINE_CONSULTANT'] = 'Activate Online Consultant'; $MESS ['ONLINE_CONSULTANT_LABEL'] = 'Online Consultant script'; diff --git a/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php index 9c61696d..bcd505fd 100644 --- a/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php +++ b/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php @@ -1,4 +1,4 @@ Интеграция).'; -$MESS ['INFO_3'] = 'Код сайта в 1С-Битрикс должен совпадать с кодом сайта в retailCRM (Администрирование > Магазины).'; +$MESS ['INFO_1'] = 'Введите адрес экземпляра RetailCRM (например, https://demo.retailcrm.ru) и API-ключ.'; +$MESS ['INFO_2'] = 'API-ключ можно сгенерировать при регистрации магазина в RetailCRM (Администрирование > Интеграция).'; +$MESS ['INFO_3'] = 'Код сайта в 1С-Битрикс должен совпадать с кодом сайта в RetailCRM (Администрирование > Магазины).'; diff --git a/intaro.retailcrm/lang/ru/install/step11.php b/intaro.retailcrm/lang/ru/install/step11.php index 2290c12d..fc0a19e6 100644 --- a/intaro.retailcrm/lang/ru/install/step11.php +++ b/intaro.retailcrm/lang/ru/install/step11.php @@ -3,10 +3,10 @@ $MESS ['STEP_NAME'] = 'Шаг 1. Сайты'; $MESS ['MOD_NEXT_STEP'] = 'Следующий шаг'; $MESS ['ICRM_SITES'] = 'Активные сайты:'; -$MESS ['ERR_404'] = 'Возможно неверно введен адрес retailCRM.'; -$MESS ['ERR_6'] = 'Возможно неверно введен адрес retailCRM.'; +$MESS ['ERR_404'] = 'Возможно неверно введен адрес RetailCRM.'; +$MESS ['ERR_6'] = 'Возможно неверно введен адрес RetailCRM.'; $MESS ['ERR_403'] = 'Неверный apiKey.'; $MESS ['ERR_0'] = 'Превышено время ожидания ответа от сервера.'; $MESS ['ERR_FIELDS_API_HOST'] = 'Неверно заполнены поля.'; -$MESS ['INFO_1'] = 'Задайте соответствия между Вашими магазинами в 1С-Битрикс и retailCRM.'; -$MESS ['INFO_2'] = 'У всех Ваших магазинов в retailCRM должен быть общий API-ключ!'; +$MESS ['INFO_1'] = 'Задайте соответствия между Вашими магазинами в 1С-Битрикс и RetailCRM.'; +$MESS ['INFO_2'] = 'У всех Ваших магазинов в RetailCRM должен быть общий API-ключ!'; diff --git a/intaro.retailcrm/lang/ru/install/step2.php b/intaro.retailcrm/lang/ru/install/step2.php index 2b37b251..91e15df9 100644 --- a/intaro.retailcrm/lang/ru/install/step2.php +++ b/intaro.retailcrm/lang/ru/install/step2.php @@ -11,12 +11,12 @@ $MESS ['PAYMENT_LIST'] = 'Оплата'; $MESS ['PAYMENT_Y'] = 'Оплачен'; $MESS ['PAYMENT_N'] = 'Не оплачен'; $MESS ['CANCELED'] = 'Является флагом «Отменен»'; -$MESS ['INFO_1'] = 'Задайте соответствие между справочниками 1C-Битрикс и справочниками retailCRM.'; -$MESS ['INFO_2'] = 'В случае, если вы не нашли подходящих значений в справочниках retailCRM, вы можете внести их в разделе'; +$MESS ['INFO_1'] = 'Задайте соответствие между справочниками 1C-Битрикс и справочниками RetailCRM.'; +$MESS ['INFO_2'] = 'В случае, если вы не нашли подходящих значений в справочниках RetailCRM, вы можете внести их в разделе'; $MESS ['URL_1'] = 'Администрирование'; $MESS ['INFO_3'] = 'После этого подгрузите новые значения обновив страницу'; $MESS ['UPDATE_CATS'] = 'Обновить справочники'; $MESS ['MESS_5'] = 'Произошла ошибка сервера, обратитесь в Интаро Софт.'; $MESS ['DELIV_TYPES_EXPORT'] = 'Выгрузить список доставок из 1С-Битрикс'; -$MESS ['DELIV_TYPES_EXPORT_F'] = 'Настроить соответствие доставок 1С-Битрикс и retailCRM'; +$MESS ['DELIV_TYPES_EXPORT_F'] = 'Настроить соответствие доставок 1С-Битрикс и RetailCRM'; $MESS ['STATUS_NOT_SETTINGS'] ='Не найдены подходящие статусы в Битрикс'; diff --git a/intaro.retailcrm/lang/ru/install/step3.php b/intaro.retailcrm/lang/ru/install/step3.php index 4648f1c3..7439f3b6 100644 --- a/intaro.retailcrm/lang/ru/install/step3.php +++ b/intaro.retailcrm/lang/ru/install/step3.php @@ -4,13 +4,13 @@ $MESS ['STEP_NAME'] = 'Шаг 3'; $MESS ['STOP'] = 'Приостановить выгрузку'; $MESS ['MOD_NEXT_STEP'] = 'Следующий шаг'; $MESS ['MOD_PREV_STEP'] = 'Предыдущий шаг'; -$MESS ['INFO_2'] = ' Задайте соответствие между полями заказа 1C-Битрикс и retailCRM.'; +$MESS ['INFO_2'] = ' Задайте соответствие между полями заказа 1C-Битрикс и RetailCRM.'; $MESS ['ORDER_TYPE_INFO'] = 'Тип заказа:'; $MESS ['CONTRAGENT_TYPE'] = 'Тип контрагента'; $MESS ['ORDER_LEGAL_INFO'] = 'Юридические и банковские реквизиты'; $MESS ['ORDER_CUSTOM'] = 'Кастомные поля'; -$MESS ['ORDER_PROPS'] = 'Настройки соответствия полей заказа retailCRM свойствам заказа 1С-Битрикс'; +$MESS ['ORDER_PROPS'] = 'Настройки соответствия полей заказа RetailCRM свойствам заказа 1С-Битрикс'; $MESS ['FIO'] = 'Ф.И.О.'; $MESS ['ZIP'] = 'Индекс'; $MESS ['ADDRESS'] = 'Адрес (строкой)'; diff --git a/intaro.retailcrm/lang/ru/install/step4.php b/intaro.retailcrm/lang/ru/install/step4.php index d2a4c246..4377f285 100644 --- a/intaro.retailcrm/lang/ru/install/step4.php +++ b/intaro.retailcrm/lang/ru/install/step4.php @@ -1,7 +1,7 @@

Новые заказы будут отправляться агентом RCrmActions::uploadOrdersAgent(); - в retailCRM каждые 10 минут (интервал можно изменить в разделе Агенты). + в RetailCRM каждые 10 минут (интервал можно изменить в разделе Агенты).

- Если вы выбрали опцию «Выгрузить каталог сейчас» на шаге 4, то ваш каталог уже загружается в retailCRM. + Если вы выбрали опцию «Выгрузить каталог сейчас» на шаге 4, то ваш каталог уже загружается в RetailCRM. Загрузка длится, как правило, не более 10 минут. Если вы не выбирали эту опцию, то генерацию файла с каталогом - можно произвести экспортом «retailCRM» в разделе Магазин > Настройки > Экспорт данных. - retailCRM проверяет и загружает данный файл с каталогом каждые 3 часа. + можно произвести экспортом «RetailCRM» в разделе Магазин > Настройки > Экспорт данных. + RetailCRM проверяет и загружает данный файл с каталогом каждые 3 часа.

'; diff --git a/intaro.retailcrm/lang/ru/options.php b/intaro.retailcrm/lang/ru/options.php index b87d7c8a..5ea3cc41 100644 --- a/intaro.retailcrm/lang/ru/options.php +++ b/intaro.retailcrm/lang/ru/options.php @@ -4,7 +4,7 @@ $MESS ['ICRM_OPTIONS_GENERAL_TAB'] = 'Общие настройки'; $MESS ['ICRM_OPTIONS_IMPORT_TAB'] = 'Настройки импорта'; $MESS ['ICRM_OPTIONS_ORDER_PROPS_TAB'] = 'Cоответствия полей свойств заказа'; $MESS ['ICRM_CONN_SETTINGS'] = 'Настройка соединения'; -$MESS ['ICRM_API_HOST'] = 'Адрес retailCRM:'; +$MESS ['ICRM_API_HOST'] = 'Адрес RetailCRM:'; $MESS ['ICRM_API_KEY'] = 'Ключ авторизации:'; $MESS ['ICRM_SITES'] = 'Активные сайты'; @@ -33,16 +33,16 @@ $MESS ['ERR_0'] = 'Превышено время ожидания ответа $MESS ['ICRM_OPTIONS_OK'] = 'Изменения успешно сохранены.'; $MESS ['CANCELED'] = 'Является флагом «Отменен»'; $MESS ['STATUS_NOT_SETTINGS'] ='Не найдены подходящие статусы в Битрикс'; -$MESS ['INFO_1'] = ' Задайте соответствие между справочниками 1C-Битрикс и справочниками retailCRM.'; +$MESS ['INFO_1'] = ' Задайте соответствие между справочниками 1C-Битрикс и справочниками RetailCRM.'; $MESS ['ICRM_OPTIONS_ORDER_DISCHARGE_TAB'] = 'Режим выгрузки заказов'; $MESS ['ORDER_DISCH'] = 'Режим выгрузки заказов'; $MESS ['DISCHARGE_AGENT'] = 'Выгрузка заказов с помощью агента'; $MESS ['DISCHARGE_EVENTS'] = 'Выгрузка заказов по событию'; -$MESS ['INFO_2'] = ' Задайте соответствие между полями заказа 1C-Битрикс и retailCRM.'; +$MESS ['INFO_2'] = ' Задайте соответствие между полями заказа 1C-Битрикс и RetailCRM.'; -$MESS ['ORDER_PROPS'] = 'Настройки соответствия полей заказа retailCRM свойствам заказа 1С-Битрикс'; +$MESS ['ORDER_PROPS'] = 'Настройки соответствия полей заказа RetailCRM свойствам заказа 1С-Битрикс'; $MESS ['FIO'] = 'Ф.И.О.'; $MESS ['ZIP'] = 'Индекс'; $MESS ['ADDRESS'] = 'Адрес (строкой)'; @@ -114,4 +114,4 @@ $MESS['ROUND_PRICE_FOR_SAME_POSITIONS'] = "Округление цены тов $MESS['PURCHASE_ICML'] = "При включенной опции в генерации icml будет добавлен сброс закупочной цены на 0 если она не указана"; $MESS['PURCHASE_HEADER'] = "Сброс закупочной цены в icml"; $MESS['PHONE_REQUIRED'] = "В настройках главного модуля была включена опция «Номер телефона является обязательным», что может вызвать проблемы с обратной синхронизацией. Для корректной работы необходимо отключить данную опцию."; -$MESS['CHANGE_SHIPMENT_STATUS_FROM_CRM'] = "Изменять статус отгрузки при получении соответствующего флага из retailCRM"; +$MESS['CHANGE_SHIPMENT_STATUS_FROM_CRM'] = "Изменять статус отгрузки при получении соответствующего флага из RetailCRM";