v.2.2.3 (#28)

retailcrm · Sep 5, 2017 · 8d646a7 · 8d646a7
1 parent f77294b
commit 8d646a7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -914,7 +914,7 @@ public static function shipmentUpdate($orderCrm, $optionsDelivTypes, $accountNum
                         \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
@@ -950,7 +950,7 @@ public static function shipmentUpdate($orderCrm, $optionsDelivTypes, $accountNum
                         \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
@@ -1,2 +1 @@
-- Исправлен инсталлятор
-- Изменена передача данных по пользователю
+- Исправлена работа истории
diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php
@@ -626,6 +626,9 @@ function DoInstall()
             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 @@ function DoInstall()
             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
@@ -1,5 +1,5 @@
 <?
 $arModuleVersion = array(
-    "VERSION" => "2.2.2",
-    "VERSION_DATE" => "2017-09-04 12:00:00"
+    "VERSION" => "2.2.3",
+    "VERSION_DATE" => "2017-09-05 12:00:00"
 );