RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-29 00:36:07 +03:00
Code Issues Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
gorokh 2019-12-20 14:22:53 +03:00
parent 0956021d8c
commit a1bce2bda0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -974,6 +974,10 @@ class RetailCrmHistory
$orders[$change['order']['id']] = $change['order']; $orders[$change['order']['id']] = $change['order'];
} }
if ($change['field'] == 'number') {
$orders[$change['order']['id']]['number'] = $change['newValue'];
}
if ($change['item']) { if ($change['item']) {
if ($orders[$change['order']['id']]['items'][$change['item']['id']]) { if ($orders[$change['order']['id']]['items'][$change['item']['id']]) {
$orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']); $orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']);

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- При обработке истории сбор по дублирующим товарам заменен на "externalId" - Добавлена обработка изменения номера заказа по истории

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

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "2.5.3", "VERSION" => "5.2.4",
"VERSION_DATE" => "2019-11-1 15:10:00" "VERSION_DATE" => "2019-12-10 15:03:00"
); );