From be1447c6ec503ce8d8fbff0ece511dbf1f203566 Mon Sep 17 00:00:00 2001 From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:20:53 +0300 Subject: [PATCH] =?UTF-8?q?ref=20#89247=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D1=82=D0=B8=D0=BF=20?= =?UTF-8?q?=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B5=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20=20(#285)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- intaro.retailcrm/lib/icml/settingsservice.php | 8 ++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ecc428..d0d8a4bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2023-04-10 v.6.3.1 +- Добавлена валидация свойств товаров и торговых предложений в настройках экспорта + ## 2023-04-06 v.6.3.0 - Добавлен функционал передачи данных о содержимом корзины в систему diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 7620a546..a8328f44 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Добавлен функционал передачи данных о содержимом корзины в систему +- Добавлена валидация свойств товаров и торговых предложений в настройках экспорта diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 82d6d674..17653d7d 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.3.0', - 'VERSION_DATE' => '2023-04-06 17:00:00' + 'VERSION' => '6.3.1', + 'VERSION_DATE' => '2023-04-10 10:00:00' ]; diff --git a/intaro.retailcrm/lib/icml/settingsservice.php b/intaro.retailcrm/lib/icml/settingsservice.php index 7bee56a0..12c585b8 100644 --- a/intaro.retailcrm/lib/icml/settingsservice.php +++ b/intaro.retailcrm/lib/icml/settingsservice.php @@ -556,6 +556,10 @@ class SettingsService $dbSkuProperties = CIBlock::GetProperties($iblockOffer['IBLOCK_ID'], []); while ($prop = $dbSkuProperties->Fetch()) { + if ($prop['PROPERTY_TYPE'] === 'L' && $prop['MULTIPLE'] === 'Y') { + continue; + } + $propertiesSKU[] = $prop; } } @@ -610,6 +614,10 @@ class SettingsService $iblockResult = CIBlock::GetProperties($iblockId, []); while ($prop = $iblockResult->Fetch()) { + if ($prop['PROPERTY_TYPE'] === 'L' && $prop['MULTIPLE'] === 'Y') { + continue; + } + $propertiesProduct[] = $prop; }