From 45d94be6567754fa93432fcfc750ce66527e274d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 22 Jul 2013 12:28:57 +0200 Subject: [PATCH] [IMP] begin widget checkout bzr revid: chm@openerp.com-20130722102857-3t0uos21ojv5tvut --- addons/website/views/views.xml | 4 +-- .../website_sale/static/src/css/ecommerce.css | 11 +++++++ .../static/src/css/ecommerce.sass | 12 +++++++- .../website_sale/static/src/js/ecommerce.js | 14 +++++---- .../website_sale/static/src/xml/ecommerce.xml | 24 ++++++++++----- addons/website_sale/views/ecommerce.xml | 30 ++++++++++++++----- 6 files changed, 73 insertions(+), 22 deletions(-) diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 9122259bb2d..bb4205ea08b 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -4,7 +4,7 @@ - customer + header qweb
@@ -22,7 +22,7 @@ - customer + footer qweb
diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css index 32b81db44a8..bd09a251493 100644 --- a/addons/website_sale/static/src/css/ecommerce.css +++ b/addons/website_sale/static/src/css/ecommerce.css @@ -160,3 +160,14 @@ .oe_ecommerce .oe_checkout label > div > input { margin-bottom: 0; } +.oe_ecommerce .oe_checkout .oe_payment { + position: relative; +} +.oe_ecommerce .oe_checkout .oe_payment .oe_error_payment { + width: 100%; + height: 100%; + position: absolute; + top: +O; + left: 0; + cursor: pointer; +} \ No newline at end of file diff --git a/addons/website_sale/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass index 3dfc8cce1b8..6ce2990bb20 100644 --- a/addons/website_sale/static/src/css/ecommerce.sass +++ b/addons/website_sale/static/src/css/ecommerce.sass @@ -1,11 +1,12 @@ @import "compass/css3" - .oe_ecommerce .oe_total margin-top: 10px td padding: 5px 10px + table + width: auto .oe_products .oe_product .oe_hidden @@ -121,3 +122,12 @@ margin-top: 3px > div > input margin-bottom: 0 + .oe_payment + position: relative + .oe_error_payment + width: 100% + height: 100% + position: absolute + top: +O + left: +0 + cursor: pointer diff --git a/addons/website_sale/static/src/js/ecommerce.js b/addons/website_sale/static/src/js/ecommerce.js index 92519fb9807..4b92b542166 100644 --- a/addons/website_sale/static/src/js/ecommerce.js +++ b/addons/website_sale/static/src/js/ecommerce.js @@ -27,7 +27,7 @@ openerp.website = function(instance) { instance.website.sale.Checkout = instance.web.Widget.extend({ template: 'Website.sale.Checkout', events: { - 'click button[data-action=gotostep]': 'gotostep', + 'click .oe_error_payment': 'error_payment', }, start: function() { var self = this; @@ -36,17 +36,21 @@ openerp.website = function(instance) { self.$('.oe_shipping').toggle(); }); }, - goto: function (e) { - + get_payment_image: function () { + // model: portal.payment.acquirer => form_template + // see Setting => Accounting => Bank & Cash => Configure payment acquiring methods }, save: function () { }, + error_payment: function () { + alert("error_payment"); + }, }); }; $(document).ready(function () { - if (!$('.oe_placeholder_checkout').size()) + if (!$('.oe_checkout').size()) return; // Init headless webclient // TODO: Webclient research : use iframe embedding mode @@ -61,5 +65,5 @@ $(document).ready(function () { instance.web.qweb.add_template('/website_sale/static/src/xml/ecommerce.xml'); var editor = new instance.website.sale.Checkout(instance.webclient); - editor.replace($('.oe_placeholder_checkout')); + editor.appendTo($('.oe_checkout')); }); \ No newline at end of file diff --git a/addons/website_sale/static/src/xml/ecommerce.xml b/addons/website_sale/static/src/xml/ecommerce.xml index 94ba8cac95e..c1fddd04543 100644 --- a/addons/website_sale/static/src/xml/ecommerce.xml +++ b/addons/website_sale/static/src/xml/ecommerce.xml @@ -3,8 +3,8 @@
-

Billing Information

-
+
+

Billing Information

@@ -18,8 +18,8 @@
- -