-
-
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index bb562d48..6a763cfc 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,5 +1,6 @@
- "5.6.2",
- "VERSION_DATE" => "2021-01-14 16:00:00"
-);
+ '5.7.0',
+ 'VERSION_DATE' => '2021-05-31 13:00:00',
+];
diff --git a/intaro.retailcrm/lang/en/export/export_run.php b/intaro.retailcrm/lang/en/export/export_run.php
new file mode 100644
index 00000000..a1ace4af
--- /dev/null
+++ b/intaro.retailcrm/lang/en/export/export_run.php
@@ -0,0 +1,3 @@
+setup = $setup;
+ $this->shopName = RetailcrmConfigProvider::getSiteName();
+ $this->catalogRepository = new CatalogRepository();
+ $this->icmlWriter = new IcmlWriter($this->setup->filePath);
+ $this->xmlOfferDirector = new XmlOfferDirector($this->setup);
+ $this->xmlCategoryDirector = new XmlCategoryDirector($this->setup->iblocksForExport);
+ $this->queryBuilder = new QueryParamsMolder();
+ $this->xmlData = new XmlData();
+ $this->logger = $logger;
+ }
+
+ /**
+ * Основной метод. Генерирует icml файл католога товаров Битрикс
+ */
+ public function generateXml(): void
+ {
+ $this->setXmlData();
+ $this->icmlWriter->writeToXmlTop($this->xmlData);
+ $this->logger->write(
+ self::INFO . ': Start writing categories and header',
+ self::FILE_LOG_NAME
+ );
+ $this->icmlWriter->writeToXmlHeaderAndCategories($this->xmlData);
+ $this->logger->write(
+ self::INFO . ': End writing categories in XML and Start writing offers',
+ self::FILE_LOG_NAME
+ );
+ $this->writeOffers();
+ $this->logger->write(
+ self::INFO . ': End writing offers in XML',
+ self::FILE_LOG_NAME
+ );
+ $this->icmlWriter->writeToXmlBottom();
+ $this->logger->write(
+ self::INFO . ': Loading complete (peak memory usage: ' . memory_get_peak_usage() . ')',
+ self::FILE_LOG_NAME
+ );
+ }
+
+ /**
+ * @return void
+ */
+ private function setXmlData(): void
+ {
+ $this->xmlData->shopName = $this->shopName;
+ $this->xmlData->company = $this->shopName;
+ $this->xmlData->filePath = $this->setup->filePath;
+ $this->xmlData->categories = $this->xmlCategoryDirector->getXmlCategories();
+ }
+
+ /**
+ * записывает оферы всех торговых каталогов в xml файл
+ */
+ private function writeOffers(): void
+ {
+ $this->icmlWriter->startOffersBlock();
+
+ foreach ($this->setup->iblocksForExport as $iblockId) {
+ $this->writeIblockOffers($iblockId);
+ }
+
+ $this->icmlWriter->endBlock();
+ }
+
+ /**
+ * записывает оферы конкретного торгового каталога товаров в xml файл
+ *
+ * @param int $productIblockId //ID инфоблока товаров в торговом каталоге
+ */
+ private function writeIblockOffers(int $productIblockId): void
+ {
+ $catalogIblockInfo = $this->catalogRepository->getCatalogIblockInfo($productIblockId);
+
+ //если нет торговых предложений
+ if ($catalogIblockInfo->skuIblockId === null) {
+ $selectParams
+ = $this->queryBuilder->getSelectParams(
+ $this->setup->properties->products->names[$productIblockId],
+ $this->setup->basePriceId
+ );
+
+ $selectParams->pageNumber = 1;
+ $selectParams->nPageSize = self::OFFERS_PART;
+ $selectParams->parentId = null;
+
+ while ($xmlOffers = $this->xmlOfferDirector->getXmlOffersPart($selectParams, $catalogIblockInfo)) {
+ $this->icmlWriter->writeOffers($xmlOffers);
+
+ $selectParams->pageNumber++;
+ }
+
+ return;
+ }
+
+ //если есть торговые предложения
+ $paramsForProduct
+ = $this->queryBuilder->getSelectParams(
+ $this->setup->properties->products->names[$productIblockId],
+ $this->setup->basePriceId
+ );
+ $paramsForOffer
+ = $this->queryBuilder->getSelectParams(
+ $this->setup->properties->sku->names[$productIblockId],
+ $this->setup->basePriceId
+ );
+ $this->writeOffersAsOffersInXml($paramsForProduct, $paramsForOffer, $catalogIblockInfo);
+ }
+
+ /**
+ * Эта стратегия записи используется,
+ * когда в каталоге есть торговые предложения
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $paramsForProduct
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $paramsForOffer
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ */
+ private function writeOffersAsOffersInXml(
+ SelectParams $paramsForProduct,
+ SelectParams $paramsForOffer,
+ CatalogIblockInfo $catalogIblockInfo
+ ): void {
+ $paramsForProduct->pageNumber = 1;
+ $paramsForProduct->nPageSize = $this->calculateProductPageSize();
+
+ do {
+ $productsPart = $this->xmlOfferDirector->getXmlOffersPart($paramsForProduct, $catalogIblockInfo);
+ $paramsForProduct->pageNumber++;
+
+ $this->writeProductsOffers($productsPart, $paramsForOffer, $catalogIblockInfo);
+ } while (!empty($productsPart));
+ }
+
+ /**
+ * Записывает в файл оферы всех товаров из $products
+ *
+ * @param XmlOffer[] $products
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $paramsForOffer
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ */
+ private function writeProductsOffers(
+ array $products,
+ SelectParams $paramsForOffer,
+ CatalogIblockInfo $catalogIblockInfo
+ ): void {
+ $paramsForOffer->nPageSize = $this->calculateOffersPageSize();
+
+ foreach ($products as $product) {
+ $this->writeProductOffers($paramsForOffer, $catalogIblockInfo, $product);
+ }
+ }
+
+ /**
+ * Записывает оферы отдельного продукта в xml файл
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $paramsForOffer
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer $product
+ */
+ private function writeProductOffers(
+ SelectParams $paramsForOffer,
+ CatalogIblockInfo $catalogIblockInfo,
+ XmlOffer $product
+ ): void {
+ $paramsForOffer->pageNumber = 1;
+ $writingOffersCount = 0;
+ $paramsForOffer->parentId = $product->id;
+
+ do {
+ $xmlOffersPart
+ = $this->xmlOfferDirector->getXmlOffersBySingleProduct($paramsForOffer, $catalogIblockInfo, $product);
+
+ // если это "простой товар", у которого нет ТП, то просто записываем его
+ if ($paramsForOffer->pageNumber === 1 && count($xmlOffersPart) === 0) {
+ $this->icmlWriter->writeOffers([$product]);
+ break;
+ }
+
+ if (!empty($xmlOffersPart)) {
+ $xmlOffersPart
+ = $this->trimOffersList($writingOffersCount, $xmlOffersPart);
+
+ $this->icmlWriter->writeOffers($xmlOffersPart);
+
+ $writingOffersCount += count($xmlOffersPart);
+ $paramsForOffer->pageNumber++;
+ }
+ } while ($this->shouldContinueWriting($writingOffersCount, $xmlOffersPart));
+ }
+
+ /**
+ * Проверяет,не достигнул ли лимит по записываемым оферам maxOffersValue
+ * и обрезает массив до лимита, если он достигнут
+ *
+ * @param int $writingOffers
+ * @param XmlOffer[] $xmlOffers
+ *
+ * @return XmlOffer[]
+ */
+ private function trimOffersList(int $writingOffers, array $xmlOffers): array
+ {
+ if (!empty($this->setup->maxOffersValue) && ($writingOffers + count($xmlOffers)) > $this->setup->maxOffersValue) {
+ $sliceIndex
+ = count($xmlOffers) - ($writingOffers + count($xmlOffers) - $this->setup->maxOffersValue);
+ return array_slice($xmlOffers, 0, $sliceIndex);
+ }
+
+ return $xmlOffers;
+ }
+
+ /**
+ * Возвращает размер страницы для запроса товаров
+ *
+ * @return int
+ */
+ private function calculateProductPageSize(): int
+ {
+ if (empty($this->setup->maxOffersValue)) {
+ return self::DEFAULT_PRODUCT_PAGE_SIZE;
+ }
+
+ return (int) ceil(self::OFFERS_PART / $this->setup->maxOffersValue);
+ }
+
+ /**
+ * Возвращает размер страницы для офферов
+ *
+ * @return int
+ */
+ private function calculateOffersPageSize(): int
+ {
+ if (empty($this->setup->maxOffersValue)) {
+ return self::OFFERS_PART;
+ }
+
+ return $this->setup->maxOffersValue < self::OFFERS_PART ?
+ $this->setup->maxOffersValue : self::OFFERS_PART;
+ }
+
+ /**
+ * Проверяет, нужно ли дальше записывать офферы
+ *
+ * @param int $writingOffers
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer[] $xmlOffers
+ *
+ * @return bool
+ */
+ private function shouldContinueWriting(int $writingOffers, array $xmlOffers): bool
+ {
+ if (empty($this->setup->maxOffersValue)) {
+ return !empty($xmlOffers);
+ }
+
+ return !empty($xmlOffers) && $writingOffers < $this->setup->maxOffersValue;
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/icmlwriter.php b/intaro.retailcrm/lib/icml/icmlwriter.php
new file mode 100644
index 00000000..c6ff60db
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/icmlwriter.php
@@ -0,0 +1,227 @@
+writer = new XMLWriter();
+ $this->writer->openURI($_SERVER['DOCUMENT_ROOT'] . $filePath);
+ $this->writer->setIndent(true);
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlData $data
+ */
+ public function writeToXmlTop(XmlData $data): void
+ {
+ $this->writer->startElement('yml_catalog');
+ $this->writeSimpleAttribute('date', Date('Y-m-d H:i:s'));
+
+ $this->writer->startElement('shop');
+ $this->writeSimpleElement('name', $data->shopName);
+ $this->writeSimpleElement('company', $data->company);
+ }
+
+ public function writeToXmlBottom(): void
+ {
+ $this->writer->endElement();
+ $this->writer->endElement();
+ $this->writer->flush();
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlData $data
+ */
+ public function writeToXmlHeaderAndCategories(XmlData $data): void
+ {
+ $this->writer->startElement('categories');
+
+ foreach ($data->categories as $key => $category) {
+ $this->writeCategory($category);
+
+ if (
+ count($data->categories) === $key + 1
+ || is_int(count($data->categories) / self::CATEGORY_PART)
+ ) {
+ $this->writer->flush();
+ }
+ }
+
+ $this->writer->endElement();
+ $this->writer->flush();
+ }
+
+ public function startOffersBlock(): void
+ {
+ $this->writer->startElement('offers');
+ }
+
+ public function endBlock(): void
+ {
+ $this->writer->endElement();
+ }
+
+ /**
+ * @param XmlOffer[] $offers
+ */
+ public function writeOffers(array $offers): void
+ {
+ foreach ($offers as $offer) {
+ $this->writeOffer($offer);
+ }
+
+ $this->writer->flush();
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer $offer
+ */
+ private function writeOffer(XmlOffer $offer): void
+ {
+ $this->writer->startElement('offer');
+ $this->writeSimpleAttribute('id', $offer->id);
+ $this->writeSimpleAttribute('productId', $offer->productId);
+ $this->writeSimpleAttribute('quantity', $offer->quantity);
+
+ foreach ($offer->categoryIds as $categoryId) {
+ $this->writeSimpleElement('categoryId', $categoryId);
+ }
+
+ if (!empty($offer->picture)) {
+ $this->writeSimpleElement('picture', $offer->picture);
+ }
+
+ if (!empty($offer->unitCode->code)) {
+ $this->writer->startElement('unit');
+ $this->writeSimpleAttribute('code', $offer->unitCode->code);
+ $this->writeSimpleAttribute('name', $offer->unitCode->name);
+ $this->writeSimpleAttribute('sym', $offer->unitCode->sym);
+ $this->writer->endElement();
+ }
+
+ foreach ($offer->params as $param) {
+ $this->writeParam($param);
+ }
+
+ $this->writeSimpleElement('url', $offer->url);
+ $this->writeSimpleElement('price', $offer->price);
+ $this->writeSimpleElement('name', $offer->name);
+ $this->writeSimpleElement('productName', $offer->productName);
+ $this->writeSimpleElement('xmlId', $offer->xmlId);
+ $this->writeOptionalSimpleElement('vendor', $offer->vendor);
+ $this->writeOptionalSimpleElement('barcode', $offer->barcode);
+ $this->writeOptionalSimpleElement('vatRate', $offer->vatRate);
+ $this->writeOptionalSimpleElement('weight', $offer->weight);
+ $this->writeOptionalSimpleElement('dimensions', $offer->dimensions);
+ $this->writeOptionalSimpleElement('purchasePrice', $offer->purchasePrice);
+ $this->writer->endElement();
+ }
+
+ /**
+ * Создает ноду, если значение не пустое
+ *
+ * @param string $name
+ * @param $value
+ */
+ private function writeOptionalSimpleElement(string $name, $value): void
+ {
+ if (!empty($value)) {
+ $this->writeSimpleElement($name, $value);
+ }
+ }
+
+ /**
+ * @param string $name
+ * @param $value
+ */
+ private function writeSimpleElement(string $name, $value): void
+ {
+ $this->writer->startElement($name);
+ $this->writer->text($this->prepareValue($value));
+ $this->writer->endElement();
+ }
+
+ /**
+ * @param string $name
+ * @param $value
+ */
+ private function writeSimpleAttribute(string $name, $value): void
+ {
+ $this->writer->startAttribute($name);
+ $this->writer->text($this->prepareValue($value));
+ $this->writer->endAttribute();
+ }
+
+ /**
+ * @param $text
+ *
+ * @return string
+ */
+ protected function prepareValue($text): string
+ {
+ global $APPLICATION;
+
+ return strip_tags($APPLICATION->ConvertCharset($text, 'utf-8', 'utf-8'));
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlCategory $category
+ */
+ private function writeCategory(XmlCategory $category): void
+ {
+ $this->writer->startElement('category');
+ $this->writeSimpleAttribute('id', $category->id);
+ $this->writeParentId($category->parentId);
+ $this->writeSimpleElement('name', $category->name);
+ $this->writeSimpleElement('picture', $category->picture);
+ $this->writer->endElement();
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\OfferParam $param
+ */
+ private function writeParam(OfferParam $param): void
+ {
+ $this->writer->startElement('param');
+ $this->writeSimpleAttribute('name', $param->name);
+ $this->writeSimpleAttribute('code', $param->code);
+ $this->writer->text($this->prepareValue($param->value));
+ $this->writer->endElement();
+ }
+
+ /**
+ * @param string $parentId
+ */
+ private function writeParentId(string $parentId)
+ {
+ if ($parentId > 0) {
+ $this->writeSimpleAttribute('parentId', $parentId);
+ }
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/queryparamsmolder.php b/intaro.retailcrm/lib/icml/queryparamsmolder.php
new file mode 100644
index 00000000..81833955
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/queryparamsmolder.php
@@ -0,0 +1,80 @@
+ $name) {
+ if ($name === '') {
+ unset($userProps[$key]);
+ continue;
+ }
+
+ if (in_array($name, $catalogFields, true)) {
+ $userProps[$key] = strtoupper($userProps[$key]);
+ } else {
+ $userProps[$key] = 'PROPERTY_' . $userProps[$key];
+ }
+ }
+
+ $params->configurable = $userProps ?? [];
+ $params->main = [
+ 'IBLOCK_ID',
+ 'IBLOCK_SECTION_ID',
+ 'NAME',
+ 'DETAIL_PICTURE',
+ 'PREVIEW_PICTURE',
+ 'DETAIL_PAGE_URL',
+ 'CATALOG_QUANTITY',
+ 'CATALOG_PRICE_' . $basePriceId,
+ 'CATALOG_PURCHASING_PRICE',
+ 'EXTERNAL_ID',
+ 'CATALOG_GROUP_' . $basePriceId,
+ 'ID',
+ 'LID',
+ ];
+
+ return $params;
+ }
+
+ /**
+ * @param int|null $parentId
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $info
+ * @return array
+ */
+ public function getWhereForOfferPart(?int $parentId, CatalogIblockInfo $info): array
+ {
+ if ($parentId === null) {
+ return [
+ 'IBLOCK_ID' => $info->productIblockId,
+ 'ACTIVE' => 'Y',
+ ];
+ }
+
+ return [
+ 'IBLOCK_ID' => $info->skuIblockId,
+ 'ACTIVE' => 'Y',
+ 'PROPERTY_' . $info->skuPropertyId => $parentId,
+ ];
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/xmlcategorydirector.php b/intaro.retailcrm/lib/icml/xmlcategorydirector.php
new file mode 100644
index 00000000..6bc48831
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/xmlcategorydirector.php
@@ -0,0 +1,140 @@
+iblocksForExport = $iblocksForExport;
+ $this->catalogRepository = new CatalogRepository();
+ $this->xmlCategoryFactory = new XmlCategoryFactory();
+ $this->fileRepository = new FileRepository(SiteRepository::getDefaultServerName());
+ }
+
+ /**
+ * @return XmlCategory[]
+ */
+ public function getXmlCategories(): array
+ {
+ $xmlCategories = [];
+
+ foreach ($this->iblocksForExport as $iblockId) {
+ $categories = $this->catalogRepository->getCategoriesByIblockId($iblockId);
+
+ if ($categories === null) {
+ $categoryId = self::MILLION + $iblockId;
+ $xmlCategory = $this->makeXmlCategoryFromIblock($iblockId, $categoryId);
+
+ if (!$xmlCategory) {
+ continue;
+ }
+
+ $xmlCategories[$categoryId] = $xmlCategory;
+ }
+
+ $xmlCategories = array_merge($xmlCategories, $this->getXmlSubCategories($categories));
+ }
+
+ return $xmlCategories;
+ }
+
+ /**
+ * Возвращает коллекцию подкатегорий категории
+ *
+ * @param \Bitrix\Main\ORM\Objectify\Collection $categories
+ * @return XmlCategory[]
+ */
+ public function getXmlSubCategories(Collection $categories): array
+ {
+ $xmlCategories = [];
+
+ foreach ($categories as $categoryKey => $category) {
+ if (!$category instanceof EntityObject) {
+ continue;
+ }
+
+ try {
+ $xmlCategory = $this->xmlCategoryFactory->create(
+ $category,
+ $this->fileRepository->getImageUrl($category->get('PICTURE'))
+ );
+
+ if (!$xmlCategory) {
+ continue;
+ }
+
+ $xmlCategories[$categoryKey] = $this->xmlCategoryFactory->create(
+ $category,
+ $this->fileRepository->getImageUrl($category->get('PICTURE'))
+ );
+ } catch (ArgumentException | SystemException $exception) {
+ AddMessage2Log($exception->getMessage());
+ }
+ }
+
+ return $xmlCategories;
+ }
+
+ /**
+ * Создает XmlCategory из инфоблока
+ *
+ * @param int $iblockId
+ * @param int $categoryId
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\XmlCategory|null
+ */
+ public function makeXmlCategoryFromIblock(int $iblockId, int $categoryId): ?XmlCategory
+ {
+ $iblock = $this->catalogRepository->getIblockById($iblockId);
+
+ if ($iblock === null) {
+ return null;
+ }
+
+ try {
+ return $this->xmlCategoryFactory->create(
+ $iblock,
+ $this->fileRepository->getImageUrl($iblock->get('PICTURE')),
+ $categoryId
+ );
+ } catch (ArgumentException | SystemException $exception) {
+ AddMessage2Log($exception->getMessage());
+ }
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/xmlcategoryfactory.php b/intaro.retailcrm/lib/icml/xmlcategoryfactory.php
new file mode 100644
index 00000000..1d784a4a
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/xmlcategoryfactory.php
@@ -0,0 +1,43 @@
+id = $categoryId ?? $category->get('ID');
+ $xmlCategory->name = $category->get('NAME');
+ $xmlCategory->parentId = $categoryId ? 0 : $category->get('IBLOCK_SECTION_ID');
+ $xmlCategory->picture = $picture;
+ } catch (ArgumentException | SystemException $exception) {
+ return null;
+ }
+
+ return $xmlCategory;
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/xmlofferbuilder.php b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
new file mode 100644
index 00000000..0d3d2628
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
@@ -0,0 +1,520 @@
+setup = $setup;
+ $this->purchasePriceNull = RetailcrmConfigProvider::getCrmPurchasePrice();
+ $this->measures = $this->prepareMeasures($measure);
+ $this->defaultServerName = $defaultServerName;
+ }
+
+ /**
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer
+ */
+ public function build(): XmlOffer
+ {
+ $this->xmlOffer = new XmlOffer();
+ $this->xmlOffer->barcode = $this->barcode;
+ $this->xmlOffer->picture = $this->productPicture;
+
+ $this->addDataFromParams();
+ $this->addDataFromItem($this->productProps, $this->categories);
+
+ return $this->xmlOffer;
+ }
+
+ /**
+ * @param array $categories
+ */
+ public function setCategories(array $categories)
+ {
+ $this->categories = $categories;
+ }
+
+ /**
+ * @param mixed $skuHlParams
+ */
+ public function setSkuHlParams($skuHlParams): void
+ {
+ $this->skuHlParams = $skuHlParams;
+ }
+
+ /**
+ * @param mixed $productHlParams
+ */
+ public function setProductHlParams($productHlParams): void
+ {
+ $this->productHlParams = $productHlParams;
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $selectParams
+ */
+ public function setSelectParams(SelectParams $selectParams): void
+ {
+ $this->selectParams = $selectParams;
+ }
+
+ /**
+ * @param array $productProps
+ */
+ public function setOfferProps(array $productProps): void
+ {
+ $this->productProps = $productProps;
+
+ }
+
+ /**
+ * @param string $barcode
+ */
+ public function setBarcode(string $barcode): void
+ {
+ $this->barcode = $barcode;
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ */
+ public function setCatalogIblockInfo(CatalogIblockInfo $catalogIblockInfo): void
+ {
+ $this->catalogIblockInfo = $catalogIblockInfo;
+ }
+
+ /**
+ * @param string $getProductPicture
+ */
+ public function setPicturesPath(string $getProductPicture): void
+ {
+ $this->productPicture = $getProductPicture;
+ }
+
+ /**
+ * Добавляет в XmlOffer значения настраиваемых параметров, производителя, вес и габариты
+ */
+ private function addDataFromParams(): void
+ {
+ $resultParams = array_merge($this->productHlParams, $this->skuHlParams);
+
+ //достаем значения из обычных свойств
+ $resultParams = array_merge($resultParams, $this->getSimpleParams(
+ $resultParams,
+ $this->selectParams->configurable,
+ $this->productProps
+ ));
+
+ [$resultParams, $this->xmlOffer->dimensions]
+ = $this->extractDimensionsFromParams(
+ $this->setup->properties,
+ $resultParams,
+ $this->catalogIblockInfo->productIblockId
+ );
+ [$resultParams, $this->xmlOffer->weight]
+ = $this->extractWeightFromParams(
+ $this->setup->properties,
+ $resultParams,
+ $this->catalogIblockInfo->productIblockId
+ );
+ [$resultParams, $this->xmlOffer->vendor] = $this->extractVendorFromParams($resultParams);
+ $resultParams = $this->dropEmptyParams($resultParams);
+ $this->xmlOffer->params = $this->createParamObject($resultParams);
+ }
+
+ /**
+ * Добавляет в объект XmlOffer информацию из GetList
+ *
+ * @param array $item
+ * @param array $categoryIds
+ */
+ private function addDataFromItem(array $item, array $categoryIds): void
+ {
+ $this->xmlOffer->id = $item['ID'];
+ $this->xmlOffer->productId = $item['ID'];
+ $this->xmlOffer->quantity = $item['CATALOG_QUANTITY'] ?? '';
+ $this->xmlOffer->url = $item['DETAIL_PAGE_URL']
+ ? $this->defaultServerName . $item['DETAIL_PAGE_URL']
+ : '';
+ $this->xmlOffer->price = $item['CATALOG_PRICE_' . $this->setup->basePriceId];
+ $this->xmlOffer->purchasePrice = $this->getPurchasePrice(
+ $item,
+ $this->setup->loadPurchasePrice,
+ $this->purchasePriceNull
+ );
+ $this->xmlOffer->categoryIds = $categoryIds;
+ $this->xmlOffer->name = $item['NAME'];
+ $this->xmlOffer->xmlId = $item['EXTERNAL_ID'] ?? '';
+ $this->xmlOffer->productName = $item['NAME'];
+ $this->xmlOffer->vatRate = $item['CATALOG_VAT'] ?? 'none';
+ $this->xmlOffer->unitCode = $this->getUnitCode($item['CATALOG_MEASURE'], $item['ID']);
+ }
+
+ /**
+ * Возвращает закупочную цену, если она требуется настройками
+ *
+ * @param array $product
+ * @param bool|null $isLoadPrice
+ * @param string $purchasePriceNull
+ * @return int|null
+ */
+ private function getPurchasePrice(array $product, ?bool $isLoadPrice, string $purchasePriceNull): ?int
+ {
+ if ($isLoadPrice) {
+ if ($product['CATALOG_PURCHASING_PRICE']) {
+ return $product['CATALOG_PURCHASING_PRICE'];
+ }
+
+ if ($purchasePriceNull === 'Y') {
+ return 0;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Возвращает массив обычных свойств
+ *
+ * @param array $resultParams
+ * @param array $configurableParams
+ * @param array $productProps
+ * @return array
+ */
+ private function getSimpleParams(array $resultParams, array $configurableParams, array $productProps): array
+ {
+ foreach ($configurableParams as $key => $params) {
+ if (isset($resultParams[$key])) {
+ continue;
+ }
+
+ $codeWithValue = $params . '_VALUE';
+
+ if (isset($productProps[$codeWithValue])) {
+ $resultParams[$key] = $productProps[$codeWithValue];
+ } elseif (isset($productProps[$params])) {
+ $resultParams[$key] = $productProps[$params];
+ }
+ }
+
+ return $resultParams;
+ }
+
+ /**
+ * Удаляет параметры с пустыми и нулевыми значениями
+ *
+ * @param array $params
+ * @return array
+ */
+ private function dropEmptyParams(array $params): array
+ {
+ return array_diff($params, ['', 0, '0']);
+ }
+
+ /**
+ * Разделяем вендора и остальные параметры
+ *
+ * @param array $resultParams
+ * @return array
+ */
+ private function extractVendorFromParams(array $resultParams): array
+ {
+ $vendor = null;
+
+ if (isset($resultParams['manufacturer'])) {
+ $vendor = $resultParams['manufacturer'];
+
+ unset($resultParams['manufacturer']);
+ }
+
+ return [$resultParams, $vendor];
+ }
+
+ /**
+ * Преобразует вес товара в килограммы для ноды weight
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlSetupPropsCategories $xmlSetupPropsCategories
+ * @param array $resultParams
+ * @param int $iblockId
+ * @return array
+ */
+ private function extractWeightFromParams(
+ XmlSetupPropsCategories $xmlSetupPropsCategories,
+ array $resultParams,
+ int $iblockId
+ ): array {
+ $factors = [
+ 'mg' => 0.000001,
+ 'g' => 0.001,
+ 'kg' => 1,
+ ];
+ $unit = '';
+
+ if (!empty($xmlSetupPropsCategories->products->names[$iblockId]['weight'])) {
+ $unit = $xmlSetupPropsCategories->products->units[$iblockId]['weight'];
+ } elseif (!empty($xmlSetupPropsCategories->sku->names[$iblockId]['weight'])) {
+ $unit = $xmlSetupPropsCategories->sku->units[$iblockId]['weight'];
+ }
+
+ if (isset($resultParams['weight'], $factors[$unit])) {
+ $weight = $resultParams['weight'] * $factors[$unit];
+ } else {
+ $weight = '';
+ }
+
+ if (isset($resultParams['weight'])) {
+ unset($resultParams['weight']);
+ }
+
+ return [$resultParams, $weight];
+ }
+
+ /**
+ * Получение данных для ноды dimensions
+ *
+ * Данные должны быть переведены в сантиметры
+ * и представлены в формате Длина/Ширина/Высота
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlSetupPropsCategories $xmlSetupPropsCategories
+ * @param array $resultParams
+ * @param int $iblockId
+ * @return array
+ */
+ private function extractDimensionsFromParams(
+ XmlSetupPropsCategories $xmlSetupPropsCategories,
+ array $resultParams,
+ int $iblockId
+ ): array {
+ $dimensionsParams = ['length', 'width', 'height'];
+ $dimensions = '';
+ $factors = [
+ 'mm' => 0.1,
+ 'cm' => 1,
+ 'm' => 100,
+ ];
+
+ foreach ($dimensionsParams as $key => $param) {
+ $unit = '';
+
+ if (!empty($xmlSetupPropsCategories->products->names[$iblockId][$param])) {
+ $unit = $xmlSetupPropsCategories->products->units[$iblockId][$param];
+ } elseif (!empty($xmlSetupPropsCategories->sku->names[$iblockId][$param])) {
+ $unit = $xmlSetupPropsCategories->sku->units[$iblockId][$param];
+ }
+
+ if (isset($factors[$unit], $resultParams[$param])) {
+ $dimensions .= $resultParams[$param] * $factors[$unit];
+ } else {
+ $dimensions .= '0';
+ }
+
+ if (count($dimensionsParams) > $key + 1) {
+ $dimensions .= '/';
+ }
+
+ if (isset($resultParams[$param])) {
+ unset($resultParams[$param]);
+ }
+ }
+
+ return [$resultParams, $dimensions === '0/0/0' ? '' : $dimensions];
+ }
+
+ /**
+ * Собираем объект параметре заказа
+ *
+ * @param array $params
+ * @return OfferParam[]
+ */
+ private function createParamObject(array $params): array
+ {
+ $offerParams = [];
+
+ foreach ($params as $code => $value) {
+ $paramName = GetMessage('PARAM_NAME_' . $code);
+
+ if (empty($paramName)) {
+ continue;
+ }
+
+ $offerParam = new OfferParam();
+ $offerParam->name = $paramName;
+ $offerParam->code = $code;
+ $offerParam->value = $value;
+ $offerParams[] = $offerParam;
+ }
+
+ return $offerParams;
+ }
+
+ /**
+ * Собираем объект единицы измерения для товара
+ *
+ * @param int $measureIndex
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\Unit
+ */
+ private function createUnitFromCode(int $measureIndex): Unit
+ {
+ $unit = new Unit();
+ $unit->name = $this->measures[$measureIndex]['MEASURE_TITLE'] ?? '';
+ $unit->code = $this->measures[$measureIndex]['SYMBOL_INTL'] ?? '';
+ $unit->sym = $this->measures[$measureIndex]['SYMBOL_RUS'] ?? '';
+
+ return $unit;
+ }
+
+ /**
+ * Удаляет запрещенные в unit сode символы
+ *
+ * @link https://docs.retailcrm.ru/Developers/modules/ICML
+ *
+ * @param array $measures
+ *
+ * @return array
+ */
+ private function prepareMeasures(array $measures): array
+ {
+ foreach ($measures as &$measure) {
+ if (isset($measure['SYMBOL_INTL'])) {
+ $measure['SYMBOL_INTL'] = preg_replace("/[^a-zA-Z_\-]/",'', $measure['SYMBOL_INTL']);
+ }
+ }
+
+ return $measures;
+ }
+
+ /**
+ * @param array $currentMeasure
+ *
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\Unit
+ */
+ private function createUnitFromProductTable(array $currentMeasure): Unit
+ {
+ $clearCurrentMeasure = $this->prepareMeasures(array_shift($currentMeasure));
+
+ $unit = new Unit();
+ $unit->name = $clearCurrentMeasure['MEASURE']['MEASURE_TITLE'] ?? '';
+ $unit->code = $clearCurrentMeasure['MEASURE']['SYMBOL_INTL'] ?? '';
+ $unit->sym = $clearCurrentMeasure['MEASURE']['SYMBOL_RUS'] ?? '';
+
+ return $unit;
+ }
+
+ /**
+ * @param int|null $measureId
+ * @param int $itemId
+ *
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\Unit|null
+ */
+ private function getUnitCode(?int $measureId, int $itemId): ?Unit
+ {
+ if (isset($measureId) && !empty($measureId)) {
+ return $this->createUnitFromCode($measureId);
+ } else {
+ try {
+ $currentMeasure = ProductTable::getCurrentRatioWithMeasure($itemId);
+
+ if (is_array($currentMeasure)) {
+ return $this->createUnitFromProductTable($currentMeasure);
+ }
+ } catch (ArgumentException $exception) {
+ Logger::getInstance()->write(GetMessage('UNIT_ERROR'), 'i_crm_load_log');
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/intaro.retailcrm/lib/icml/xmlofferdirector.php b/intaro.retailcrm/lib/icml/xmlofferdirector.php
new file mode 100644
index 00000000..bd41ca14
--- /dev/null
+++ b/intaro.retailcrm/lib/icml/xmlofferdirector.php
@@ -0,0 +1,206 @@
+setup = $setup;
+ $this->fileRepository = new FileRepository(SiteRepository::getDefaultServerName());
+ $this->catalogRepository = new CatalogRepository();
+ $this->xmlOfferBuilder = new XmlOfferBuilder(
+ $setup,
+ MeasureRepository::getMeasures(),
+ SiteRepository::getDefaultServerName()
+ );
+ }
+
+ /**
+ * Возвращает страницу (массив) с товарами или торговыми предложениями (в зависимости от $param)
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $param
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ * @return XmlOffer[]
+ */
+ public function getXmlOffersPart(SelectParams $param, CatalogIblockInfo $catalogIblockInfo): array
+ {
+ $ciBlockResult = $this->catalogRepository->getProductPage($param, $catalogIblockInfo);
+ $barcodes = $this->catalogRepository->getProductBarcodesByIblockId($catalogIblockInfo->productIblockId);
+ $offers = [];
+
+ while ($offer = $ciBlockResult->GetNext()) {
+ $this->setXmlOfferParams($param, $offer, $catalogIblockInfo, $barcodes);
+ $this->xmlOfferBuilder->setCategories($this->catalogRepository->getProductCategoriesIds($offer['ID']));
+
+ $offers[] = $this->xmlOfferBuilder->build();
+ }
+
+ return $offers;
+ }
+
+ /**
+ * возвращает массив XmlOffers для конкретного продукта
+ *
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $paramsForOffer
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer $product
+ * @return XmlOffer[]
+ */
+ public function getXmlOffersBySingleProduct(
+ SelectParams $paramsForOffer,
+ CatalogIblockInfo $catalogIblockInfo,
+ XmlOffer $product
+ ): array {
+ $xmlOffers = $this->getXmlOffersPart($paramsForOffer, $catalogIblockInfo);
+
+ return $this->addProductInfo($xmlOffers, $product);
+ }
+
+ /**
+ * Декорирует оферы информацией из товаров
+ *
+ * @param XmlOffer[] $xmlOffers
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer $product
+ * @return \Intaro\RetailCrm\Model\Bitrix\Xml\XmlOffer[]
+ */
+ private function addProductInfo(array $xmlOffers, XmlOffer $product): array
+ {
+ foreach ($xmlOffers as $offer) {
+ $offer->productId = $product->id;
+ $offer->params = array_merge($offer->params, $product->params);
+ $offer->unitCode = $offer->unitCode === null ? null : $offer->unitCode->merge($product->unitCode);
+ $offer->vatRate = $offer->vatRate === 'none' ? $product->vatRate : $offer->vatRate;
+ $offer->vendor = $offer->mergeValues($product->vendor, $offer->vendor);
+ $offer->picture = $offer->mergeValues($product->picture, $offer->picture);
+ $offer->weight = $offer->mergeValues($product->weight, $offer->weight);
+ $offer->dimensions = $offer->mergeValues($product->dimensions, $offer->dimensions);
+ $offer->categoryIds = $product->categoryIds;
+ $offer->productName = $product->productName;
+ }
+
+ return $xmlOffers;
+ }
+
+ /**
+ * Получение настраиваемых параметров, если они лежат в HL-блоке
+ *
+ * @param int $iblockId //ID инфоблока товаров, даже если данные нужны по SKU
+ * @param array $productProps
+ * @param array $configurableParams
+ * @param array $hls
+ * @return array
+ */
+ private function getHlParams(int $iblockId, array $productProps, array $configurableParams, array $hls): array
+ {
+ $params = [];
+
+ foreach ($hls as $hlName => $hlBlockProduct) {
+ if (isset($hlBlockProduct[$iblockId])) {
+ reset($hlBlockProduct[$iblockId]);
+ $firstKey = key($hlBlockProduct[$iblockId]);
+ $hlRepository = new HlRepository($hlName);
+
+ if ($hlRepository->getHl() === null) {
+ continue;
+ }
+
+ $result = $hlRepository->getDataByXmlId($productProps[$configurableParams[$firstKey] . '_VALUE']);
+
+ if ($result === null) {
+ continue;
+ }
+
+ foreach ($hlBlockProduct[$iblockId] as $hlPropCodeKey => $hlPropCode) {
+ if (isset($result[$hlPropCode])) {
+ $params[$hlPropCodeKey] = $result[$hlPropCode];
+ }
+ }
+ }
+ }
+
+ return $params;
+ }
+
+ /**
+ * @param \Intaro\RetailCrm\Model\Bitrix\Xml\SelectParams $param
+ * @param array $product
+ * @param \Intaro\RetailCrm\Model\Bitrix\Orm\CatalogIblockInfo $catalogIblockInfo
+ * @param array $barcodes
+ */
+ private function setXmlOfferParams(
+ SelectParams $param,
+ array $product,
+ CatalogIblockInfo $catalogIblockInfo,
+ array $barcodes
+ ): void {
+ if ($param->parentId === null) {
+ $pictureProperty = $this->setup->properties->products->pictures[$catalogIblockInfo->productIblockId];
+ } else {
+ $pictureProperty = $this->setup->properties->sku->pictures[$catalogIblockInfo->productIblockId];
+ }
+
+ //достаем значения из HL блоков товаров
+ $this->xmlOfferBuilder->setProductHlParams($this->getHlParams(
+ $catalogIblockInfo->productIblockId,
+ $product,
+ $param->configurable,
+ $this->setup->properties->highloadblockProduct
+ ));
+
+ //достаем значения из HL блоков торговых предложений
+ $this->xmlOfferBuilder->setSkuHlParams($this->getHlParams(
+ $catalogIblockInfo->productIblockId,
+ $product,
+ $param->configurable,
+ $this->setup->properties->highloadblockSku
+ ));
+ $this->xmlOfferBuilder->setSelectParams($param);
+ $this->xmlOfferBuilder->setOfferProps($product);
+ $this->xmlOfferBuilder->setBarcode($barcodes[$product['ID']] ?? '');
+ $this->xmlOfferBuilder->setCatalogIblockInfo($catalogIblockInfo);
+ $this->xmlOfferBuilder->setPicturesPath(
+ $this
+ ->fileRepository
+ ->getProductPicture($product, $pictureProperty ?? '')
+ );
+ }
+}
diff --git a/intaro.retailcrm/lib/lang/ru/icml/xmlofferbuilder.php b/intaro.retailcrm/lib/lang/ru/icml/xmlofferbuilder.php
new file mode 100644
index 00000000..925632b4
--- /dev/null
+++ b/intaro.retailcrm/lib/lang/ru/icml/xmlofferbuilder.php
@@ -0,0 +1,13 @@
+
+ *