From f26e36052f497bf72843218344ce16ccd701b1b8 Mon Sep 17 00:00:00 2001
From: Sergey <gluschenko@retailcrm.ru>
Date: Wed, 28 Aug 2019 15:34:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D1=80=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                            | 3 +++
 intaro.retailcrm/classes/general/icml/RetailCrmICML.php | 8 ++++++++
 intaro.retailcrm/description.ru                         | 2 +-
 intaro.retailcrm/install/version.php                    | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

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 .= '<unit code="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_INTL']) . '" name="' . $this->PrepareValue($arOffer["MEASURE"]['MEASURE_TITLE']) . '" sym="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_RUS']) . '" />' . "\n";
             }
+        } else {
+            $measure = \Bitrix\Catalog\ProductTable::getCurrentRatioWithMeasure($arOffer["ID"]);
 
+            if ($this->measure[$measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL']]) {
+                $offer .= '<unit code="' . $this->measure[$this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL'])] . '" />' . "\n";
+            } else {
+                $offer .= '<unit code="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL']) . '" name="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['MEASURE_TITLE']) . '" sym="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_RUS']) . '" />' . "\n";
+            }
         }
+
         if ($arOffer["BARCODE"]) {
             $offer.= "<barcode>" . $this->PrepareValue($arOffer["BARCODE"]) . "</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 @@
 <?
 $arModuleVersion = array(
-    "VERSION" => "2.5.0",
-    "VERSION_DATE" => "2019-07-26  17:40:00"
+    "VERSION" => "2.5.1",
+    "VERSION_DATE" => "2019-08-28  15:20:00"
 );