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

v2.2.4

Browse Source
This commit is contained in:
Sergey 2018-10-05 15:24:47 +03:00
parent ee5067f689
commit 6e6177fc71
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,9 @@
## v.2.2.4
* Добавлена установка дефолтной валюты для оплаты при получении истории
* Добавлено получение суммы оплаты из заказа в CMS, если она не передается по истории
## v.2.2.3 ## v.2.2.3
* Добавлена исключение при обработка исключений при обновлении пользователя * добавлена обработка исключений при обновлении пользователя на стороне CMS
## v.2.2.2 ## v.2.2.2
* Добавлена передача комментария клиента при создании заказа * Добавлена передача комментария клиента при создании заказа

2
VERSION
View File

@ -1 +1 @@
2.2.3 2.2.4

13
retailcrm/lib/RetailcrmHistory.php
View File

@ -446,6 +446,7 @@ class RetailcrmHistory
$orderPayment = new OrderPayment(); $orderPayment = new OrderPayment();
$orderPayment->payment_method = $payType; $orderPayment->payment_method = $payType;
$orderPayment->order_reference = $newOrder->reference; $orderPayment->order_reference = $newOrder->reference;
$orderPayment->id_currency = $default_currency;
$orderPayment->amount = $payment['amount']; $orderPayment->amount = $payment['amount'];
$orderPayment->date_add = $payment['paidAt']; $orderPayment->date_add = $payment['paidAt'];
$orderPayment->save(); $orderPayment->save();
@ -501,11 +502,13 @@ class RetailcrmHistory
if ($dtype != null) { if ($dtype != null) {
$orderCarrier->id_carrier = $deliveries[$dtype]; $orderCarrier->id_carrier = $deliveries[$dtype];
} }
if ($dcost != null) { if ($dcost != null) {
$orderCarrier->shipping_cost_tax_incl = $dcost; $orderCarrier->shipping_cost_tax_incl = $dcost;
$orderCarrier->shipping_cost_tax_excl = $dcost; $orderCarrier->shipping_cost_tax_excl = $dcost;
} }
$orderCarrier->id_order = $orderToUpdate->id;
$orderCarrier->update(); $orderCarrier->update();
} }
} }
@ -540,12 +543,20 @@ class RetailcrmHistory
$payType = $pay['name']; $payType = $pay['name'];
} }
} }
$paymentType = Module::getModuleName($payments[$ptype]); $paymentType = Module::getModuleName($payments[$ptype]);
$orderToUpdate->payment = $paymentType != null ? $paymentType : $payments[$ptype]; $orderToUpdate->payment = $paymentType != null ? $paymentType : $payments[$ptype];
$orderPayment = new OrderPayment(); $orderPayment = new OrderPayment();
$orderPayment->payment_method = $payType; $orderPayment->payment_method = $payType;
$orderPayment->order_reference = $orderToUpdate->reference; $orderPayment->order_reference = $orderToUpdate->reference;
$orderPayment->amount = $payment['amount'];
if (isset($payment['amount'])){
$orderPayment->amount = $payment['amount'];
} else {
$orderPayment->amount = $orderToUpdate->total_paid;
}
$orderPayment->id_currency = $default_currency;
$orderPayment->date_add = $payment['paidAt']; $orderPayment->date_add = $payment['paidAt'];
$orderPayment->save(); $orderPayment->save();
} }

4
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.3 * @version 2.2.4
* @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.2'; $this->version = '2.2.4';
$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');