From 47d8864dc8582c4aa330e9252743b4338ec7872e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Jan 2014 15:57:13 +0100
Subject: [PATCH] [IMP] website_sale: improved manual payment management in
 checkout process

bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
---
 addons/website_sale/controllers/main.py    | 14 +++++++-------
 addons/website_sale/views/website_sale.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ed26f90f364..97779557217 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -650,19 +650,19 @@ class Ecommerce(http.Controller):
         tx = request.registry['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
         state = tx.state
         if state == 'done':
-            message = '<h3>Your payment has been received.</h3>'
+            message = '<p>Your payment has been received.</p>'
         elif state == 'cancel':
-            message = '<h3>The payment seems to have been canceled.</h3>'
-        elif state == 'pending' and tx.validation == 'manual':
-            message = '<h3>Your transaction is waiting confirmation.</h3>'
-            message += tx.post_msg
+            message = '<p>The payment seems to have been canceled.</p>'
+        elif state == 'pending' and tx.acquirer_id.validation == 'manual':
+            message = '<p>Your transaction is waiting confirmation.</p>'
+            message += tx.acquirer_id.post_msg
         else:
-            message = '<h3>Your transaction is waiting confirmation.</h3>'
+            message = '<p>Your transaction is waiting confirmation.</p>'
 
         return {
             'state': state,
             'message': message,
-            'validation': tx.validation
+            'validation': tx.acquirer_id.validation
         }
 
     @http.route('/shop/payment/validate/', type='http', auth="public", website=True, multilang=True)
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 6e1112a57f4..5437e46e8d1 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -992,7 +992,7 @@
               <li class="text-muted">Payment<span class="chevron"></span></li>
               <li class="text-primary">Confirmation<span class="chevron"></span></li>
           </ul>
-          <h1 class="mb32">Order Confirmed</h1>
+          <h1 class="mb32">Order <em t-field="order.name"/> Confirmed</h1>
           <div class="row">
               <div class="col-md-8 oe_mycart">
                   <h2>Thank you for your order.</h2>