|
diff --git a/intaro.retailcrm/lang/en/install/index.php b/intaro.retailcrm/lang/en/install/index.php
index f9b50076..fe8e0a65 100644
--- a/intaro.retailcrm/lang/en/install/index.php
+++ b/intaro.retailcrm/lang/en/install/index.php
@@ -18,3 +18,4 @@ $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';
$MESS ['CRM_SITES_ERROR'] = 'Failed to get list of CRM stores, please try another API key or contact RetailCRM support.';
+$MESS ['ERR_403'] = 'Insufficient permissions for API key. The module must be added for it to work correctly: %s';
diff --git a/intaro.retailcrm/lang/en/options.php b/intaro.retailcrm/lang/en/options.php
index bcf743dd..9ac239eb 100644
--- a/intaro.retailcrm/lang/en/options.php
+++ b/intaro.retailcrm/lang/en/options.php
@@ -27,8 +27,10 @@ $MESS ['ORDER_NUMBER'] = 'Order numbers: ';
$MESS ['ORDER_UPLOAD_INFO'] = 'Click "Start uploading" to upload all the orders . Or list the required order IDs separated by commas, intervals or dashes. For example: 1, 3, 5-10, 12, 13... etc.';
$MESS ['ICRM_OPTIONS_SUBMIT_TITLE'] = 'Save settings';
$MESS ['ICRM_OPTIONS_SUBMIT_VALUE'] = 'Save';
+$MESS ['ERR_403_LABEL'] = 'The module must be added for it to work correctly: %s';
$MESS ['ERR_404'] = 'CRM address may be incorrect.';
-$MESS ['ERR_403'] = 'Wrong apiKey.';
+$MESS ['ERR_403'] = 'Insufficient permissions for API key. %s';
+$MESS ['ERR_403_CUSTOM'] = 'Not enough permissions for API key!';
$MESS ['ERR_JSON'] = 'Invalid data was received from CRM, check data books settings';
$MESS ['ERR_0'] = 'Server connection timeout error.';
$MESS ['ICRM_OPTIONS_OK'] = 'Changes are successfully saved.';
diff --git a/intaro.retailcrm/lang/ru/install/index.php b/intaro.retailcrm/lang/ru/install/index.php
index ff079619..385abebc 100644
--- a/intaro.retailcrm/lang/ru/install/index.php
+++ b/intaro.retailcrm/lang/ru/install/index.php
@@ -56,4 +56,4 @@ $MESS ['UF_LP_ID_INTARO_TITLE'] = 'Номер аккаунта в програм
$MESS['IBLOCK_NOT_SELECTED'] = 'Не выбрано ни одного инфоблока для экспорта';
$MESS['TARGET_DIR_DOESNT_EXIST'] = 'Целевая директория не существует';
$MESS['UF_SUBSCRIBE_USER_EMAIL_TITLE'] = 'Согласен на рекламно-информационные рассылки';
-
+$MESS ['ERR_403'] = 'Недостаточно прав для API ключа. Для корректной работы модуля необходимо добавить: %s';
diff --git a/intaro.retailcrm/lang/ru/options.php b/intaro.retailcrm/lang/ru/options.php
index 818d4087..0605b7fe 100644
--- a/intaro.retailcrm/lang/ru/options.php
+++ b/intaro.retailcrm/lang/ru/options.php
@@ -40,8 +40,10 @@ $MESS ['CRM_STORE'] = 'CRM магазин: ';
$MESS ['ICRM_OPTIONS_SUBMIT_TITLE'] = 'Сохранить настройки';
$MESS ['ICRM_OPTIONS_SUBMIT_VALUE'] = 'Сохранить';
+$MESS ['ERR_403_LABEL'] = 'Для корректной работы модуля необходимо добавить: %s';
$MESS ['ERR_404'] = 'Возможно не верно введен адрес CRM.';
-$MESS ['ERR_403'] = 'Неверный apiKey.';
+$MESS ['ERR_403'] = 'Недостаточно прав для API ключа. %s';
+$MESS ['ERR_403_CUSTOM'] = 'Недостаточно прав для API ключа!';
$MESS ['ERR_JSON'] = 'Получены некорректные данные из CRM, проверьте данные справочников в настройках';
$MESS ['ERR_0'] = 'Превышено время ожидания ответа от сервера.';
$MESS ['ICRM_OPTIONS_OK'] = 'Изменения успешно сохранены.';
diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php
index 58898a9e..1763b715 100644
--- a/intaro.retailcrm/lib/component/constants.php
+++ b/intaro.retailcrm/lib/component/constants.php
@@ -111,4 +111,20 @@ class Constants
public const SYNC_INTEGRATION_PAYMENT = 'sync_integration_payment';
public const CRM_PART_SUBSTITUTED_PAYMENT_CODE = '-not-integration';
public const CRM_SUBSTITUTION_PAYMENT_LIST = 'substitution_payment';
+ public const REQUIRED_API_SCOPES = [
+ 'order_read' => 'order_read',
+ 'order_write' => 'order_write',
+ 'customer_read' => 'customer_read',
+ 'customer_write' => 'customer_write',
+ 'store_read' => 'store_read',
+ 'store_write' => 'store_write',
+ 'reference_read' => 'reference_read',
+ 'reference_write' => 'reference_write',
+ 'integration_read' => 'integration_read',
+ 'integration_write' => 'integration_write',
+ ];
+ public const REQUIRED_API_SCOPES_CUSTOM = [
+ 'custom_fields_read' => 'custom_fields_read',
+ 'custom_fields_write' => 'custom_fields_write'
+ ];
}
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index b7511160..569ad4e2 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -88,6 +88,7 @@ if (!empty($_GET['ok']) && $_GET['ok'] === 'Y') {
}
$arResult = [];
+$enabledCustom = false;
if (file_exists($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/intaro.retailcrm/classes/general/config/options.xml')) {
$options = simplexml_load_file($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/intaro.retailcrm/classes/general/config/options.xml');
@@ -102,9 +103,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/intaro.retailcrm/cl
$type["NAME"] = $APPLICATION->ConvertCharset((string) $field, 'utf-8', SITE_CHARSET);
$type["ID"] = (string) $field["id"];
- if ($field["group"] === 'custom') {
- $arResult['customFields'][] = $type;
- } elseif (!$field["group"]) {
+ if (!$field["group"]) {
$arResult['orderProps'][] = $type;
} else {
$groups = explode(",", (string) $field["group"]);
@@ -400,16 +399,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
$legalDetailsArr[$orderType['ID']] = $_legalDetailsArr;
}
- $customFieldsArr = [];
-
- foreach ($orderTypesList as $orderType) {
- $_customFieldsArr = [];
- foreach ($arResult['customFields'] as $custom) {
- $_customFieldsArr[$custom['ID']] = htmlspecialchars(trim($_POST['custom-fields-' . $custom['ID'] . '-' . $orderType['ID']]));
- }
- $customFieldsArr[$orderType['ID']] = $_customFieldsArr;
- }
-
//contragents type list
$contragentTypeArr = [];
@@ -818,11 +807,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
$CRM_LEGAL_DETAILS,
serialize(RCrmActions::clearArr(is_array($legalDetailsArr) ? $legalDetailsArr : []))
);
- COption::SetOptionString(
- $mid,
- $CRM_CUSTOM_FIELDS,
- serialize(RCrmActions::clearArr(is_array($customFieldsArr) ? $customFieldsArr : []))
- );
COption::SetOptionString(
$mid,
$CRM_ORDER_NUMBERS,
@@ -1079,6 +1063,19 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
// Prepare crm lists
try {
+ $credentialsApi = $api->getCredentials()->getResponseBody();
+ $requiredApiScopes = Constants::REQUIRED_API_SCOPES;
+
+ if (ConfigProvider::getCustomFieldsStatus() === 'Y') {
+ $requiredApiScopes = array_merge($requiredApiScopes, Constants::REQUIRED_API_SCOPES_CUSTOM);
+ }
+
+ $residualRight = array_diff($requiredApiScopes, $credentialsApi['scopes']);
+
+ if (count($residualRight) !== 0) {
+ throw new InvalidArgumentException(sprintf(GetMessage('ERR_403_LABEL'), implode(', ', $residualRight)));
+ }
+
$arResult['orderTypesList'] = $api->orderTypesList()->orderTypes;
$arResult['deliveryTypesList'] = $api->deliveryTypesList()->deliveryTypes;
$arResult['deliveryServicesList'] = $api->deliveryServicesList()->deliveryServices;
@@ -1089,16 +1086,22 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
$arResult['sitesList'] = $APPLICATION->ConvertCharsetArray($api->sitesList()->sites, 'utf-8', SITE_CHARSET);
$arResult['inventoriesList'] = $APPLICATION->ConvertCharsetArray($api->storesList()->stores, 'utf-8', SITE_CHARSET);
$arResult['priceTypeList'] = $APPLICATION->ConvertCharsetArray($api->pricesTypes()->priceTypes, 'utf-8', SITE_CHARSET);
- $arResult['crmCustomOrderFields'] = $APPLICATION->ConvertCharsetArray(
+ $arResult['crmCustomOrderFields'] = [];
+ $arResult['crmCustomUserFields'] = [];
+
+ if (count(array_diff(Constants::REQUIRED_API_SCOPES_CUSTOM, $credentialsApi['scopes'])) === 0) {
+ $arResult['crmCustomOrderFields'] = $APPLICATION->ConvertCharsetArray(
$api->customFieldsList(['entity' => 'order', 'type' => ['string','text', 'numeric', 'boolean', 'date']], 250)->customFields,
'utf-8',
SITE_CHARSET
- );
- $arResult['crmCustomUserFields'] = $APPLICATION->ConvertCharsetArray(
+ );
+ $arResult['crmCustomUserFields'] = $APPLICATION->ConvertCharsetArray(
$api->customFieldsList(['entity' => 'customer', 'type' => ['string', 'text', 'integer', 'numeric', 'boolean', 'date']], 250)->customFields,
'utf-8',
SITE_CHARSET
- );
+ );
+ $enabledCustom = true;
+ }
$orderMethods = [];
$getOrderMethods = $api->orderMethodsList();
@@ -1123,7 +1126,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
echo CAdminMessage::ShowMessage(GetMessage('ERR_' . $e->getCode()));
} catch (InvalidArgumentException $e) {
$badKey = true;
- echo CAdminMessage::ShowMessage(GetMessage('ERR_403'));
+ echo CAdminMessage::ShowMessage(['MESSAGE' => sprintf(GetMessage('ERR_403'), $e->getMessage()), 'HTML' => true]);
} catch (\RetailCrm\Exception\InvalidJsonException $e) {
$badJson = true;
echo CAdminMessage::ShowMessage(GetMessage('ERR_JSON'));
@@ -2201,34 +2204,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
|
- 0): ?>
-