RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-01-31 15:22:01 +03:00
Code Issues Projects Releases Wiki Activity

v.2.2.3 (#28)

Browse Source
This commit is contained in:
Евгений 2017-09-05 13:52:49 +03:00 committed by Alex Lushpai
parent f77294b6d2
commit 8d646a735c
6 changed files with 14 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 @@
## 2017-09-04 v.2.2.3
* Исправлена работа истории
## 2017-09-04 v.2.2.2 ## 2017-09-04 v.2.2.2
* Исправлен инсталлятор * Исправлен инсталлятор
* Изменена передача данных по пользователю * Изменена передача данных по пользователю

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

@ -914,7 +914,7 @@ class RetailCrmHistory
\Bitrix\Sale\Internals\ShipmentTable::update($arDelivery['ID'], array('DELIVERY_ID' => $nowDelivery, 'DELIVERY_NAME' => $arDeliveryID[$nowDelivery]['NAME'])); \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( $shipment = Bitrix\Sale\Internals\ShipmentTable::add(array(
'ORDER_ID' => $orderCrm['externalId'], 'ORDER_ID' => $orderCrm['externalId'],
'STATUS_ID' => 'DN', 'STATUS_ID' => 'DN',

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

@ -950,7 +950,7 @@ class RetailCrmHistory
\Bitrix\Sale\Internals\ShipmentTable::update($arDelivery['ID'], array('DELIVERY_ID' => $nowDelivery, 'DELIVERY_NAME' => $arDeliveryID[$nowDelivery]['NAME'])); \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( $shipment = Bitrix\Sale\Internals\ShipmentTable::add(array(
'ORDER_ID' => $orderCrm['externalId'], 'ORDER_ID' => $orderCrm['externalId'],
'STATUS_ID' => 'DN', 'STATUS_ID' => 'DN',

3
intaro.retailcrm/description.ru
View File

@ -1,2 +1 @@
- Исправлен инсталлятор - Исправлена работа истории
- Изменена передача данных по пользователю

6
intaro.retailcrm/install/index.php
View File

@ -626,6 +626,9 @@ class intaro_retailcrm extends CModule
if (!CModule::IncludeModule("catalog")) { if (!CModule::IncludeModule("catalog")) {
$arResult['errCode'] = 'ERR_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_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); $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")) { if (!CModule::IncludeModule("catalog")) {
$arResult['errCode'] = 'ERR_CATALOG'; $arResult['errCode'] = 'ERR_CATALOG';
} }
if (!CModule::IncludeModule("sale")) {
$arResult['errCode'] = 'ERR_SALE';
}
if (isset($arResult['errCode']) && $arResult['errCode']) { if (isset($arResult['errCode']) && $arResult['errCode']) {
$APPLICATION->IncludeAdminFile( $APPLICATION->IncludeAdminFile(

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

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "2.2.2", "VERSION" => "2.2.3",
"VERSION_DATE" => "2017-09-04 12:00:00" "VERSION_DATE" => "2017-09-05 12:00:00"
); );