summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2018-01-23 10:31:32 +0100
committerNicolas Martinelli <nim-odoo@users.noreply.github.com>2018-01-23 11:43:15 +0100
commitbaaee5bf6bcd2db1350f2bde20b2ae457ec51e67 (patch)
tree7775d7a2afbbed941a547c938956e5c23f74bb12 /addons
parent070babf7e2c846215d94fcc9609518a01772aa65 (diff)
[FIX] website_sale_delivery: total on eCommerce
Make sure to reflect the order information. opw-804374
Diffstat (limited to 'addons')
-rw-r--r--addons/website_sale_delivery/controllers/main.py4
-rw-r--r--addons/website_sale_delivery/static/src/js/website_sale_delivery.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 1e94a0362ce..0e86dba0307 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -67,4 +67,6 @@ class WebsiteSaleDelivery(WebsiteSale):
'carrier_id': carrier_id,
'new_amount_delivery': order.delivery_price,
'new_amount_untaxed': order.amount_untaxed,
- 'new_amount_tax': order.amount_tax}
+ 'new_amount_tax': order.amount_tax,
+ 'new_amount_total': order.amount_total,
+ }
diff --git a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
index bbdece5fe55..3cb0df152c1 100644
--- a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
+++ b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
@@ -18,7 +18,7 @@ odoo.define('website_sale_delivery.checkout', function (require) {
$amount_delivery.text(result.new_amount_delivery);
$amount_untaxed.text(result.new_amount_untaxed);
$amount_tax.text(result.new_amount_tax);
- $amount_total.text(result.new_amount_delivery + result.new_amount_untaxed + result.new_amount_tax);
+ $amount_total.text(result.new_amount_total);
$carrier_badge.children('span').text(result.new_amount_delivery);
$carrier_badge.removeClass('hidden');
$compute_badge.addClass('hidden');