fix code style

This commit is contained in:
anton 2024-10-14 19:26:42 +06:00
parent 8d0fc9161e
commit 7db5256ac4
2 changed files with 10 additions and 14 deletions

View file

@ -1,5 +1,5 @@
## v3.6.12
* Добавлена передача версий модуля, php и cms в get-запросах к CRM
* Добавлена передача дополнительных параметров в GET запросах
## v3.6.11
* Добавлены подсказки в настройках модуля

View file

@ -43,7 +43,6 @@ class RetailcrmHttpClient
protected $url;
protected $defaultParameters;
protected $versionData;
/**
* Client constructor.
@ -62,13 +61,7 @@ class RetailcrmHttpClient
}
$this->url = $url;
$this->defaultParameters = $defaultParameters;
$this->versionData = [
'php_version' => function_exists('phpversion') ? phpversion() : '',
'cms_source' => 'PrestaShop',
'module_version' => RetailCRM::VERSION,
'cms_version' => _PS_VERSION_
];
$this->defaultParameters = $defaultParameters;
}
/**
@ -113,11 +106,14 @@ class RetailcrmHttpClient
);
}
if (self::METHOD_GET === $method) {
$parameters = array_merge($this->defaultParameters, $parameters, $this->versionData);
} else {
$parameters = array_merge($this->defaultParameters, $parameters);
}
$parameters = self::METHOD_GET === $method
? array_merge($this->defaultParameters, $parameters, [
'php_version' => function_exists('phpversion') ? phpversion() : '',
'cms_source' => 'PrestaShop',
'module_version' => RetailCRM::VERSION,
'cms_version' => _PS_VERSION_,
])
: $parameters = array_merge($this->defaultParameters, $parameters);
$url = $this->url . $path;