From e0d5250dd3593138df312d8f468fc4b9e89585cb Mon Sep 17 00:00:00 2001 From: jcode0 Date: Thu, 9 Apr 2026 12:00:27 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В getSimpleCustomer исправлена проверка PERSONAL_BIRTHDAY: при пустом значении DateTime больше не создается. Это предотвращает отправку текущей даты как даты рождения при редактировании клиента. --- intaro.retailcrm/classes/general/user/RetailCrmUser.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/intaro.retailcrm/classes/general/user/RetailCrmUser.php b/intaro.retailcrm/classes/general/user/RetailCrmUser.php index ea3501b1..c35a2120 100644 --- a/intaro.retailcrm/classes/general/user/RetailCrmUser.php +++ b/intaro.retailcrm/classes/general/user/RetailCrmUser.php @@ -160,10 +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'] = isset($arFields['PERSONAL_BIRTHDAY']) - ? new \DateTime($arFields['PERSONAL_BIRTHDAY']) - : null - ; + $customer['birthday'] = !empty($arFields['PERSONAL_BIRTHDAY']) + ? new \DateTime($arFields['PERSONAL_BIRTHDAY']) + : null; if (mb_strlen($arFields['EMAIL']) < 100) { $customer['email'] = $arFields['EMAIL']; From bd21d06354d6eb584a0483249401cf22768b1d43 Mon Sep 17 00:00:00 2001 From: jcode0 Date: Tue, 14 Apr 2026 12:19:05 +0300 Subject: [PATCH 2/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=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=83=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B2=20Bitrix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлена проверка пустого PERSONAL_BIRTHDAY перед созданием DateTime. Выполнен бамп версии до 6.7.12. --- CHANGELOG.md | 3 +++ intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- intaro.retailcrm/lib/component/constants.php | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf7c03a..eb7de7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2026-04-09 v6.7.12 +- Исправлена передача даты рождения клиента при пустом значении поля в Bitrix + ## 2026-04-01 v6.7.11 - Бамп версии diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index c831c8da..34e9329d 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 79f71cc2..7b3bef13 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.7.11', - 'VERSION_DATE' => '2026-04-01 12:30:00' + 'VERSION' => '6.7.12', + 'VERSION_DATE' => '2026-04-09 12:00:00' ]; diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php index 22412a1d..2250187e 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.11'; + public const MODULE_VERSION = '6.7.12'; public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null'; public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-'; public const CRM_USERS_MAP = 'crm_users_map';