From e1c2dcd09dbd4528a1a62867c7c678088bfa22cf Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 28 Mar 2019 14:35:26 +0300 Subject: [PATCH] updated config/retailcrm.json --- CHANGELOG.md | 3 +++ intaro.retailcrm/classes/general/config/retailcrm.json | 8 ++++++-- .../classes/general/history/RetailCrmHistory_v5.php | 2 +- intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd264e48..9ca61f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2019-03-24 v.2.4.5 +* Обновлен конфигурационный файл для валидатора + ## 2019-01-22 v.2.4.4 * Добавлена обработка клиентов с внешним кодом в виде хэша при выгрузке истории изменений diff --git a/intaro.retailcrm/classes/general/config/retailcrm.json b/intaro.retailcrm/classes/general/config/retailcrm.json index dc8c9a4f..222804ea 100644 --- a/intaro.retailcrm/classes/general/config/retailcrm.json +++ b/intaro.retailcrm/classes/general/config/retailcrm.json @@ -19,6 +19,10 @@ "number": { "type": "string" }, + "birthday": { + "type": "datetime", + "format": "Y-m-d" + }, "site": { "type": "string" }, @@ -147,7 +151,7 @@ }, "emailMarketingUnsubscribedAt" : { "type": "datetime", - "format": "Y-m-d" + "format": "Y-m-d H:i:s" }, "source": { "type": "string" @@ -377,7 +381,7 @@ "type": "double", "default": 1, "min": 0, - "decimals": 1 + "decimals": 3 }, "properties": { "type": "skip" diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index 038df1df..ed990169 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -604,7 +604,7 @@ class RetailCrmHistory //optionsLegalDetails if ($optionsLegalDetails[$personType]) { foreach ($optionsLegalDetails[$personType] as $key => $orderProp) { - if (array_key_exists($key, $order['contragent'])) { + if (array_key_exists($key, $order)) { $somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']); self::setProp($somePropValue, $order['contragent'][$key]); } diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 313a5201..d8526c7e 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Добавлена обработка клиентов с внешним кодом в виде хэша при выгрузке истории изменений \ No newline at end of file +- Обновлен конфигурационный файл для валидатора в модуле интеграции \ No newline at end of file diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 2c1fe9cc..5445f123 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "2.4.4", - "VERSION_DATE" => "2019-01-22 12:00:00" + "VERSION" => "2.4.5", + "VERSION_DATE" => "2019-03-28 14:32:00" );