RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-22 13:16:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/retailcrm/opencart-module

Browse Source
This commit is contained in:
dkorol 2016-04-11 17:34:10 +03:00
commit acd3591b28
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/model/retailcrm/icml.php
View File

@ -188,7 +188,7 @@ class ModelRetailcrmIcml extends Model
if ($offer['weight'] != '') { if ($offer['weight'] != '') {
$weight = $this->dd->createElement('param'); $weight = $this->dd->createElement('param');
$weight->setAttribute('color', 'weight'); $weight->setAttribute('code', 'weight');
$weight->setAttribute('name', $this->language->get('weight')); $weight->setAttribute('name', $this->language->get('weight'));
$weightValue = (isset($offer['weight_class'])) $weightValue = (isset($offer['weight_class']))
? round($offer['weight'], 3) . ' ' . $offer['weight_class'] ? round($offer['weight'], 3) . ' ' . $offer['weight_class']

1
vqmod/xml/retailcrm_create_order.xml
View File

@ -15,6 +15,7 @@
$order = $this->model_checkout_order->getOrder($this->session->data['order_id']); $order = $this->model_checkout_order->getOrder($this->session->data['order_id']);
$order['products'] = $this->model_account_order->getOrderProducts($this->session->data['order_id']); $order['products'] = $this->model_account_order->getOrderProducts($this->session->data['order_id']);
$order['order_total'] = $this->model_account_order->getOrderTotals($this->session->data['order_id']);
$this->model_retailcrm_order->sendToCrm($order, $this->session->data['order_id']); $this->model_retailcrm_order->sendToCrm($order, $this->session->data['order_id']);
]]></add> ]]></add>