From 5fc0d839eed26fb5beca4333105465736b30d74e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Jul 2013 14:23:30 +0200
Subject: [PATCH] [IMP] website_sale: payments

bzr revid: chm@openerp.com-20130724122330-zxvh94cdn8f2fvzc
---
 addons/website_sale/controllers/main.py | 14 ++++++++++----
 addons/website_sale/views/ecommerce.xml | 19 +++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index e000195ccf7..9067dc50a4a 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -198,17 +198,18 @@ class Ecommerce(http.Controller):
     def checkout(self, **post):
         cr, uid, partner_id = self.get_cr_uid()
         values = self.get_values()
+        order = values['order']
 
-        if values['order'].state != 'draft':
+        if order.state != 'draft':
             return self.confirmed(**post)
-        if not values['order'].order_line:
+        if not order.order_line:
             return self.mycart(**post)
 
         partner_obj = request.registry.get('res.partner')
         user_obj = request.registry.get('res.users')
         country_obj = request.registry.get('res.country')
         country_state_obj = request.registry.get('res.country.state')
-        obj_data = request.registry.get('ir.model.data')
+        payment_obj = request.registry.get('portal.payment.acquirer')
 
         values['partner'] = False
 
@@ -226,6 +227,12 @@ class Ecommerce(http.Controller):
         values['countries'] = country_obj.browse(cr, uid, country_obj.search(cr, uid, [(1, "=", 1)]))
         values['states'] = country_state_obj.browse(cr, uid, country_state_obj.search(cr, uid, [(1, "=", 1)]))
 
+        payment_ids = payment_obj.search(cr, uid, [('visible', '=', True)])
+        values['payments'] = payment_obj.browse(cr, uid, payment_ids)
+        for payment in values['payments']:
+            content = payment_obj.render(cr, uid, payment.id, order, order.name, order.pricelist_id.currency_id, order.amount_total)
+            payment._content = content
+
         return request.registry.get("ir.ui.view").render(cr, uid, "website_sale.checkout", values)
 
     @http.route(['/shop/confirm_order'], type='http', auth="admin")
@@ -234,7 +241,6 @@ class Ecommerce(http.Controller):
         values = self.get_values()
         json = {'error': [], 'validation': False}
         partner_obj = request.registry.get('res.partner')
-        obj_data = request.registry.get('ir.model.data')
 
         if values['order'].state != 'draft':
             json['validation'] = True
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index 94fb16d3d42..e719943bffb 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -254,18 +254,13 @@
                             </select></label>
                         </div>
                         <div class="js_payments css_payments row">
-                            <h3 class="span8">Choose your payment method</h3>
-                            <div class="css_payment">
-                                <div class="js_error_payment css_error_payment"> </div>
-                                <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
-                                  <input type="hidden" name="cmd" value="_xclick"/>
-                                  <input type="hidden" name="business" value="${object.company_id.paypal_account}"/>
-                                  <input type="hidden" name="item_name" value="${object.company_id.name} ${kind.title()} ${reference}"/>
-                                  <input type="hidden" name="amount" value="${amount}"/>
-                                  <input type="hidden" name="currency_code" value="${currency.name}"/>
-                                  <input type="image" name="submit" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
-                                </form>
-                            </div>
+                            <h3 class="span8">Click on your payment method</h3>
+                            <t t-foreach="payments or []" t-as="payment">
+                                <div class="css_payment" t-att-title="payment.name">
+                                    <div class="js_error_payment css_error_payment"> </div>
+                                    <t t-raw="payment._content"/>
+                                </div>
+                            </t>
                         </div>
                     </div>
                 </div>