From 1b640440133476e1586ce8e4bbcc0539d5a80cc2 Mon Sep 17 00:00:00 2001 From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com> Date: Mon, 2 Sep 2024 09:12:05 +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=BE=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20(#359)?= 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/index.php | 13 +------------ intaro.retailcrm/install/version.php | 4 ++-- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d5050a..a345c860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2024-08-26 v.6.5.26 +- Исправлено удаление модуля + ## 2024-08-12 v.6.5.25 - Улучшена генерация каталога с маркированными товарами diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 21b7c3c2..959a8696 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Улучшена генерация каталога с маркированными товарами +- Исправлено удаление модуля diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index 7a67fc42..dc229fd1 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -205,20 +205,8 @@ class intaro_retailcrm extends CModule include($this->INSTALL_PATH . '/../lib/component/apiclient/clientadapter.php'); include($this->INSTALL_PATH . '/../lib/component/advanced/loyaltyinstaller.php'); - - /* $this->CopyFiles(); - $this->addEvents(); - $this->addAgreement(); - $this->addUserFields();*/ - $this->installExport(); $this->subscriptionSetup(); - //$this->createCustomPropertyFile(); - - /* OrderLoyaltyDataService::createLoyaltyHlBlock(); - - $service = new OrderLoyaltyDataService(); - $service->addCustomersLoyaltyFields();*/ if ($step == 11) { $arResult['arSites'] = RCrmActions::getSitesList(); @@ -1228,6 +1216,7 @@ class intaro_retailcrm extends CModule require_once($this->INSTALL_PATH . '/../classes/general/history/RetailCrmHistory_v5.php'); require_once($this->INSTALL_PATH . '/../lib/component/constants.php'); require_once($this->INSTALL_PATH . '/../classes/general/cart/RetailCrmCart_v5.php'); + require_once($this->INSTALL_PATH . '/../lib/component/advanced/loyaltyinstaller.php'); $api_host = COption::GetOptionString($this->MODULE_ID, Constants::CRM_API_HOST_OPTION, 0); $api_key = COption::GetOptionString($this->MODULE_ID, Constants::CRM_API_KEY_OPTION, 0); diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 8850a7a2..e61759e1 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.5.25', - 'VERSION_DATE' => '2024-08-12 12:00:00' + 'VERSION' => '6.5.26', + 'VERSION_DATE' => '2024-08-26 17:30:00' ];