Compare commits

..

3 commits

Author SHA1 Message Date
ellynoize
3cf7638fc2
Fix tests (#230)
Co-authored-by: anton <ellynoize@kali.home>
2024-10-15 12:44:37 +03:00
ellynoize
c20b285b11
Добавлена передача дополнительных параметров в GET запросах (#229) 2024-10-14 17:16:50 +03:00
ellynoize
11248f5309
Добавлены подсказки в настройках (#228) 2024-09-30 16:38:53 +03:00
7 changed files with 22 additions and 7 deletions

View file

@ -26,10 +26,10 @@ jobs:
# - php-version: '7.1' - Error install PrestaShop
# branch: '1.7.8.10'
- php-version: '7.2'
branch: '1.7.8.10'
branch: '1.7.8.11'
coverage: 1
- php-version: '7.3'
branch: '1.7.8.10'
branch: '1.7.8.11'
services:
mysql:
image: mysql:5.7

View file

@ -1,3 +1,12 @@
## v3.6.13
* Внесены правки в тесты
## v3.6.12
* Добавлена передача дополнительных параметров в GET запросах
## v3.6.11
* Добавлены подсказки в настройках модуля
## v3.6.10
* Изменена валидация ключа коллектора

View file

@ -1 +1 @@
3.6.10
3.6.13

View file

@ -106,7 +106,14 @@ class RetailcrmHttpClient
);
}
$parameters = array_merge($this->defaultParameters, $parameters);
$parameters = self::METHOD_GET === $method
? array_merge($this->defaultParameters, $parameters, [
'cms_source' => 'PrestaShop',
'cms_version' => _PS_VERSION_,
'php_version' => function_exists('phpversion') ? phpversion() : '',
'module_version' => RetailCRM::VERSION,
])
: $parameters = array_merge($this->defaultParameters, $parameters);
$url = $this->url . $path;

View file

@ -48,8 +48,7 @@ require_once dirname(__FILE__) . '/bootstrap.php';
class RetailCRM extends Module
{
const VERSION = '3.6.10';
const VERSION = '3.6.13';
const API_URL = 'RETAILCRM_ADDRESS';
const API_KEY = 'RETAILCRM_API_TOKEN';
const DELIVERY = 'RETAILCRM_API_DELIVERY';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 100 KiB

File diff suppressed because one or more lines are too long