diff --git a/CHANGELOG.md b/CHANGELOG.md index 323f2d44..3865eeab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2023-07-17 v.6.4.0 +- Добавлена функция подписки на рекламно-информационные рассылки + ## 2023-07-25 v.6.3.20 - Исправлена ошибка некорректного вывода информации о программе лояльности в личном кабинете клиента diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php index 11c7050f..8b45346a 100644 --- a/intaro.retailcrm/classes/general/RCrmActions.php +++ b/intaro.retailcrm/classes/general/RCrmActions.php @@ -237,12 +237,12 @@ class RCrmActions RetailCrmHistory::orderHistory(); self::uploadOrdersAgent(); } catch (\Throwable $exception) { - RCrmActions::eventLog( - 'RCrmActions', - 'orderAgent', + Logger::getInstance()->write( + 'Fail orderAgent:' . PHP_EOL . $exception->getMessage() . PHP_EOL . 'File: ' . $exception->getFile() . PHP_EOL . - 'Line: ' . $exception->getLine() . PHP_EOL + 'Line: ' . $exception->getLine() . PHP_EOL, + 'orderAgent' ); } diff --git a/intaro.retailcrm/classes/general/services/RetailCrmService.php b/intaro.retailcrm/classes/general/services/RetailCrmService.php index 3b18ca48..fac7123e 100644 --- a/intaro.retailcrm/classes/general/services/RetailCrmService.php +++ b/intaro.retailcrm/classes/general/services/RetailCrmService.php @@ -170,8 +170,10 @@ class RetailCrmService $fileSub = 'unSubscribe'; } - $logger = new Logger(); - $logger->write('Пользователь ' . $arFields['ID'] . ' ' . $actionSub, $fileSub); + Logger::getInstance()->write( + 'Пользователь ' . $arFields['ID'] . ' ' . $actionSub, + $fileSub + ); } } } diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 38d0a104..58155e93 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена ошибка некорректного вывода информации о программе лояльности в личном кабинете клиента \ No newline at end of file +- Добавлена функция подписки на рекламно-информационные рассылки diff --git a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/lang/ru/template.php b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/lang/ru/template.php index c9bdd8d6..fb2bdee2 100644 --- a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/lang/ru/template.php +++ b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/lang/ru/template.php @@ -81,4 +81,4 @@ $MESS["SEC"] = "сек."; $MESS["RESEND_SMS"] = "Отправить смс повторно"; $MESS["RESEND_POSSIBLE"] = "Повторная отправка смс возможна через"; $MESS["LOYALTY_CONNECTION_ERROR"] = "Возникли проблемы с подключением к удаленному серверу. Попробуйте перезагрузить страницу."; -$MESS["SUBSCRIBE_EMAIL"] = "Подписаться на события"; +$MESS["SUBSCRIBE_EMAIL"] = "Согласен на рекламно-информационные рассылки"; diff --git a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/en/template.php b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/en/template.php index 0a46530c..106d0274 100644 --- a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/en/template.php +++ b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/en/template.php @@ -60,4 +60,5 @@ $MESS['main_profile_time_zones_auto_yes'] = "Yes, use browser settings"; $MESS['main_profile_time_zones_zones'] = "Time Zone:"; $MESS['main_register_sms'] = "SMS confirmation code:"; $MESS['main_register_sms_send'] = "Submit"; +$MESS["SUBSCRIBE_EMAIL"] = "I agree to receive promotional newsletters"; ?> \ No newline at end of file diff --git a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/ru/template.php b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/ru/template.php index 5a4f7492..29d3a541 100644 --- a/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/ru/template.php +++ b/intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default_subscribe/lang/ru/template.php @@ -60,5 +60,5 @@ $MESS["AUTH_SECURE_NOTE"] = "Перед отправкой формы парол $MESS["AUTH_NONSECURE_NOTE"] = "Пароль будет отправлен в открытом виде. Включите JavaScript в браузере, чтобы зашифровать пароль перед отправкой."; $MESS["main_register_sms"] = "Код подтверждения из СМС:"; $MESS["main_register_sms_send"] = "Отправить"; -$MESS["SUBSCRIBE_EMAIL"] = "Подписаться на события"; +$MESS["SUBSCRIBE_EMAIL"] = "Согласен на рекламно-информационные рассылки"; ?> \ No newline at end of file diff --git a/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/en/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/en/template.php index e64ef10c..6dd53d52 100644 --- a/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/en/template.php +++ b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/en/template.php @@ -15,4 +15,4 @@ $MESS["PROFILE_DATA_SAVED"] = "All changes saved"; $MESS["RESET"] = "Reset"; $MESS["SAVE"] = "Save changes"; $MESS["SECOND_NAME"] = "Middle name:"; -$MESS['SUBSCRIBE_EMAIL'] = 'Event subscribe'; +$MESS['SUBSCRIBE_EMAIL'] = 'I agree to receive promotional newsletters'; diff --git a/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/ru/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/ru/template.php index 75ec1ce3..3b4575d1 100644 --- a/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/ru/template.php +++ b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/templates/.default/bitrix/main.profile/.default/lang/ru/template.php @@ -15,4 +15,4 @@ $MESS['RESET'] = "Сбросить"; $MESS['LAST_LOGIN'] = "Последняя авторизация:"; $MESS['NEW_PASSWORD_REQ'] = "Новый пароль:"; $MESS['MAIN_PROFILE_TITLE'] = "Обращение:"; -$MESS['SUBSCRIBE_EMAIL'] = 'Подписаться на события'; +$MESS['SUBSCRIBE_EMAIL'] = 'Согласен на рекламно-информационные рассылки'; diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index b3fb9049..f8efdd25 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.3.20', - 'VERSION_DATE' => '2023-07-25 13:00:00' + 'VERSION' => '6.4.0', + 'VERSION_DATE' => '2023-07-17 17:30:00' ]; diff --git a/intaro.retailcrm/lang/en/install/index.php b/intaro.retailcrm/lang/en/install/index.php index 75b13590..4a1a998b 100644 --- a/intaro.retailcrm/lang/en/install/index.php +++ b/intaro.retailcrm/lang/en/install/index.php @@ -16,3 +16,4 @@ $MESS ['RETAILCRM_CURL_ERR'] = 'RetailCRM integration module requires PHP CURL e $MESS ['ERR_ARTICLE_IBLOCK'] = 'Articles are not set'; $MESS ['DATE_TIMEZONE_ERR'] = 'Timezone is not specified in php settings.'; $MESS ['SALE_VERSION_ERR'] = '\'Online-store\' module version must be higher than 16.'; +$MESS['UF_SUBSCRIBE_USER_EMAIL_TITLE'] = 'Agree to receive promotional newsletters'; diff --git a/intaro.retailcrm/lang/ru/install/index.php b/intaro.retailcrm/lang/ru/install/index.php index 84f280bb..63c66930 100644 --- a/intaro.retailcrm/lang/ru/install/index.php +++ b/intaro.retailcrm/lang/ru/install/index.php @@ -54,5 +54,5 @@ $MESS ['UF_CARD_NUMBER_INTARO_TITLE'] = 'Номер карты программ $MESS ['UF_LP_ID_INTARO_TITLE'] = 'Номер аккаунта в программе лояльности'; $MESS['IBLOCK_NOT_SELECTED'] = 'Не выбрано ни одного инфоблока для экспорта'; $MESS['TARGET_DIR_DOESNT_EXIST'] = 'Целевая директория не существует'; -$MESS['UF_SUBSCRIBE_USER_EMAIL_TITLE'] = 'Подписка на события'; +$MESS['UF_SUBSCRIBE_USER_EMAIL_TITLE'] = 'Согласен на рекламно-информационные рассылки';