Merge branch 'master' into master

This commit is contained in:
Akolzin Dmitry 2017-06-26 11:35:24 +02:00 committed by GitHub
commit 0aff088a69

View File

@ -209,7 +209,7 @@ class ModelExtensionRetailcrmOrder extends Model {
$couponTotal = abs($totals['value']);
}
}
if(isset($couponTotal)) $order['discount'] = $couponTotal;
$order['createdAt'] = $order_data['date_added'];
$order['paymentType'] = $settings['retailcrm_payment'][$payment_code];