diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fd91e5..39b49cee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2017-09-04 v.2.2.3 +* Исправлена работа истории + ## 2017-09-04 v.2.2.2 * Исправлен инсталлятор * Изменена передача данных по пользователю diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php index 240c5887..ce8f92a1 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php @@ -914,7 +914,7 @@ class RetailCrmHistory \Bitrix\Sale\Internals\ShipmentTable::update($arDelivery['ID'], array('DELIVERY_ID' => $nowDelivery, 'DELIVERY_NAME' => $arDeliveryID[$nowDelivery]['NAME'])); } } - if ($cnt = 1 && $arDelivery['DELIVERY_ID'] == 0) { + if ($cnt == 1 && $arDelivery['DELIVERY_ID'] == 0) { $shipment = Bitrix\Sale\Internals\ShipmentTable::add(array( 'ORDER_ID' => $orderCrm['externalId'], 'STATUS_ID' => 'DN', diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index b4916b9f..628051fa 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -950,7 +950,7 @@ class RetailCrmHistory \Bitrix\Sale\Internals\ShipmentTable::update($arDelivery['ID'], array('DELIVERY_ID' => $nowDelivery, 'DELIVERY_NAME' => $arDeliveryID[$nowDelivery]['NAME'])); } } - if ($cnt = 1 && $arDelivery['DELIVERY_ID'] == 0) { + if ($cnt == 1 && $arDelivery['DELIVERY_ID'] == 0) { $shipment = Bitrix\Sale\Internals\ShipmentTable::add(array( 'ORDER_ID' => $orderCrm['externalId'], 'STATUS_ID' => 'DN', diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 78aa0d69..b06bbccf 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1,2 +1 @@ -- Исправлен инсталлятор -- Изменена передача данных по пользователю \ No newline at end of file +- Исправлена работа истории diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index 7435a771..1bea47a9 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -626,6 +626,9 @@ class intaro_retailcrm extends CModule if (!CModule::IncludeModule("catalog")) { $arResult['errCode'] = 'ERR_CATALOG'; } + if (!CModule::IncludeModule("sale")) { + $arResult['errCode'] = 'ERR_SALE'; + } $api_host = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_HOST_OPTION, 0); $api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0); @@ -703,6 +706,9 @@ class intaro_retailcrm extends CModule if (!CModule::IncludeModule("catalog")) { $arResult['errCode'] = 'ERR_CATALOG'; } + if (!CModule::IncludeModule("sale")) { + $arResult['errCode'] = 'ERR_SALE'; + } if (isset($arResult['errCode']) && $arResult['errCode']) { $APPLICATION->IncludeAdminFile( diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 23500bda..3a6152a6 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "2.2.2", - "VERSION_DATE" => "2017-09-04 12:00:00" + "VERSION" => "2.2.3", + "VERSION_DATE" => "2017-09-05 12:00:00" );