Compare commits

..

No commits in common. "master" and "v3.6.10" have entirely different histories.

7 changed files with 7 additions and 22 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.11'
branch: '1.7.8.10'
coverage: 1
- php-version: '7.3'
branch: '1.7.8.11'
branch: '1.7.8.10'
services:
mysql:
image: mysql:5.7

View file

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

View file

@ -1 +1 @@
3.6.13
3.6.10

View file

@ -106,14 +106,7 @@ class RetailcrmHttpClient
);
}
$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);
$parameters = array_merge($this->defaultParameters, $parameters);
$url = $this->url . $path;

View file

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

Binary file not shown.

Before

(image error) Size: 100 KiB

After

(image error) Size: 74 KiB

File diff suppressed because one or more lines are too long