RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-07 18:49:23 +03:00
Code Issues Projects Releases Wiki Activity

Поправил передачу данных по модулю в маркетплейсе для v4

Browse Source
This commit is contained in:
Akolzin Dmitry 2018-08-31 15:00:46 +03:00
parent e1f429449f
commit 5f80630806
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
intaro.retailcrm/install/index.php
View File

@ -1046,29 +1046,40 @@ class intaro_retailcrm extends CModule
$api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0); $api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0);
$api_version = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_VERSION, 0); $api_version = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_VERSION, 0);
$this->RETAIL_CRM_API = new \RetailCrm\ApiClient($api_host, $api_key); $this->RETAIL_CRM_API = new \RetailCrm\ApiClient($api_host, $api_key);
$clientId = hash('md5', date('Y-m-d H:i:s'));
$scheme = isset($_SERVER['HTTPS']) ? 'https://' : 'http://'; $scheme = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
$baseUrl = $scheme . $_SERVER['HTTP_HOST']; $baseUrl = $scheme . $_SERVER['HTTP_HOST'];
$code = 'bitrix';
$logo = 'https://s3.eu-central-1.amazonaws.com/retailcrm-billing/images/5af47fe682bf2-1c-bitrix-logo.svg';
$accountUrl = $baseUrl . '/bitrix/admin/settings.php?mid=intaro.retailcrm';
try { try {
$configuration = array(
'clientId' => $clientId,
'code' => 'bitrix',
'integrationCode' => 'bitrix',
'active' => true,
'name' => GetMessage('API_MODULE_NAME'),
'logo' => 'https://s3.eu-central-1.amazonaws.com/retailcrm-billing/images/5af47fe682bf2-1c-bitrix-logo.svg',
'baseUrl' => $baseUrl,
'accountUrl' => $baseUrl . '/bitrix/admin/settings.php?mid=intaro.retailcrm'
);
if ($api_version == 'v4') { if ($api_version == 'v4') {
$configuration = array(
'name' => GetMessage('API_MODULE_NAME'),
'code' => $code,
'logo' => $logo,
'configurationUrl' => $accountUrl,
'active' => true
);
$this->RETAIL_CRM_API->marketplaceSettingsEdit($configuration); $this->RETAIL_CRM_API->marketplaceSettingsEdit($configuration);
} else { } else {
$this->RETAIL_CRM_API->integrationModulesEdit($configuration); $clientId = hash('md5', date('Y-m-d H:i:s'));
}
COption::SetOptionString($this->MODULE_ID, $this->CLIENT_ID, $clientId); $configuration = array(
'clientId' => $clientId,
'code' => $code,
'integrationCode' => $code,
'active' => true,
'name' => GetMessage('API_MODULE_NAME'),
'logo' => $logo,
'baseUrl' => $baseUrl,
'accountUrl' => $accountUrl
);
$this->RETAIL_CRM_API->integrationModulesEdit($configuration);
COption::SetOptionString($this->MODULE_ID, $this->CLIENT_ID, $clientId);
}
} catch (\RetailCrm\Exception\CurlException $e) { } catch (\RetailCrm\Exception\CurlException $e) {
RCrmActions::eventLog( RCrmActions::eventLog(
'intaro.retailcrm/install/index.php', 'RetailCrm\ApiClient::statisticUpdate::CurlException', 'intaro.retailcrm/install/index.php', 'RetailCrm\ApiClient::statisticUpdate::CurlException',
@ -1186,6 +1197,8 @@ class intaro_retailcrm extends CModule
} }
if ($api_version == 'v4') { if ($api_version == 'v4') {
unset($configuration['integrationCode']);
unset($configuration['clientId']);
$retail_crm_api->marketplaceSettingsEdit($configuration); $retail_crm_api->marketplaceSettingsEdit($configuration);
} else { } else {
$retail_crm_api->integrationModulesEdit($configuration); $retail_crm_api->integrationModulesEdit($configuration);