diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php index 24c35aa1..b563058b 100644 --- a/intaro.retailcrm/export/export_setup.php +++ b/intaro.retailcrm/export/export_setup.php @@ -494,9 +494,8 @@ if ($STEP === 1) {


-

-
-
+   +


  diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index ed906f1e..7168de8f 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -966,12 +966,6 @@ class intaro_retailcrm extends CModule $filename = $_POST['SETUP_FILE_NAME']; } - if (!isset($_POST['TYPE_LOADING'])) { - $typeLoading = 0; - } else { - $typeLoading = $_POST['TYPE_LOADING']; - } - if (!isset($_POST['maxOffersValue'])) { $maxOffers = null; } else { @@ -984,10 +978,6 @@ class intaro_retailcrm extends CModule $profileName = $_POST['SETUP_PROFILE_NAME']; } - if ($typeLoading !== 'none' && $profileName == '') { - $arResult['errCode'] = 'ERR_FIELDS_PROFILE'; - } - if ($filename === '') { $arResult['errCode'] = 'ERR_FIELDS_FILE'; } @@ -1098,7 +1088,7 @@ class intaro_retailcrm extends CModule $agentId = null; - if ($typeLoading === 'agent') { + if (isset($_POST['TYPE_LOADING'])) { $dateAgent = new DateTime(); $intAgent = new DateInterval('PT60S'); // PT60S - 60 sec; $dateAgent->add($intAgent); diff --git a/intaro.retailcrm/lang/en/install/step5.php b/intaro.retailcrm/lang/en/install/step5.php index fc9116d5..0d1dc1c6 100644 --- a/intaro.retailcrm/lang/en/install/step5.php +++ b/intaro.retailcrm/lang/en/install/step5.php @@ -12,9 +12,7 @@ $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 ['LOAD_PERIOD'] = 'Export catalog periodically'; -$MESS ['NOT_LOADING'] = 'No'; -$MESS ['AGENT_LOADING'] = 'By Agent every 24 hours'; +$MESS ['AGENT_LOADING'] = 'Export catalog periodically (By Agent every 24 hours)'; $MESS ['LOAD_NOW'] = 'Export now'; $MESS ['LOAD_NOW_MSG'] = 'The generation will start after you click "Finish installation". This may take some time'; diff --git a/intaro.retailcrm/lang/ru/install/step5.php b/intaro.retailcrm/lang/ru/install/step5.php index 432809d3..dbe277e0 100644 --- a/intaro.retailcrm/lang/ru/install/step5.php +++ b/intaro.retailcrm/lang/ru/install/step5.php @@ -12,9 +12,7 @@ $MESS ['PAYMENT_Y'] = 'Оплачен'; $MESS ['PAYMENT_N'] = 'Не оплачен'; $MESS ['CANCELED'] = 'Флаг «Отменен»'; $MESS ['INFO_1'] = ' Задайте соответствие между справочниками 1C-Битрикс и справочниками RetailCRM.'; -$MESS ['LOAD_PERIOD'] = 'Выгружать каталог периодически'; -$MESS ['NOT_LOADING'] = 'Нет'; -$MESS ['AGENT_LOADING'] = 'Агентом каждые 24 часа'; +$MESS ['AGENT_LOADING'] = 'Выгружать каталог периодически (Агентом каждые 24 часа)'; $MESS ['LOAD_NOW'] = 'Выгрузить сейчас'; $MESS ['LOAD_NOW_MSG'] = 'Генерация начнется после нажатия "Завершить установку". Это может занять некоторое время'; $MESS ['PROFILE_NAME'] = 'Имя профиля:';