mirror of
https://github.com/retailcrm/prestashop-module.git
synced 2025-04-10 04:10:54 +00:00
Compare commits
3 commits
Author | SHA1 | Date | |
---|---|---|---|
|
3cf7638fc2 | ||
|
c20b285b11 | ||
|
11248f5309 |
7 changed files with 22 additions and 7 deletions
4
.github/workflows/presta.yml
vendored
4
.github/workflows/presta.yml
vendored
|
@ -26,10 +26,10 @@ jobs:
|
||||||
# - php-version: '7.1' - Error install PrestaShop
|
# - php-version: '7.1' - Error install PrestaShop
|
||||||
# branch: '1.7.8.10'
|
# branch: '1.7.8.10'
|
||||||
- php-version: '7.2'
|
- php-version: '7.2'
|
||||||
branch: '1.7.8.10'
|
branch: '1.7.8.11'
|
||||||
coverage: 1
|
coverage: 1
|
||||||
- php-version: '7.3'
|
- php-version: '7.3'
|
||||||
branch: '1.7.8.10'
|
branch: '1.7.8.11'
|
||||||
services:
|
services:
|
||||||
mysql:
|
mysql:
|
||||||
image: mysql:5.7
|
image: mysql:5.7
|
||||||
|
|
|
@ -1,3 +1,12 @@
|
||||||
|
## v3.6.13
|
||||||
|
* Внесены правки в тесты
|
||||||
|
|
||||||
|
## v3.6.12
|
||||||
|
* Добавлена передача дополнительных параметров в GET запросах
|
||||||
|
|
||||||
|
## v3.6.11
|
||||||
|
* Добавлены подсказки в настройках модуля
|
||||||
|
|
||||||
## v3.6.10
|
## v3.6.10
|
||||||
* Изменена валидация ключа коллектора
|
* Изменена валидация ключа коллектора
|
||||||
|
|
||||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
3.6.10
|
3.6.13
|
||||||
|
|
|
@ -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;
|
$url = $this->url . $path;
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,7 @@ require_once dirname(__FILE__) . '/bootstrap.php';
|
||||||
|
|
||||||
class RetailCRM extends Module
|
class RetailCRM extends Module
|
||||||
{
|
{
|
||||||
const VERSION = '3.6.10';
|
const VERSION = '3.6.13';
|
||||||
|
|
||||||
const API_URL = 'RETAILCRM_ADDRESS';
|
const API_URL = 'RETAILCRM_ADDRESS';
|
||||||
const API_KEY = 'RETAILCRM_API_TOKEN';
|
const API_KEY = 'RETAILCRM_API_TOKEN';
|
||||||
const DELIVERY = 'RETAILCRM_API_DELIVERY';
|
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
Loading…
Add table
Reference in a new issue