diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b188aa..7ccfdc52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2018-03-22 v.2.3.5 +* В настройку экспорта добавлена настройка свойств типа "справочник"(highloadblock) +* Добавлена проверка необходимости резервации товаров при выгрузке заказов из retailCRM +* Исправлен вызов рекурсивного метода в RCrmActions +* Добавлены недостающие поля retailcrm.json + ## 2018-02-27 v.2.3.4 * Добавлена передача веса и габаритов в заказе * Добавлена проверка существования fuser у корзины товаров перед сохранением diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php index bc1c3b6a..75c072a1 100644 --- a/intaro.retailcrm/classes/general/RCrmActions.php +++ b/intaro.retailcrm/classes/general/RCrmActions.php @@ -276,7 +276,7 @@ class RCrmActions } if (!is_array($string)) { - $string = self::unserializeRecursive($string); + $string = self::unserializeArrayRecursive($string); } return $string; diff --git a/intaro.retailcrm/classes/general/config/retailcrm.json b/intaro.retailcrm/classes/general/config/retailcrm.json index a5ed61ae..dc8c9a4f 100644 --- a/intaro.retailcrm/classes/general/config/retailcrm.json +++ b/intaro.retailcrm/classes/general/config/retailcrm.json @@ -131,7 +131,7 @@ "type": "string" }, "managerId": { - "type": "int" + "type": "int" }, "browserId": { "type": "string" @@ -141,6 +141,28 @@ }, "personalDiscount": { "type": "string" + }, + "sex": { + "type": "string" + }, + "emailMarketingUnsubscribedAt" : { + "type": "datetime", + "format": "Y-m-d" + }, + "source": { + "type": "string" + }, + "medium": { + "type": "string" + }, + "campaign": { + "type": "string" + }, + "keyword": { + "type": "string" + }, + "content": { + "type": "string" } }, "orders": { @@ -297,6 +319,14 @@ "bankAccount": { "type": "string" }, + "shipmentDate": { + "type": "datetime", + "format": "Y-m-d" + }, + "shipped": { + "type": "bool", + "default": false + }, "orderType": { "type": "string" }, @@ -439,6 +469,36 @@ }, "custom": { "type": "string" + }, + "vatRate": { + "type": "string" + }, + "name": { + "type": "string" + }, + "value": { + "type": "string" + }, + "xmlId": { + "type": "string" + }, + "netCost": { + "type": "double" + }, + "source": { + "type": "string" + }, + "medium": { + "type": "string" + }, + "campaign": { + "type": "string" + }, + "keyword": { + "type": "string" + }, + "content": { + "type": "string" } } } \ No newline at end of file diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index 8b2b9e06..8f9d2f7d 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -697,7 +697,7 @@ class RetailCrmHistory $orderCrm = RCrmActions::apiMethod($api, 'orderGet', __METHOD__, $order['id']); } if ($orderCrm) { - self::paymentsUpdate($newOrder, $orderCrm['order'], $api, $newHistoryPayments); + self::paymentsUpdate($newOrder, $orderCrm['order'], $newHistoryPayments); } } @@ -1036,7 +1036,7 @@ class RetailCrmHistory if (!$shipment->isSystem()) { $reserved = false; - if ($shipment->isReserved()) { + if ($shipment->needReservation()) { $reserved = true; } @@ -1094,12 +1094,11 @@ class RetailCrmHistory * * @param object $order * @param array $paymentsCrm - * @param object $api * @param array $newHistoryPayments * * @return void */ - public static function paymentsUpdate($order, $paymentsCrm, $api, &$newHistoryPayments = array()) + public static function paymentsUpdate($order, $paymentsCrm, &$newHistoryPayments = array()) { $optionsPayTypes = array_flip(unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_PAYMENT_TYPES, 0))); $optionsPayment = array_flip(unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_PAYMENT, 0))); diff --git a/intaro.retailcrm/classes/general/icml/RetailCrmICML.php b/intaro.retailcrm/classes/general/icml/RetailCrmICML.php index 782d3865..8d8c498d 100644 --- a/intaro.retailcrm/classes/general/icml/RetailCrmICML.php +++ b/intaro.retailcrm/classes/general/icml/RetailCrmICML.php @@ -1,4 +1,8 @@ PrepareValue($arCategory["ID"]) . "\"" - . ( intval($arCategory["IBLOCK_SECTION_ID"] ) > 0 ? - " parentId=\"" . $this->PrepareValue($arCategory["IBLOCK_SECTION_ID"]) . "\"" - :"") - . ">" - . $this->PrepareValue($arCategory["NAME"]) - . "\n"; + PrepareValue($arCategory["ID"]) . "\"" + . ( intval($arCategory["IBLOCK_SECTION_ID"] ) > 0 ? + " parentId=\"" . $this->PrepareValue($arCategory["IBLOCK_SECTION_ID"]) . "\"" + :"") + . ">" + . $this->PrepareValue($arCategory["NAME"]) + . "\n"; } @@ -247,10 +251,29 @@ class RetailCrmICML ); foreach ($this->iblocks as $key => $id) { + $highloadblockSkuProps = array(); + $highloadblockProductProps = array(); + + $productProps = CIBlockproperty::GetList(array(), array("IBLOCK_ID" => $id)); + while ($arrProductProps = $productProps->Fetch()) { + + if ($arrProductProps["USER_TYPE"] == 'directory') { + $highloadblockProductProps[$arrProductProps['CODE']] = $arrProductProps; + } + } + // Get Info by infoblocks $iblock['IBLOCK_DB'] = CIBlock::GetByID($id)->Fetch(); $iblockOffer = CCatalogSKU::GetInfoByProductIBlock($id); + $skuProps = CIBlockproperty::GetList(array(), array("IBLOCK_ID" => $iblockOffer['IBLOCK_ID'])); + while ($arrSkuProps = $skuProps->Fetch()) { + + if ($arrSkuProps["USER_TYPE"] == 'directory') { + $highloadblockSkuProps[$arrSkuProps['CODE']] = $arrSkuProps; + } + } + $arSelect = Array ( "ID", "LID", @@ -388,6 +411,13 @@ class RetailCrmICML $resPropertiesProduct[$key] *= $this->measurement[$this->propertiesUnitProduct[$id][$key]]; $resPropertiesProduct[$key . "_UNIT"] = $this->measurementLink[$this->propertiesUnitProduct[$id][$key]]; } + if (isset($highloadblockProductProps[$propProduct])) { + $propVal = $this->getHBprop($highloadblockProductProps[$propProduct], $offer["PROPERTY_" . $propProduct . "_VALUE"]); + $tableName = $highloadblockProductProps[$propProduct]['USER_TYPE_SETTINGS']['TABLE_NAME']; + $field = $this->highloadblockSkuProperties[$tableName][$iblockOffer['IBLOCK_ID']][$key]; + + $resPropertiesProduct[$key] = $propVal[$field]; + } } } @@ -432,6 +462,12 @@ class RetailCrmICML $offer['_PROP_' . $key] *= $this->measurement[$this->propertiesUnitSKU[$id][$key]]; $offer['_PROP_' . $key . "_UNIT"] = $this->measurementLink[$this->propertiesUnitSKU[$id][$key]]; } + if (isset($highloadblockSkuProps[$propSKU])) { + $propVal = $this->getHBprop($highloadblockSkuProps[$propSKU], $offer["PROPERTY_" . $propSKU . "_VALUE"]); + $tableName = $highloadblockSkuProps[$propSKU]['USER_TYPE_SETTINGS']['TABLE_NAME']; + $field = $this->highloadblockSkuProperties[$tableName][$id][$key]; + $offer['_PROP_' . $key] = $propVal[$field]; + } } } @@ -555,5 +591,24 @@ class RetailCrmICML $offer.= "\n"; return $offer; - } + } + + private function getHBprop($hbProp, $xml_id) + { + CModule::IncludeModule('highloadblock'); + $hlblockArr = \Bitrix\Highloadblock\HighloadBlockTable::getList([ + 'filter' => ['=TABLE_NAME' => $hbProp['USER_TYPE_SETTINGS']['TABLE_NAME']] + ])->fetch(); + + $hlblock = HL\HighloadBlockTable::getById($hlblockArr["ID"])->fetch(); + $entity = HL\HighloadBlockTable::compileEntity($hlblock); + $entityClass = $entity->getDataClass(); + + $result = $entityClass::getList(array( + 'select' => array('*'), + 'filter' => array('UF_XML_ID' => $xml_id) + )); + + return $result->fetch(); + } } \ No newline at end of file diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php index 67f1bca3..f0777ee0 100644 --- a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php +++ b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php @@ -147,17 +147,21 @@ class RetailCrmOrder $order['items'][] = $item; - $dimensions = RCrmActions::unserializeArrayRecursive($product['DIMENSIONS']); - $width += $dimensions['WIDTH']; - $height += $dimensions['HEIGHT']; - $length += $dimensions['LENGTH']; - $weight += $product['WEIGHT']; + if ($send) { + $dimensions = RCrmActions::unserializeArrayRecursive($product['DIMENSIONS']); + $width += $dimensions['WIDTH']; + $height += $dimensions['HEIGHT']; + $length += $dimensions['LENGTH']; + $weight += $product['WEIGHT']; + } } - $order['width'] = $width; - $order['height'] = $height; - $order['length'] = $length; - $order['weight'] = $weight; + if ($send) { + $order['width'] = $width; + $order['height'] = $height; + $order['length'] = $length; + $order['weight'] = $weight; + } //payments $payments = array(); diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 267eded4..353a2078 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1,5 +1,4 @@ -- Добавлена передача веса и габаритов в заказе -- Добавлена проверка существования fuser у корзины товаров перед сохранением -- Добавлено снятие резерва с товаров при отмене заказа в CRM -- Исправлена выборка данных для UA, когда id заказа не совпадает с номером -- Исправлены мелкие баги +- В настройку экспорта добавлена настройка свойств типа "справочник"(highloadblock) +- Добавлена проверка необходимости резервации товаров при выгрузке заказов из retailCRM +- Исправлен вызов рекурсивного метода в RCrmActions +- Добавлены недостающие поля retailcrm.json diff --git a/intaro.retailcrm/export/export_run.php b/intaro.retailcrm/export/export_run.php index 3ef5ac30..bf88ce10 100644 --- a/intaro.retailcrm/export/export_run.php +++ b/intaro.retailcrm/export/export_run.php @@ -23,6 +23,14 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor } } + CModule::IncludeModule('highloadblock'); + $hlblockList = array(); + $hlblockListDb = \Bitrix\Highloadblock\HighloadBlockTable::getList(); + + while ($hlblockArr = $hlblockListDb->Fetch()) { + $hlblockList[$hlblockArr["TABLE_NAME"]] = $hlblockArr; + } + $iblockProperties = array( "article" => "article", "manufacturer" => "manufacturer", @@ -34,6 +42,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor "height" => "height", ); $IBLOCK_PROPERTY_SKU = array(); + $IBLOCK_PROPERTY_SKU_HIGHLOADBLOCK = array(); $IBLOCK_PROPERTY_UNIT_SKU = array(); foreach ($iblockProperties as $prop) { $skuUnitProps = ('IBLOCK_PROPERTY_UNIT_SKU' . "_" . $prop); @@ -51,8 +60,20 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor $IBLOCK_PROPERTY_SKU[$iblock][$prop] = $val; } } + + foreach ($hlblockList as $hlblockTable => $hlblock) { + $hbProps = ('highloadblock' . $hlblockTable . '_' . $prop); + $hbProps = $$hbProps; + + if (is_array($hbProps)) { + foreach ($hbProps as $iblock => $val) { + $IBLOCK_PROPERTY_SKU_HIGHLOADBLOCK[$hlblockTable][$iblock][$prop] = $val; + } + } + } } $IBLOCK_PROPERTY_PRODUCT = array(); + $IBLOCK_PROPERTY_PRODUCT_HIGHLOADBLOCK = array(); $IBLOCK_PROPERTY_UNIT_PRODUCT = array(); foreach ($iblockProperties as $prop) { $productUnitProps = "IBLOCK_PROPERTY_UNIT_PRODUCT" . "_" . $prop; @@ -70,6 +91,17 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor $IBLOCK_PROPERTY_PRODUCT[$iblock][$prop] = $val; } } + + foreach ($hlblockList as $hlblockTable => $hlblock) { + $hbProps = ('highloadblock_product' . $hlblockTable . '_' . $prop); + $hbProps = $$hbProps; + + if (is_array($hbProps)) { + foreach ($hbProps as $iblock => $val) { + $IBLOCK_PROPERTY_PRODUCT_HIGHLOADBLOCK[$hlblockTable][$iblock][$prop] = $val; + } + } + } } $loader = new RetailCrmICML(); @@ -79,6 +111,8 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor $loader->propertiesUnitSKU = $IBLOCK_PROPERTY_UNIT_SKU; $loader->propertiesProduct = $IBLOCK_PROPERTY_PRODUCT; $loader->propertiesUnitProduct = $IBLOCK_PROPERTY_UNIT_PRODUCT; + $loader->highloadblockSkuProperties = $IBLOCK_PROPERTY_SKU_HIGHLOADBLOCK; + $loader->highloadblockProductProperties = $IBLOCK_PROPERTY_PRODUCT_HIGHLOADBLOCK; $loader->filename = $SETUP_FILE_NAME; $loader->serverName = $SERVER_NAME; $loader->application = $APPLICATION; diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php index f29c68a2..4b4b3546 100644 --- a/intaro.retailcrm/export/export_setup.php +++ b/intaro.retailcrm/export/export_setup.php @@ -2,6 +2,24 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_setup.php")){ require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_setup.php"); } else { + if (isset($_POST['ajax']) && $_POST['ajax'] == '1') { + CModule::IncludeModule('highloadblock'); + $rsData = \Bitrix\Highloadblock\HighloadBlockTable::getList(array('filter' => array('TABLE_NAME' => $_POST['table']))); + $hlblockArr = $rsData->Fetch(); + $hlblock = \Bitrix\Highloadblock\HighloadBlockTable::getById($hlblockArr["ID"])->fetch(); + $entity = \Bitrix\Highloadblock\HighloadBlockTable::compileEntity($hlblock); + $hbFields = $entity->getFields(); + $hlblockList['table'] = $hlblockArr["TABLE_NAME"]; + + foreach ($hbFields as $hbFieldCode => $hbField) { + $hlblockList['fields'][] = $hbFieldCode; + } + + $APPLICATION->RestartBuffer(); + header('Content-Type: application/x-javascript; charset=' . LANG_CHARSET); + die(json_encode($hlblockList)); + } + $iblockProperties = array( "article" => "article", "manufacturer" => "manufacturer", @@ -32,6 +50,22 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor $arResult['PRICE_TYPES'][$arPriceType['ID']] = $arPriceType; } + //highloadblock + CModule::IncludeModule('highloadblock'); + $hlblockList = array(); + $hlblockListDb = \Bitrix\Highloadblock\HighloadBlockTable::getList(); + + while ($hlblockArr = $hlblockListDb->Fetch()) { + $hlblock = \Bitrix\Highloadblock\HighloadBlockTable::getById($hlblockArr["ID"])->fetch(); + $entity = \Bitrix\Highloadblock\HighloadBlockTable::compileEntity($hlblock); + $hbFields = $entity->getFields(); + $hlblockList[$hlblockArr["TABLE_NAME"]]['LABEL'] = $hlblockArr["NAME"]; + + foreach ($hbFields as $hbFieldCode => $hbField) { + $hlblockList[$hlblockArr["TABLE_NAME"]]['FIELDS'][] = $hbFieldCode; + } + } + if (($ACTION == 'EXPORT' || $ACTION == 'EXPORT_EDIT' || $ACTION == 'EXPORT_COPY') && $STEP == 1) { if (isset($arOldSetupVars['SETUP_FILE_NAME'])) @@ -291,7 +325,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor >
-
+
"> > @@ -315,7 +349,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor
- + @@ -324,6 +358,7 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor id="IBLOCK_PROPERTY_PRODUCT_" name="IBLOCK_PROPERTY_PRODUCT_[]" class="property-export" + data-type="" onchange="propertyChange(this);"> =') && array_key_exists($key, $iblockFieldsName)) :?> @@ -362,10 +397,19 @@ if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/expor