RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2025-01-23 03:01:41 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
merge
This commit is contained in:
iyzoer 2017-08-16 15:05:35 +03:00
commit 1190fec934
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
catalog/model/extension/retailcrm/order.php
View File

@ -87,7 +87,7 @@ class ModelExtensionRetailcrmOrder extends Model {
$this->load->model('setting/setting'); $this->load->model('setting/setting');
$this->load->model('catalog/product'); $this->load->model('catalog/product');
$this->settings = $this->model_setting_setting->getSetting($this->moduleTitle); $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
if (version_compare(VERSION, '3.0', '<')) { if (version_compare(VERSION, '3.0', '<')) {
$settingPaid = $this->model_setting_setting->getSetting($order_data['payment_code']); $settingPaid = $this->model_setting_setting->getSetting($order_data['payment_code']);
} else { } else {
@ -104,7 +104,7 @@ class ModelExtensionRetailcrmOrder extends Model {
if(!empty($order_data['email'])) { if(!empty($order_data['email'])) {
$order['email'] = $order_data['email']; $order['email'] = $order_data['email'];
} }
$deliveryCost = 0; $deliveryCost = 0;
$orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ; $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ;