diff --git a/CHANGELOG.md b/CHANGELOG.md index 074a9143..4d96f15d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2019-08-28 v.2.5.1 +* Исправление генерации единиц измерения + ## 2019-07-26 v.2.5.0 * Исправление создание дублей заказов diff --git a/intaro.retailcrm/classes/general/icml/RetailCrmICML.php b/intaro.retailcrm/classes/general/icml/RetailCrmICML.php index a9438646..f8ec28d4 100644 --- a/intaro.retailcrm/classes/general/icml/RetailCrmICML.php +++ b/intaro.retailcrm/classes/general/icml/RetailCrmICML.php @@ -657,8 +657,16 @@ class RetailCrmICML } else { $offer .= '' . "\n"; } + } else { + $measure = \Bitrix\Catalog\ProductTable::getCurrentRatioWithMeasure($arOffer["ID"]); + if ($this->measure[$measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL']]) { + $offer .= '' . "\n"; + } else { + $offer .= '' . "\n"; + } } + if ($arOffer["BARCODE"]) { $offer.= "" . $this->PrepareValue($arOffer["BARCODE"]) . "\n"; } diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 22f353ae..4aa7eb64 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправление создание дублей заказов +- Исправление генерации единиц измерения diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 9661cc59..bf8a2326 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "2.5.0", - "VERSION_DATE" => "2019-07-26 17:40:00" + "VERSION" => "2.5.1", + "VERSION_DATE" => "2019-08-28 15:20:00" );