From ce5ea1f1a570cc27b74bdd1151b3038a3ca75d87 Mon Sep 17 00:00:00 2001
From: Smiley48 <43863676+Smiley48@users.noreply.github.com>
Date: Mon, 12 Jun 2023 17:49:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B3?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B5=20=D1=81=D0=BE=20=D0=B7?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=91=D0=B5?=
 =?UTF-8?q?=D0=B7=20=D0=9D=D0=94=D0=A1=20(#297)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 +++
 intaro.retailcrm/description.ru               |  2 +-
 intaro.retailcrm/install/version.php          |  4 ++--
 intaro.retailcrm/lib/icml/xmlofferbuilder.php | 12 ++++++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06e65767..da44246a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-06-09 v.6.3.13
+- Правка генерации при работе со значением Без НДС
+
 ## 2023-06-08 v.6.3.12
 - Исправление критических ошибок при обновлении модуля и php
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 09524d5f..f23752de 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправление критических ошибок при обновлении модуля и php
\ No newline at end of file
+- Правка генерации при работе со значением Без НДС
\ No newline at end of file
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index fb585b07..e749f77f 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.12',
-    'VERSION_DATE' => '2023-06-08 19:00:00'
+    'VERSION'      => '6.3.13',
+    'VERSION_DATE' => '2023-06-09 15:00:00'
 ];
diff --git a/intaro.retailcrm/lib/icml/xmlofferbuilder.php b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
index f8c7fc30..ce3f3375 100644
--- a/intaro.retailcrm/lib/icml/xmlofferbuilder.php
+++ b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
@@ -286,11 +286,19 @@ class XmlOfferBuilder
      */
     private function getVatRate(array $product): string
     {
-        if (!empty($product['VAT_ID']) && array_key_exists($product['VAT_ID'], $this->vatRates)) {
+        if (
+            !empty($product['VAT_ID'])
+            && array_key_exists($product['VAT_ID'], $this->vatRates)
+            && is_string($this->vatRates[$product['VAT_ID']]['RATE'])
+        ) {
             return $this->vatRates[$product['VAT_ID']]['RATE'];
         }
 
-        if (!empty($product['CATALOG_VAT_ID']) && array_key_exists($product['CATALOG_VAT_ID'], $this->vatRates)) {
+        if (
+            !empty($product['CATALOG_VAT_ID'])
+            && array_key_exists($product['CATALOG_VAT_ID'], $this->vatRates)
+            && is_string($this->vatRates[$product['CATALOG_VAT_ID']]['RATE'])
+        ) {
             return $this->vatRates[$product['CATALOG_VAT_ID']]['RATE'];
         }