diff --git a/controllers/main.py b/controllers/main.py
index 6088e727f59..2fdfe53d5ed 100644
--- a/controllers/main.py
+++ b/controllers/main.py
@@ -10,16 +10,6 @@ class WebsiteSale(WebsiteSale):
     def pricelist(self, promo, **post):
         order = request.website.sale_get_order()
         coupon_status = request.env['sale.coupon.apply.code'].sudo().apply_coupon(order, promo)
-        print coupon_status.get('error', False)
         if coupon_status.get('error', False):
             return super(WebsiteSale, self).pricelist(promo, **post)
-        return request.redirect("/shop/cart")
-
-    @http.route(['/shop/pricelist_payment'], type='http', auth="public", website=True)
-    def pricelist_payment(self, promo, **post):
-        order = request.website.sale_get_order()
-        coupon_status = request.env['sale.coupon.apply.code'].sudo().apply_coupon(order, promo)
-        print coupon_status.get('error', False)
-        if coupon_status.get('error', False):
-            return super(WebsiteSale, self).pricelist(promo, **post)
-        return request.redirect("/shop/payment")
+        return request.redirect(post.get('r', '/shop/cart'))
diff --git a/views/website_sale_templates.xml b/views/website_sale_templates.xml
index 165762c0e53..ff9f59c8ed9 100644
--- a/views/website_sale_templates.xml
+++ b/views/website_sale_templates.xml
@@ -13,7 +13,7 @@
         </div>
     </xpath>
 </template>
-<template id="sale_coupon_result" inherit_id="website_sale.reduction_code">
+<template id="sale_coupon_result" inherit_id="website_sale.coupon_form">
     <xpath expr="//form[@name='coupon_code']" position="after">
         <t t-if="website_sale_order and website_sale_order.applied_coupon_ids">
             <t t-foreach="website_sale_order.applied_coupon_ids" t-as="coupon">
@@ -40,7 +40,7 @@
                 </div>
             </t>
         </t>
-        <t t-if="code_not_available">
+        <t t-if="request.params.get('code_not_available')">
             <div class="panel panel-danger mt16">
                 <div class="panel-heading clearfix">
                     <span class="pull-left">Invalid or expired coupon code</span>
@@ -50,41 +50,18 @@
     </xpath>
     <xpath expr="//t[@name='code_not_available']" position="replace"/>
 </template>
-<template id="sale_coupon_result_payment" inherit_id="website_sale.reduction_code_payment">
-    <xpath expr="//form[@name='coupon_code']" position="after">
-        <t t-if="website_sale_order and website_sale_order.applied_coupon_ids">
-            <t t-foreach="website_sale_order.applied_coupon_ids" t-as="coupon">
-                <div class="panel panel-success mt16">
-                    <div class="panel-heading clearfix">
-                    <span class="pull-left">You have successfully applied coupon: <b t-esc="coupon.code"/></span>
-                    </div>
-                </div>
-            </t>
-        </t>
-        <t t-if="website_sale_order and website_sale_order.promo_code">
-            <div class="panel panel-success mt16">
-                <div class="panel-heading clearfix">
-                <span class="pull-left">You have successfully applied coupon: <b t-esc="website_sale_order.promo_code"/></span>
-                </div>
-            </div>
-        </t>
-        <t t-if="website_sale_order and website_sale_order.generated_coupon_ids">
-            <t t-foreach="website_sale_order.generated_coupon_ids" t-as="coupon">
-                <div class="panel panel-success mt16">
-                    <div class="panel-heading clearfix">
-                        <span class="pull-left">Your reward <b t-esc="coupon.discount_line_product_id.name"/> is available on a next order with this coupon code: <b t-esc="coupon.code"/></span>
-                    </div>
-                </div>
-            </t>
-        </t>
-        <t t-if="code_not_available">
-            <div class="panel panel-danger mt16">
-                <div class="panel-heading clearfix">
-                    <span class="pull-left">Invalid or expired coupon code</span>
-                </div>
-            </div>
-        </t>
+
+<template id="cart_discount" name="Discount" inherit_id="website_sale.total">
+    <xpath expr="//div[@id='order_total']" position="before">
+        <div class="row" id="order_discounted" t-if="website_sale_order and website_sale_order.reward_amount">
+              <span class="col-xs-6 text-right text-muted" title="Discounted amount"> Discount:</span>
+              <span class="col-xs-6 text-right-not-xs text-left-xs text-muted">
+                  <span t-field="website_sale_order.reward_amount" style="white-space: nowrap;" t-options='{
+                          "widget": "monetary",
+                          "display_currency": website_sale_order.currency_id,
+                      }'/>
+              </span>
+        </div>
     </xpath>
-    <xpath expr="//t[@name='code_not_available']" position="replace"/>
 </template>
 </odoo>