diff --git a/retailcrm/lib/RetailcrmOrderBuilder.php b/retailcrm/lib/RetailcrmOrderBuilder.php index 450d119..753ae7f 100644 --- a/retailcrm/lib/RetailcrmOrderBuilder.php +++ b/retailcrm/lib/RetailcrmOrderBuilder.php @@ -884,6 +884,10 @@ class RetailcrmOrderBuilder ); $crmOrder['discountManualAmount'] = round($order->total_discounts, 2); + + if (((float) $crmOrder['discountManualAmount']) > ((float) $order_payment['amount'])) { + $crmOrder['discountManualAmount'] = $order_payment['amount']; + } } if (isset($order_payment)) { diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index f3a219c..8488704 100644 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -500,9 +500,13 @@ class RetailCRM extends Module 'createdAt' => RetailcrmTools::verifyDate($params['order']->date_add, 'Y-m-d H:i:s') ? $params['order']->date_add : date('Y-m-d H:i:s'), 'delivery' => array('cost' => $params['order']->total_shipping), - 'discountManualAmount' => $params['order']->total_discounts + 'discountManualAmount' => round($params['order']->total_discounts, 2) ); + if (((float) $order['discountManualAmount']) > ((float) $params['order']->total_paid)) { + $crmOrder['discountManualAmount'] = $params['order']->total_paid; + } + try { $orderdb = new Order($params['order']->id); } catch (PrestaShopDatabaseException $exception) {