diff --git a/addons/payment_acquirer/__openerp__.py b/addons/payment_acquirer/__openerp__.py index 0b3aa2e89f0..b4c5d552696 100644 --- a/addons/payment_acquirer/__openerp__.py +++ b/addons/payment_acquirer/__openerp__.py @@ -26,6 +26,7 @@ 'version': '0.1', 'description': """Payment acquirer module, use to display payment method and validate the payments.""", 'author': 'OpenERP SA', + 'depends': ['website', 'decimal_precision'], 'data': [ 'views/acquirer_view.xml', 'payment_acquirer_data.xml', diff --git a/addons/payment_acquirer/payment_acquirer.py b/addons/payment_acquirer/payment_acquirer.py index e0f0aaf2922..55a3cf6f023 100644 --- a/addons/payment_acquirer/payment_acquirer.py +++ b/addons/payment_acquirer/payment_acquirer.py @@ -24,21 +24,21 @@ from openerp.osv import osv, fields from openerp.tools import float_repr -class type(osv.Model): +class type(osv.osv): _name = 'payment.acquirer.type' _columns = { 'name': fields.char('Name', required=True), } -class acquirer(osv.Model): +class acquirer(osv.osv): _name = 'payment.acquirer' _description = 'Online Payment Acquirer' _columns = { 'name': fields.char('Name', required=True), 'type_id': fields.many2one('payment.acquirer.type', required=True), - 'form_template_id': fields.many2one('ir.ui.view', translate=True, required=True), + 'form_template_id': fields.many2one('ir.ui.view', required=True), 'visible': fields.boolean('Visible', help="Make this payment acquirer available (Customer invoices, etc.)"), } @@ -51,6 +51,9 @@ class acquirer(osv.Model): user = self.pool.get("res.users") precision = self.pool.get("decimal.precision").precision_get(cr, uid, 'Account') + if not context: + context = {} + qweb_context = {} qweb_context.update( object=object, @@ -62,10 +65,15 @@ class acquirer(osv.Model): context=context ) - res = [] - for pay in self.browse(cr, uid, ids, context=context): - res[pay.id] = pay.form_template_id.render(qweb_context.copy(), context=context) - return res + pays = self.browse(cr, uid, ids, context=context) + + if isinstance(ids, list): + res = [] + for pay in pays: + res[pay.id] = pay.form_template_id.render(qweb_context.copy(), engine='ir.qweb', context=context) + return res + else: + return pays.form_template_id.render(qweb_context, engine='ir.qweb', context=context) def validate_payement(self, cr, uid, ids, object, reference, currency, amount, context=None): res = [] diff --git a/addons/payment_acquirer/payment_acquirer_data.xml b/addons/payment_acquirer/payment_acquirer_data.xml index b857a41e38b..62ba7a2530a 100644 --- a/addons/payment_acquirer/payment_acquirer_data.xml +++ b/addons/payment_acquirer/payment_acquirer_data.xml @@ -1,37 +1,48 @@ - + paypal + + + + + + + Paypal + + + + + + virement - - Paypal - - - - - - - - - ]]> - - + - + Virement - - Numero de compte: - Communication: - - ]]> - + + diff --git a/addons/payment_acquirer/views/acquirer_view.xml b/addons/payment_acquirer/views/acquirer_view.xml index b6f783f82ec..d5dfc88c537 100644 --- a/addons/payment_acquirer/views/acquirer_view.xml +++ b/addons/payment_acquirer/views/acquirer_view.xml @@ -44,7 +44,7 @@ - portal.payment.acquirer + payment.acquirer diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index 634078fe149..f3e370d989d 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -9,7 +9,7 @@ OpenERP E-Commerce """, 'author': 'OpenERP SA', - 'depends': ['website', 'sale', 'product'], + 'depends': ['website', 'sale', 'product', 'payment_acquirer'], 'data': [ 'website_sale_data.xml', 'views/website_sale.xml', diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 8756b6f6722..32fb9d28ca9 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -624,12 +624,12 @@ class Ecommerce(http.Controller): 'order': order } - payment_obj = request.registry.get('portal.payment.acquirer') + payment_obj = request.registry.get('payment.acquirer') payment_ids = payment_obj.search(request.cr, SUPERUSER_ID, [('visible', '=', True)], context=request.context) values['payments'] = payment_obj.browse(request.cr, SUPERUSER_ID, payment_ids, request.context) for payment in values['payments']: content = payment_obj.render(request.cr, SUPERUSER_ID, payment.id, order, order.name, order.pricelist_id.currency_id, order.amount_total) - payment._content = content + payment._content = content.strip() return request.website.render("website_sale.payment", values) diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index ab10c04ad9b..78aa6042b5c 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -58,11 +58,11 @@ $(document).ready(function () { $('form.js_add_cart_json label').on('mouseup', function (ev) { ev.preventDefault(); var $label = $(ev.currentTarget); - var $price = $label.parent("form").find(".oe_price"); + var $price = $label.parent("form").find(".oe_price .oe_currency_value"); if (!$price.data("price")) { - $price.data("price", parseFloat($price.html())); + $price.data("price", parseFloat($price.text())); } - $price.html($price.data("price")+parseFloat($label.find(".badge span").html() || 0)); + $price.html($price.data("price")+parseFloat($label.find(".badge span").text() || 0)); }); $(document).on('click', '.js_publish_management .js_go_to_top,.js_publish_management .js_go_to_bottom', function (event) { diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index a263a01ed2e..b7a053b2599 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -286,14 +286,20 @@

- € - - - € -   +
-

€

+
@@ -866,13 +872,13 @@

Select your payment method:

- -
- +