RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-08 11:42:03 +00:00
Code Issues Projects Releases Wiki Activity

ref #91590 переработана логика вывода ошибок

Browse source
This commit is contained in:
Ivan Chaplygin 2023-08-24 18:06:44 +03:00
parent 48f84d0d12
commit ec7cdc55d0
2 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
intaro.retailcrm/lang/ru/options.php
View file

@ -28,7 +28,7 @@ $MESS ['INTEGRATION_PAYMENT_LIST'] = 'Для интеграционных опл
$MESS ['INTEGRATIONS'] = ' (интеграционная)';
$MESS ['ERR_CURRENCY_SITES'] = 'Базовая валюта отличается от валюты магазина в CRM!';
$MESS ['ERR_COUNT_SITES'] = 'По введенному ключу апи доступно больше магазинов, чем существует в CMS!';
$MESS ['ERR_COUNT_SITES'] = 'По введенному ключу апи доступно больше одного магазина!';
$MESS ['ICRM_OPTIONS_SUBMIT_TITLE'] = 'Сохранить настройки';
$MESS ['ICRM_OPTIONS_SUBMIT_VALUE'] = 'Сохранить';

38
intaro.retailcrm/options.php
View file

@ -1061,21 +1061,21 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
$currencyOption = COption::GetOptionString($mid, $CRM_CURRENCY, 0) ?: $baseCurrency;
$currencyList = \Bitrix\Currency\CurrencyManager::getCurrencyList();
$errorText = [];
$errorsText = [];
foreach ($arResult['sitesList'] as $site) {
if ($site['currency'] !== $baseCurrency) {
$errorText[] = GetMessage('ERR_CURRENCY_SITES') . '(' . $site['name'] . ')';
$errorsText[] = GetMessage('ERR_CURRENCY_SITES') . '(' . $site['name'] . ')';
}
}
$errCountSites = null;
if (count($arResult['arSites']) < count($arResult['sitesList'])) {
$errorText[] = GetMessage('ERR_COUNT_SITES');
if (count($arResult['arSites']) === 1 && count($arResult['sitesList']) > 1) {
$errorsText[] = GetMessage('ERR_COUNT_SITES');
}
if (preg_match('/&errc=ERR_(.*)/is', $uri, $matches)){
$errorsText[] = $matches[1];
}
$customFields = [['code' => '__default_empty_value__', 'name' => GetMessage('SELECT_VALUE')]];
$crmCouponFieldOption = COption::GetOptionString($mid, $CRM_COUPON_FIELD, 0) ?: null;
@ -1488,23 +1488,15 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<td width="50%" class="adm-detail-content-cell-r"><input type="text" id="api_key" name="api_key" value="<?php echo $api_key; ?>"></td>
</tr>
<?php if ($errCurrency): ?>
<?php if ($errorsText): ?>
<tr align="center">
<td colspan="2">
<strong style="color:red" >
<?php echo GetMessage($errCurrency['errorText']) . $errCurrency['site']; ?>
</strong>
</td>
</tr>
<?php endif; ?>
<?php if ($errCountSites): ?>
<tr align="center">
<td colspan="2">
<strong style="color:red" >
<?php echo GetMessage($errCountSites); ?>
</strong>
</td>
<?php foreach ($errorsText as $error): ?>
<td colspan="2">
<strong style="color:red" >
<?php echo $error; ?>
</strong>
</td>
<?php endforeach; ?>
</tr>
<?php endif; ?>