RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-02 19:33:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from sergeygw1990/master

Browse Source 
v2.2.11
This commit is contained in:
Alex Lushpai 2019-02-13 17:31:49 +03:00 committed by GitHub
commit ab81ffe279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v2.2.11
* Добавлена валидация доменов pro и es в адресах retailCRM
## v2.2.10 ## v2.2.10
* исправление передачи цены доставки в CRM * исправление передачи цены доставки в CRM

2
VERSION
View File

@ -1 +1 @@
2.2.10 2.2.11

6
retailcrm/retailcrm.php
View File

@ -3,7 +3,7 @@
* @author Retail Driver LCC * @author Retail Driver LCC
* @copyright RetailCRM * @copyright RetailCRM
* @license GPL * @license GPL
* @version 2.2.10 * @version 2.2.11
* @link https://retailcrm.ru * @link https://retailcrm.ru
* *
*/ */
@ -38,7 +38,7 @@ class RetailCRM extends Module
{ {
$this->name = 'retailcrm'; $this->name = 'retailcrm';
$this->tab = 'export'; $this->tab = 'export';
$this->version = '2.2.10'; $this->version = '2.2.11';
$this->author = 'Retail Driver LCC'; $this->author = 'Retail Driver LCC';
$this->displayName = $this->l('RetailCRM'); $this->displayName = $this->l('RetailCRM');
$this->description = $this->l('Integration module for RetailCRM'); $this->description = $this->l('Integration module for RetailCRM');
@ -835,7 +835,7 @@ class RetailCRM extends Module
private function validateCrmAddress($address) private function validateCrmAddress($address)
{ {
if (preg_match("/https:\/\/(.*).retailcrm.ru/", $address) === 1) { if (preg_match("/https:\/\/(.*).retailcrm.(pro|ru|es)/", $address) === 1) {
return true; return true;
} }