RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-19 00:51:03 +00:00
Code Issues Projects Releases Wiki Activity

v.2.2.2.1 install fix, devivery in history fix

Browse source
This commit is contained in:
tishevgeniy 2017-09-04 17:56:36 +03:00
parent 3f07eadf3b
commit 285f845d02
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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']));
}
}
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',

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']));
}
}
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',

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

@ -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(