diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl index 2a2f2c5cd..c636d41bd 100755 --- a/admin-dev/themes/template/orders/view.tpl +++ b/admin-dev/themes/template/orders/view.tpl @@ -205,7 +205,7 @@
{/if} -

+

{l s='Warning:'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} {displayPrice price=$order->total_paid_tax_incl currency=$currency->id}

diff --git a/classes/order/Order.php b/classes/order/Order.php index ee965d332..fdf88067d 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1475,6 +1475,22 @@ class OrderCore extends ObjectModel return Tools::ps_round($total, 2); } + + /** + * Get the sum of total_paid_tax_incl of the orders with similar reference + * + * @since 1.5.0.1 + * @return float + */ + public function getOrdersTotalPaid() + { + return Db::getInstance()->getValue(' + SELECT SUM(total_paid_tax_incl) + FROM `'._DB_PREFIX_.'orders` + WHERE `reference` = '.(int)$this->reference.' + AND `id_cart` = '.(int)$this->id_cart + ); + } /** * diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 060512aa8..82b871d79 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1024,6 +1024,7 @@ class AdminOrdersControllerCore extends AdminController 'customerStats' => $customer->getStats(), 'products' => $products, 'discounts' => $order->getCartRules(), + 'orders_total_paid_tax_incl' => $order->getOrdersTotalPaid(), // Get the sum of total_paid_tax_incl of the order with similar reference 'total_paid' => $order->getTotalPaid(), 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), 'slips' => OrderSlip::getOrdersSlip($order->id_customer, $order->id),