From 595d71393164e2479b19bd05feb719a06cfa0e1b Mon Sep 17 00:00:00 2001
From: Smiley48 <43863676+Smiley48@users.noreply.github.com>
Date: Thu, 1 Jun 2023 12:29:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=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=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D0=9D=D0=94=D0=A1=20(#293)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40cdfa9e..9c503100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-06-01 v.6.3.8
+- Исправлена ошибка с получением настроек при генерации файла каталога
+
 ## 2023-06-01 v.6.3.7
 - Исправлено получение основного сайта для записи логов модуля
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 49d046c7..d347472a 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1,2 @@
-- Исправлено получение основного сайта для записи логов модуля
\ No newline at end of file
+- Исправлена ошибка с получением настроек при генерации файла каталога
+
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index a94ef1fb..512b1700 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.7',
+    'VERSION'      => '6.3.8',
     'VERSION_DATE' => '2023-06-01 12:00:00'
 ];
diff --git a/intaro.retailcrm/lib/icml/xmlofferbuilder.php b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
index 5a789e71..f8c7fc30 100644
--- a/intaro.retailcrm/lib/icml/xmlofferbuilder.php
+++ b/intaro.retailcrm/lib/icml/xmlofferbuilder.php
@@ -108,7 +108,7 @@ class XmlOfferBuilder
         $this->setup             = $setup;
         $this->purchasePriceNull = RetailcrmConfigProvider::getCrmPurchasePrice();
         /** @var \Intaro\RetailCrm\Icml\SettingsService $settingsService */
-        $settingsService         = ServiceLocator::get(SettingsService::class);
+        $settingsService         = SettingsService::getInstance([], '');
         $this->vatRates          = $settingsService->vatRates;
         $this->measures          = $this->prepareMeasures($measure);
         $this->defaultServerName = $defaultServerName;