From 6748b9ea1ad771bbedd76c923814b27b832385bd Mon Sep 17 00:00:00 2001 From: jcode0 Date: Tue, 21 Apr 2026 12:15:02 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20=D0=B4?= =?UTF-8?q?=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ intaro.retailcrm/classes/general/user/RetailCrmUser.php | 6 +++--- intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- intaro.retailcrm/lib/component/constants.php | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7de7e0..57051c8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2026-04-21 v6.7.13 +- Исправлена обработка пустой даты рождения клиента при нормализации + ## 2026-04-09 v6.7.12 - Исправлена передача даты рождения клиента при пустом значении поля в Bitrix diff --git a/intaro.retailcrm/classes/general/user/RetailCrmUser.php b/intaro.retailcrm/classes/general/user/RetailCrmUser.php index c35a2120..b1aa1fec 100644 --- a/intaro.retailcrm/classes/general/user/RetailCrmUser.php +++ b/intaro.retailcrm/classes/general/user/RetailCrmUser.php @@ -160,9 +160,9 @@ private static function getSimpleCustomer(array $arFields): array $customer['address']['city'] = $arFields['PERSONAL_CITY'] ?? null; $customer['address']['text'] = $arFields['PERSONAL_STREET'] ?? null; $customer['address']['index'] = $arFields['PERSONAL_ZIP'] ?? null; - $customer['birthday'] = !empty($arFields['PERSONAL_BIRTHDAY']) - ? new \DateTime($arFields['PERSONAL_BIRTHDAY']) - : null; + if (!empty($arFields['PERSONAL_BIRTHDAY'])) { + $customer['birthday'] = new \DateTime($arFields['PERSONAL_BIRTHDAY']); + } if (mb_strlen($arFields['EMAIL']) < 100) { $customer['email'] = $arFields['EMAIL']; diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 34e9329d..d08347ac 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена передача даты рождения клиента при пустом значении поля в Bitrix +- Исправлена обработка пустой даты рождения клиента при нормализации diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 7b3bef13..ca7fc15c 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.7.12', - 'VERSION_DATE' => '2026-04-09 12:00:00' + 'VERSION' => '6.7.13', + 'VERSION_DATE' => '2026-04-21 12:00:00' ]; diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php index 2250187e..0c303990 100644 --- a/intaro.retailcrm/lib/component/constants.php +++ b/intaro.retailcrm/lib/component/constants.php @@ -18,7 +18,7 @@ */ class Constants { - public const MODULE_VERSION = '6.7.12'; + public const MODULE_VERSION = '6.7.13'; public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null'; public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-'; public const CRM_USERS_MAP = 'crm_users_map'; From d2119719acb47195612838cf7961a868bd300c1a Mon Sep 17 00:00:00 2001 From: Uryvskiy Dima Date: Wed, 22 Apr 2026 22:58:25 +0300 Subject: [PATCH 2/2] Fix style --- intaro.retailcrm/classes/general/user/RetailCrmUser.php | 1 + 1 file changed, 1 insertion(+) diff --git a/intaro.retailcrm/classes/general/user/RetailCrmUser.php b/intaro.retailcrm/classes/general/user/RetailCrmUser.php index b1aa1fec..29d895c9 100644 --- a/intaro.retailcrm/classes/general/user/RetailCrmUser.php +++ b/intaro.retailcrm/classes/general/user/RetailCrmUser.php @@ -160,6 +160,7 @@ private static function getSimpleCustomer(array $arFields): array $customer['address']['city'] = $arFields['PERSONAL_CITY'] ?? null; $customer['address']['text'] = $arFields['PERSONAL_STREET'] ?? null; $customer['address']['index'] = $arFields['PERSONAL_ZIP'] ?? null; + if (!empty($arFields['PERSONAL_BIRTHDAY'])) { $customer['birthday'] = new \DateTime($arFields['PERSONAL_BIRTHDAY']); }