RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-21 09:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62 from sergeygw1990/master

Browse Source 
v2.4.5
This commit is contained in:
Alex Lushpai 2019-03-28 16:30:34 +03:00 committed by GitHub
commit c62fe78703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2019-03-24 v.2.4.5
* Обновлен конфигурационный файл для валидатора
## 2019-01-22 v.2.4.4 ## 2019-01-22 v.2.4.4
* Добавлена обработка клиентов с внешним кодом в виде хэша при выгрузке истории изменений * Добавлена обработка клиентов с внешним кодом в виде хэша при выгрузке истории изменений

8
intaro.retailcrm/classes/general/config/retailcrm.json
View File

@ -19,6 +19,10 @@
"number": { "number": {
"type": "string" "type": "string"
}, },
"birthday": {
"type": "datetime",
"format": "Y-m-d"
},
"site": { "site": {
"type": "string" "type": "string"
}, },
@ -147,7 +151,7 @@
}, },
"emailMarketingUnsubscribedAt" : { "emailMarketingUnsubscribedAt" : {
"type": "datetime", "type": "datetime",
"format": "Y-m-d" "format": "Y-m-d H:i:s"
}, },
"source": { "source": {
"type": "string" "type": "string"
@ -377,7 +381,7 @@
"type": "double", "type": "double",
"default": 1, "default": 1,
"min": 0, "min": 0,
"decimals": 1 "decimals": 3
}, },
"properties": { "properties": {
"type": "skip" "type": "skip"

2
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View File

@ -604,7 +604,7 @@ class RetailCrmHistory
//optionsLegalDetails //optionsLegalDetails
if ($optionsLegalDetails[$personType]) { if ($optionsLegalDetails[$personType]) {
foreach ($optionsLegalDetails[$personType] as $key => $orderProp) { 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']); $somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']);
self::setProp($somePropValue, $order['contragent'][$key]); self::setProp($somePropValue, $order['contragent'][$key]);
} }

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Добавлена обработка клиентов с внешним кодом в виде хэша при выгрузке истории изменений - Обновлен конфигурационный файл для валидатора в модуле интеграции

4
intaro.retailcrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "2.4.4", "VERSION" => "2.4.5",
"VERSION_DATE" => "2019-01-22 12:00:00" "VERSION_DATE" => "2019-03-28 14:32:00"
); );