From f2610aa370cbf40f76a4269d5c72c00d85ed6e39 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 23 Jul 2013 10:18:13 +0200 Subject: [PATCH] [IMP] website_sale: no widget, all in xml bzr revid: chm@openerp.com-20130723081813-wdsuv2g6uc62dm65 --- addons/website/views/views.xml | 2 +- .../website_sale/static/src/js/ecommerce.js | 69 --- .../website_sale/static/src/xml/ecommerce.xml | 49 -- addons/website_sale/views/ecommerce.xml | 520 ++++++++++-------- 4 files changed, 289 insertions(+), 351 deletions(-) delete mode 100644 addons/website_sale/static/src/js/ecommerce.js delete mode 100644 addons/website_sale/static/src/xml/ecommerce.xml diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 872a5e07549..e06cc700378 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -36,7 +36,7 @@
  • Google+
    • -
    +
    Company name
    • Contact us
      • diff --git a/addons/website_sale/static/src/js/ecommerce.js b/addons/website_sale/static/src/js/ecommerce.js deleted file mode 100644 index 4b92b542166..00000000000 --- a/addons/website_sale/static/src/js/ecommerce.js +++ /dev/null @@ -1,69 +0,0 @@ -$(document).ready(function (){ - $('.oe_ecommerce').on('click', '.oe_product .btn-success,.oe_product .btn-primary, .oe_product .btn-inverse, .oe_product_detail .btn-success,.oe_product_detail .btn-primary, .oe_product_detail .btn-inverse', function (e) { - var mycart = !!$('.oe_ecommerce .oe_mycart').size(); - var $button = $(e.currentTarget); - var link = $button.hasClass('btn-inverse') ? '/shop/remove_cart' : '/shop/add_cart'; - var $add = $button.parent().find('.btn-success,.btn-primary'); - var $remove = $button.parent().find('.btn-inverse'); - - $.get(link, {'product_id': $button.data('id')}, function (result) { - var result = JSON.parse(result); - var quantity = parseInt(result.quantity); - $add.find('.oe_quantity').html(quantity); - $add.toggleClass('btn-primary', !quantity).toggleClass('btn-success', !!quantity); - $remove.toggleClass('oe_hidden', !quantity); - if (mycart && !quantity) { - $button.parents('.oe_product:first').remove() - } - $('.oe_ecommerce .oe_total').replaceWith(''+result.totalHTML); - }); - }); -}); - - -openerp.website = function(instance) { - - instance.website.sale = {}; - instance.website.sale.Checkout = instance.web.Widget.extend({ - template: 'Website.sale.Checkout', - events: { - 'click .oe_error_payment': 'error_payment', - }, - start: function() { - var self = this; - this._super.apply(this, arguments); - this.$('input[name="shipping_different"]').on('change', function (ev) { - self.$('.oe_shipping').toggle(); - }); - }, - 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_checkout').size()) - return; - // Init headless webclient - // TODO: Webclient research : use iframe embedding mode - // Meanwhile, let's HACK !!! - var s = new openerp.init(['web', 'website']); - s.web.WebClient.bind_hashchange = s.web.WebClient.show_common = s.web.blockUI = s.web.unblockUI = function() {}; - s.web.WebClient.include({ do_push_state: function() {} }); - var wc = new s.web.WebClient(); - wc.start(); - var instance = openerp.instances[wc.session.name]; - // Another hack since we have no callback when webclient has loaded modules. - instance.web.qweb.add_template('/website_sale/static/src/xml/ecommerce.xml'); - - var editor = new instance.website.sale.Checkout(instance.webclient); - 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 deleted file mode 100644 index c1fddd04543..00000000000 --- a/addons/website_sale/static/src/xml/ecommerce.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - -
      -
      -

      Billing Information

      - - - - - - - - - - - - -
      - -
      -
      -% if object.company_id.paypal_account: -
      - - - - - - -
      -% endif -
      -
      -       - -       \ No newline at end of file diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml index 3582aa5024e..d7a2613080b 100644 --- a/addons/website_sale/views/ecommerce.xml +++ b/addons/website_sale/views/ecommerce.xml @@ -1,250 +1,306 @@ - - + + - + + header_ecommerce + + + + +
    • My cart
      • +
    • Shop
      • +       +       +       +       - + - - - - - - + - + +