RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-04-10 04:10:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from sergeygw1990/master

Browse source 
v2.2.10
This commit is contained in:
Alex Lushpai 2019-01-25 15:37:03 +03:00 • committed by GitHub
commit 72edb2767a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 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.10
* исправление передачи цены доставки в CRM
## v2.2.9
* Добавлена выгрузка габаритов в специальный тег dimensions
* Добавлена выгрузка остатков из CRM

2
VERSION
View file

@ -1 +1 @@
2.2.9
2.2.10

5
retailcrm/retailcrm.php
View file

@ -3,7 +3,7 @@
* @author Retail Driver LCC
* @copyright RetailCRM
* @license GPL
* @version 2.2.9
* @version 2.2.10
* @link https://retailcrm.ru
*
*/
@ -38,7 +38,7 @@ class RetailCRM extends Module
{
$this->name = 'retailcrm';
$this->tab = 'export';
$this->version = '2.2.9';
$this->version = '2.2.10';
$this->author = 'Retail Driver LCC';
$this->displayName = $this->l('RetailCRM');
$this->description = $this->l('Integration module for RetailCRM');
@ -654,6 +654,7 @@ class RetailCRM extends Module
$customer = array_merge($customer, $address['customer']);
$order = array_merge($order, $address['order']);
$comment = $params['order']->getFirstMessage();
$order['delivery']['cost'] = $params['order']->total_shipping;
if ($comment !== false) {
$order['customerComment'] = $comment;