[IMP] website_sale: improved manual payment management in checkout process
bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
This commit is contained in:
parent
9e64ddf27e
commit
47d8864dc8
|
@ -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)
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue