RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-21 20:56:07 +03:00
Code Issues Projects Releases Wiki Activity

Добавлена передача дополнительных параметров в GET запросах (#267)

Browse Source
This commit is contained in:
ellynoize 2024-10-14 20:26:34 +06:00 committed by GitHub
parent c893cf24fb
commit 2c6cccc3b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v4.1.17
* Added additional parameters to GET requests.
## v4.1.16 ## v4.1.16
* Support for services in ICML * Support for services in ICML

2
VERSION
View File

@ -1 +1 @@
4.1.16 4.1.17

2
src/upload/admin/controller/extension/module/retailcrm.php
View File

@ -2,7 +2,7 @@
class ControllerExtensionModuleRetailcrm extends Controller class ControllerExtensionModuleRetailcrm extends Controller
{ {
const VERSION_MODULE = '4.1.16'; const VERSION_MODULE = '4.1.17';
private $_error = []; private $_error = [];
protected $log, $statuses, $payments, $deliveryTypes, $retailcrmApiClient, $moduleTitle, $tokenTitle; protected $log, $statuses, $payments, $deliveryTypes, $retailcrmApiClient, $moduleTitle, $tokenTitle;

15
src/upload/system/library/retailcrm/lib/api/RetailcrmHttpClient.php
View File

@ -46,9 +46,9 @@ class RetailcrmHttpClient
public function makeRequest( public function makeRequest(
$path, $path,
$method, $method,
array $parameters = array() array $parameters = []
) { ) {
$allowedMethods = array(self::METHOD_GET, self::METHOD_POST); $allowedMethods = [self::METHOD_GET, self::METHOD_POST];
if (!in_array($method, $allowedMethods, false)) { if (!in_array($method, $allowedMethods, false)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
@ -60,7 +60,16 @@ class RetailcrmHttpClient
); );
} }
$parameters = array_merge($this->defaultParameters, $parameters);
$parameters = self::METHOD_GET === $method
? array_merge($this->defaultParameters, $parameters, [
'cms_source' => 'OpenCart',
'cms_version' => VERSION,
'php_version' => function_exists('phpversion') ? phpversion() : '',
'module_version' => ControllerExtensionModuleRetailcrm::VERSION_MODULE,
])
: $parameters = array_merge($this->defaultParameters, $parameters);
$url = $this->url . $path; $url = $this->url . $path;