From 559bf79f7b8b88f518145f53d7e7614038bee9fa Mon Sep 17 00:00:00 2001
From: Vlad <48670792+Mozgito@users.noreply.github.com>
Date: Fri, 8 Apr 2022 18:21:05 +0300
Subject: [PATCH] Fix customized classes load (#245)

* fix customized classes load
* bump to 6.0.1
---
 CHANGELOG.md                                  |  3 +++
 .../RetailcrmClasspathBuilder.php             | 22 ++++++++++++-------
 intaro.retailcrm/description.ru               |  2 +-
 intaro.retailcrm/install/version.php          |  4 ++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff81d29f..1937bbcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2021-04-08 v.6.0.1
+* Исправлены ошибки подключения кастомных классов
+
 ## 2021-11-12 v.6.0.0
 * Добавлена поддержка программы лояльности
 
diff --git a/intaro.retailcrm/RetailcrmClasspathBuilder.php b/intaro.retailcrm/RetailcrmClasspathBuilder.php
index 117611db..82220357 100644
--- a/intaro.retailcrm/RetailcrmClasspathBuilder.php
+++ b/intaro.retailcrm/RetailcrmClasspathBuilder.php
@@ -17,6 +17,16 @@ class RetailcrmClasspathBuilder
      */
     protected $moduleId = 'intaro.retailcrm';
 
+    /**
+     * @var string
+     */
+    protected $customizedFilesPath = '/bitrix/php_interface/retailcrm/';
+
+    /**
+     * @var string
+     */
+    protected $customizedClassesPath = '../../php_interface/retailcrm/';
+
     /**
      * The topmost directory where recursion should begin. Default: `classes/general`. Relative to the __DIR__.
      * @var string
@@ -115,10 +125,8 @@ class RetailcrmClasspathBuilder
     protected function buildCustomizableClasspath()
     {
         foreach (static::$customizableClasses as $className => $fileName) {
-            $customizedFile = $this->documentRoot . '/bitrix/php_interface/retailcrm/' . $fileName;
-
-            if (file_exists($customizedFile)) {
-                $this->result[$className] = $customizedFile;
+            if (file_exists($this->documentRoot . $this->customizedFilesPath . $fileName)) {
+                $this->result[$className] = $this->customizedClassesPath . $fileName;
             } else {
                 $this->notIncluded[$className] = $fileName;
             }
@@ -128,10 +136,8 @@ class RetailcrmClasspathBuilder
     protected function buildVersionedClasspath()
     {
         foreach (static::$versionedClasses as $className => $fileNames) {
-            $customizedFile = $this->documentRoot . '/bitrix/php_interface/retailcrm/' . $fileNames[0];
-
-            if (file_exists($customizedFile)) {
-                $this->result[$className] = $customizedFile;
+            if (file_exists($this->documentRoot . $this->customizedFilesPath . $fileNames[0])) {
+                $this->result[$className] = $this->customizedClassesPath . $fileNames[0];
             } else {
                 $this->notIncluded[$className] = sprintf($fileNames[1], $this->version);
             }
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 864624db..334fd103 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 404170ff..f62e267e 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.0.0',
-    'VERSION_DATE' => '2022-02-04 13:00:00'
+    'VERSION'      => '6.0.1',
+    'VERSION_DATE' => '2022-04-08 17:00:00'
 ];