RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-20 01:21:01 +00:00
Code Issues Projects Releases Wiki Activity

Loyalty feature installer (#118)

Browse source 
* fixes for crash during the installation
* add LP activate option
This commit is contained in:
Сергей Чазов 2020-08-24 09:33:43 +03:00 • committed by Павел
parent 1ebe38c8dd
commit 7399c13f7a
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
intaro.retailcrm/install/index.php
View file

@ -57,6 +57,7 @@ class intaro_retailcrm extends CModule
['EVENT_NAME' => 'OnSaleOrderDeleted', 'FROM_MODULE' => 'sale'],
['EVENT_NAME' => 'OnSaleComponentOrderOneStepProcess', 'FROM_MODULE' => 'sale'],
];
public const V5 = 'v5';
public $MODULE_ID = 'intaro.retailcrm';
public $OLD_MODULE_ID = 'intaro.intarocrm';
@ -165,10 +166,10 @@ class intaro_retailcrm extends CModule
$infoSale = CModule::CreateModuleObject('sale')->MODULE_VERSION;
if (version_compare($infoSale, '16', '<=')) {
$APPLICATION->ThrowException(GetMessage("SALE_VERSION_ERR"));
return false;
}
if (!Loader::includeModule('sale')) {
return false;
}
@ -178,7 +179,7 @@ class intaro_retailcrm extends CModule
return false;
}
include($this->INSTALL_PATH . '/../classes/general/Http/Client.php');
include($this->INSTALL_PATH . '/../classes/general/Response/ApiResponse.php');
include($this->INSTALL_PATH . '/../classes/general/RCrmActions.php');
@ -225,7 +226,7 @@ class intaro_retailcrm extends CModule
unset($type);
}
}
include($this->INSTALL_PATH . '/../lib/model/bitrix/abstractmodelproxy.php');
include($this->INSTALL_PATH . '/../lib/model/bitrix/orderprops.php');
include($this->INSTALL_PATH . '/../lib/model/bitrix/tomodule.php');
@ -1019,6 +1020,9 @@ class intaro_retailcrm extends CModule
$dateAgent->format('d.m.Y H:i:s'), // date of first start
30
);
$this->CopyFiles();
if (isset($_POST['LOAD_NOW'])) {
$loader = new RetailCrmICML();
$loader->iblocks = $iblocks;
@ -1292,7 +1296,7 @@ class intaro_retailcrm extends CModule
public function CopyFiles(): void
{
$pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install';
$pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install';
CopyDirFiles(
$pathFrom . '/export',

2
intaro.retailcrm/lib/component/configprovider.php
View file

@ -504,7 +504,7 @@ class ConfigProvider
*/
public static function getCurrencyOrDefault()
{
return self::getCurrency() ?: \Bitrix\Currency\CurrencyManager::getBaseCurrency();
return self::getCurrency() ?: CurrencyManager::getBaseCurrency();
}
/**

2
intaro.retailcrm/lib/component/servicelocator.php
View file

@ -104,7 +104,7 @@ class ServiceLocator
return $service;
}
/**
* Sets service into ServiceContainer.
*