diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fccab1d..1dbefbd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-08-29 v.6.4.3
+- Добавлена валидация валют при установке и настройке модуля
+
## 2023-08-23 v.6.4.2
- Исправлена ошибка создания заказов для корпоративных клиентов при использовании функционала брошенных корзин
diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php
index b7c6249a..8892ee0a 100644
--- a/intaro.retailcrm/classes/general/RCrmActions.php
+++ b/intaro.retailcrm/classes/general/RCrmActions.php
@@ -21,6 +21,36 @@ class RCrmActions
public static $CRM_API_VERSION = 'api_version';
public const CANCEL_PROPERTY_CODE = 'INTAROCRM_IS_CANCELED';
+ public static function getCurrencySites(): array
+ {
+ global $DB;
+
+ $sites = self::getSitesList();
+ $sitesLID = [];
+ $sitesCurrency = [];
+
+ foreach ($sites as $site) {
+ $sitesLID[] = $site['LID'];
+ }
+
+ $currencies = $DB->Query(
+ "SELECT DISTINCT site.SMN_SITE_ID, hook_data.VALUE
+ FROM `b_landing_site` site
+ LEFT JOIN `b_landing_hook_data` hook_data on site.ID = hook_data.ENTITY_ID
+ WHERE site.SMN_SITE_ID IN ('" . implode("', '", $sitesLID) . "')
+ AND hook_data.CODE = 'CURRENCY_ID';
+ "
+ );
+
+ while ($currencySite = $currencies->Fetch()) {
+ if (!empty($currencySite['SMN_SITE_ID'])) {
+ $sitesCurrency[$currencySite['SMN_SITE_ID']] = $currencySite['VALUE'];
+ }
+ }
+
+ return $sitesCurrency;
+ }
+
/**
* @return array
*/
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 53e15a03..0e690930 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/index.php b/intaro.retailcrm/install/index.php
index 5f962a4c..48fbeccf 100644
--- a/intaro.retailcrm/install/index.php
+++ b/intaro.retailcrm/install/index.php
@@ -371,7 +371,6 @@ class intaro_retailcrm extends CModule
$arResult['arSites'] = RCrmActions::getSitesList();
if (count($arResult['arSites']) > 1) {
-
$api_host = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_HOST_OPTION, 0);
$api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0);
@@ -382,8 +381,38 @@ class intaro_retailcrm extends CModule
$siteCode[$site['LID']] = null;
}
}
+
+ $arResult['arCurrencySites'] = RCrmActions::getCurrencySites();
+ $bitrixBaseCurrency = CCurrency::GetBaseCurrency();
+ $result = $this->getReferenceShops($api_host, $api_key);
+
+ if (isset($result['errCode'])) {
+ $arResult['errCode'] = $result['errCode'];
+ } else {
+ $arResult['sitesList'] = $result['sitesList'];
+ }
+
+ foreach ($arResult['arSites'] as $bitrixSite) {
+ $currentCurrency = $bitrixBaseCurrency;
+ $LID = $bitrixSite['LID'];
+
+ if (isset($arResult['arCurrencySites'][$LID])) {
+ $currentCurrency = $arResult['arCurrencySites'][$LID];
+ }
+
+ if (
+ isset($arResult['sitesList'][$siteCode[$LID]])
+ && $currentCurrency !== $arResult['sitesList'][$siteCode[$LID]]['currency'])
+ {
+ $arResult['errCode'] = 'ERR_CURRENCY_SITES';
+ }
+ }
+
if (count($arResult['arSites']) != count($siteCode)) {
$arResult['errCode'] = 'ERR_FIELDS_API_HOST';
+ }
+
+ if (isset($arResult['errCode'])) {
$APPLICATION->IncludeAdminFile(
GetMessage('MODULE_INSTALL_TITLE'), $this->INSTALL_PATH . '/step11.php'
);
@@ -1438,6 +1467,9 @@ class intaro_retailcrm extends CModule
try {
$result = $client->makeRequest('/reference/sites', 'GET');
+ $bitrixSites = RCrmActions::getSitesList();
+ $bitrixBaseCurrency = CCurrency::GetBaseCurrency();
+ $currencySites = RCrmActions::getCurrencySites();
} catch (CurlException $e) {
RCrmActions::eventLog(
'intaro.retailcrm/install/index.php', 'RetailCrm\ApiClient::sitesList',
@@ -1445,21 +1477,44 @@ class intaro_retailcrm extends CModule
);
$res['errCode'] = 'ERR_' . $e->getCode();
- }
-
- if (!isset($result) || $result->getStatusCode() == 200) {
- ConfigProvider::setApiVersion(self::V5);
-
- $res['sitesList'] = $APPLICATION->ConvertCharsetArray(
- $result->sites,
- 'utf-8',
- SITE_CHARSET
- );
return $res;
}
- $res['errCode'] = 'ERR_METHOD_NOT_FOUND';
+ //Проверка, что был получен корректный ответ
+ if (isset($result) && $result->getStatusCode() == 200) {
+ //Проверка количества магазинов, доступных по апи
+ if (count($bitrixSites) === 1 && count($result->sites) > 1) {
+ $res['errCode'] = 'ERR_COUNT_SITES';
+ }
+
+ if (!isset($res['errCode']) && count($bitrixSites) === 1 ) {
+ $currentCurrency = $bitrixBaseCurrency;
+ $LID = $bitrixSites[0]['LID'];
+
+ if (isset($currencySites[$LID])) {
+ $currentCurrency = $currencySites[$LID];
+ }
+
+ $crmSite = reset($result->sites);
+
+ if ($currentCurrency !== $crmSite['currency']) {
+ $res['errCode'] = 'ERR_CURRENCY_SITES';
+ }
+ }
+
+ if (!isset($res)) {
+ ConfigProvider::setApiVersion(self::V5);
+
+ $res['sitesList'] = $APPLICATION->ConvertCharsetArray(
+ $result->sites,
+ 'utf-8',
+ SITE_CHARSET
+ );
+ }
+ } else {
+ $res['errCode'] = 'ERR_METHOD_NOT_FOUND';
+ }
return $res;
}
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 5c2eee18..16b30a95 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
'6.4.2',
- 'VERSION_DATE' => '2023-08-23 12:30:00'
+ 'VERSION' => '6.4.3',
+ 'VERSION_DATE' => '2023-08-29 16:00:00'
];
diff --git a/intaro.retailcrm/lang/en/install/step1.php b/intaro.retailcrm/lang/en/install/step1.php
index 51f85434..6f4fd825 100644
--- a/intaro.retailcrm/lang/en/install/step1.php
+++ b/intaro.retailcrm/lang/en/install/step1.php
@@ -15,3 +15,7 @@ $MESS ['ERR_METHOD_NOT_FOUND'] = 'Check availability of API methods for current
$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).';
+$MESS ['ERR_COUNT_SITES'] = 'The API Key you entered relates to more than one store.
+Change the access settings for the API key, it should work with only one store in CRM';
+$MESS ['ERR_CURRENCY_SITES'] = 'The currency of the site differs from the currency of the store in CRM.
+For the integration to work correctly, the currencies in CRM and CMS must match';
diff --git a/intaro.retailcrm/lang/en/install/step11.php b/intaro.retailcrm/lang/en/install/step11.php
index e9af525e..df60160e 100644
--- a/intaro.retailcrm/lang/en/install/step11.php
+++ b/intaro.retailcrm/lang/en/install/step11.php
@@ -10,3 +10,5 @@ $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 ['ERR_CURRENCY_SITES'] = 'The currency of the site differs from the currency of the store in CRM.
+For the integration to work correctly, the currencies in CRM and CMS must match';
diff --git a/intaro.retailcrm/lang/en/options.php b/intaro.retailcrm/lang/en/options.php
index 9f1ef83b..ea4f29d0 100644
--- a/intaro.retailcrm/lang/en/options.php
+++ b/intaro.retailcrm/lang/en/options.php
@@ -100,5 +100,13 @@ $MESS ['ONLINE_CONSULTANT_LABEL'] = 'Online Consultant script';
$MESS ['INTEGRATION_PAYMENT_LIST'] = 'The status will not be transferred for integration payments';
$MESS ['INTEGRATIONS'] = ' (integration)';
+$MESS ['ERR_COUNT_SITES'] = 'The API Key you entered relates to more than one store.
+Change the access settings for the API key, it should work with only one store in CRM';
+$MESS ['ERR_CURRENCY_SITES'] = 'The currency of the site differs from the currency of the store in CRM.
+For the integration to work correctly, the currencies in CRM and CMS must match';
+
$MESS ['ACTIVITY_SETTINGS'] = 'Module activity settings';
$MESS ['DEACTIVATE_MODULE'] = 'Deactivate the module';
+
+$MESS ['WRONG_CREDENTIALS'] = 'Enter the address and authorization key of the CRM system';
+$MESS ['Wrong "apiKey" value.'] = 'Invalid authorization key';
diff --git a/intaro.retailcrm/lang/ru/install/step1.php b/intaro.retailcrm/lang/ru/install/step1.php
index 9b88760e..7d53f532 100644
--- a/intaro.retailcrm/lang/ru/install/step1.php
+++ b/intaro.retailcrm/lang/ru/install/step1.php
@@ -11,6 +11,10 @@ $MESS ['ERR_403'] = 'Неверный apiKey.';
$MESS ['ERR_0'] = 'Превышено время ожидания ответа от сервера.';
$MESS ['ERR_FIELDS_API_HOST'] = 'Неверно заполнены поля.';
$MESS ['ERR_METHOD_NOT_FOUND'] = 'Проверьте доступность методов API по текущему ключу.';
+$MESS ['ERR_COUNT_SITES'] = 'Введенный вами API Ключ относится более чем к одному магазину.
+Измените настройки доступа для API ключа, он должен работать только с одним магазином в CRM';
+$MESS ['ERR_CURRENCY_SITES'] = 'Валюта сайта отличается от валюты магазина в CRM.
+Для корректной работы интеграции, валюты в CRM и CMS должны совпадать';
//$MESS ['URL_NOT_FOUND'] = 'В настройках одного или нескольких сайтов не заполнено поле "URL сервера".';
$MESS ['INFO_1'] = 'Введите адрес экземпляра RetailCRM (например, https://demo.retailcrm.ru) и API-ключ.';
$MESS ['INFO_2'] = 'API-ключ можно сгенерировать при регистрации магазина в RetailCRM (Администрирование > Интеграция).';
diff --git a/intaro.retailcrm/lang/ru/install/step11.php b/intaro.retailcrm/lang/ru/install/step11.php
index fc0a19e6..81ca7627 100644
--- a/intaro.retailcrm/lang/ru/install/step11.php
+++ b/intaro.retailcrm/lang/ru/install/step11.php
@@ -10,3 +10,5 @@ $MESS ['ERR_0'] = 'Превышено время ожидания ответа
$MESS ['ERR_FIELDS_API_HOST'] = 'Неверно заполнены поля.';
$MESS ['INFO_1'] = 'Задайте соответствия между Вашими магазинами в 1С-Битрикс и RetailCRM.';
$MESS ['INFO_2'] = 'У всех Ваших магазинов в RetailCRM должен быть общий API-ключ!';
+$MESS ['ERR_CURRENCY_SITES'] = 'Валюта сайта отличается от валюты магазина в CRM.
+Для корректной работы интеграции, валюты в CRM и CMS должны совпадать';
\ No newline at end of file
diff --git a/intaro.retailcrm/lang/ru/options.php b/intaro.retailcrm/lang/ru/options.php
index 0c458074..d96fb87c 100644
--- a/intaro.retailcrm/lang/ru/options.php
+++ b/intaro.retailcrm/lang/ru/options.php
@@ -27,6 +27,11 @@ $MESS ['ORDER_UPLOAD_INFO'] = 'Для загрузки всех заказов
$MESS ['INTEGRATION_PAYMENT_LIST'] = 'Для интеграционных оплат статус не передаётся';
$MESS ['INTEGRATIONS'] = ' (интеграционная)';
+$MESS ['ERR_COUNT_SITES'] = 'Введенный вами API Ключ относится более чем к одному магазину.
+Измените настройки доступа для API ключа, он должен работать только с одним магазином в CRM';
+$MESS ['ERR_CURRENCY_SITES'] = 'Валюта сайта отличается от валюты магазина в CRM.
+Для корректной работы интеграции, валюты в CRM и CMS должны совпадать';
+
$MESS ['ICRM_OPTIONS_SUBMIT_TITLE'] = 'Сохранить настройки';
$MESS ['ICRM_OPTIONS_SUBMIT_VALUE'] = 'Сохранить';
@@ -161,3 +166,6 @@ $MESS ['TEMPLATE_COPING_ERROR'] = 'Ошибка копирования шабл
$MESS ['ACTIVITY_SETTINGS'] = 'Настройки активности модуля';
$MESS ['DEACTIVATE_MODULE'] = 'Деактивировать модуль';
+
+$MESS ['WRONG_CREDENTIALS'] = 'Введите адрес и ключ авторизации CRM системы';
+$MESS ['Wrong "apiKey" value.'] = 'Недействительный ключ авторизации';
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index aa70a403..ea77b462 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -118,6 +118,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/intaro.retailcrm/cl
}
$arResult['arSites'] = RCrmActions::getSitesList();
+$arResult['arCurrencySites'] = RCrmActions::getCurrencySites();
//ajax update deliveryServices
if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest') && isset($_POST['ajax']) && ($_POST['ajax'] === 1)) {
$api_host = COption::GetOptionString($mid, $CRM_API_HOST_OPTION, 0);
@@ -275,6 +276,10 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
COption::SetOptionString($mid, 'api_host', $api_host);
COption::SetOptionString($mid, 'api_key', $api_key);
+ } else {
+ $uri .= '&errc=ERR_WRONG_CREDENTIALS';
+
+ LocalRedirect($uri);
}
//form order types ids arr
@@ -1061,6 +1066,49 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
$currencyOption = COption::GetOptionString($mid, $CRM_CURRENCY, 0) ?: $baseCurrency;
$currencyList = \Bitrix\Currency\CurrencyManager::getCurrencyList();
+ $errorsText = [];
+
+ if (preg_match('/&errc=ERR_(.*)/is', $APPLICATION->GetCurUri(), $matches)) {
+ $errorsText[] = GetMessage(urldecode($matches[1]));
+ }
+
+ if (empty($errorsText)) {
+ if (count($arResult['arSites']) === 1 && count($arResult['sitesList']) > 1) {
+ $errorsText[] = GetMessage('ERR_COUNT_SITES');
+ }
+
+ if (count($arResult['arSites']) > 1) {
+ foreach ($optionsSitesList as $LID => $crmCode) {
+ if (empty($crmCode)) {
+ continue;
+ }
+
+ $currentCurrency = $baseCurrency;
+
+ if (isset($arResult['arCurrencySites'][$LID])) {
+ $currentCurrency = $arResult['arCurrencySites'][$LID];
+ }
+
+ if ($currentCurrency !== $arResult['sitesList'][$crmCode]['currency']) {
+ $errorsText[] = GetMessage('ERR_CURRENCY_SITES') . ' (' . $arResult['sitesList'][$crmCode]['name'] . ')';
+ }
+ }
+ } else {
+ $currentCurrency = $baseCurrency;
+ $LID = $arResult['arSites'][0]['LID'];
+
+ if (isset($arResult['arCurrencySites'][$LID])) {
+ $currentCurrency = $arResult['arCurrencySites'][$LID];
+ }
+
+ $crmSite = reset($arResult['sitesList']);
+
+ if ($currentCurrency !== $crmSite['currency']) {
+ $errorsText[] = GetMessage('ERR_CURRENCY_SITES') . ' (' . $crmSite['name'] . ')';
+ }
+ }
+ }
+
$customFields = [['code' => '__default_empty_value__', 'name' => GetMessage('SELECT_VALUE')]];
$crmCouponFieldOption = COption::GetOptionString($mid, $CRM_COUPON_FIELD, 0) ?: null;
$page = 1;
@@ -1462,7 +1510,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
|
-
+
+
|
|
@@ -1470,6 +1519,19 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
|
|
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
1): ?>
|
|