diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 8cd78377a90..b99d399a7a6 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -452,7 +452,6 @@
openerp.jsonRpc('/website/customize_template_get', 'call', { 'xml_id': view_name }).then(
function(result) {
_.each(result, function (item) {
- if (item.xml_id === "website.debugger" && !window.location.search.match(/[&?]debug(&|$)/)) return;
if (item.header) {
menu.append('
');
} else {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 92483061e10..97edc1713df 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -251,12 +251,6 @@
-
-
-
-
-
-
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 94869251fad..28195e6495f 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -4,7 +4,6 @@ import openerp.tests
inject = [
("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
- ("openerp.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.event_sale.js")),
]
@openerp.tests.common.at_install(False)
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index cf46797b34d..c34ff045731 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -2,13 +2,12 @@
-
-
-
-
+
+
+
+
-
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b76c585c889..f187e6799ac 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -280,7 +280,7 @@ class website_sale(http.Controller):
@http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True)
def cart_update(self, product_id, add_qty=1, set_qty=0, **kw):
cr, uid, context = request.cr, request.uid, request.context
- request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=add_qty, set_qty=set_qty)
+ request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=float(add_qty), set_qty=float(set_qty))
return request.redirect("/shop/cart")
@http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True)
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 6cc283976d0..ad7823ca6bb 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -1,18 +1,21 @@
$(document).ready(function () {
- var $shippingDifferent = $(".oe_website_sale input[name='shipping_different']");
+$('.oe_website_sale').each(function () {
+ var oe_website_sale = this;
+
+ var $shippingDifferent = $("input[name='shipping_different']", oe_website_sale);
if ($shippingDifferent.is(':checked')) {
- $(".oe_website_sale .js_shipping").show();
+ $(".js_shipping", oe_website_sale).show();
}
$shippingDifferent.change(function () {
- $(".oe_website_sale .js_shipping").toggle();
+ $(".js_shipping", oe_website_sale).toggle();
});
// change for css
- $(document).on('mouseup touchend', '.js_publish', function (ev) {
+ $(oe_website_sale).on('mouseup touchend', '.js_publish', function (ev) {
$(ev.currentTarget).parents(".thumbnail").toggleClass("disabled");
});
- $(".oe_website_sale .oe_cart input.js_quantity").change(function () {
+ $(oe_website_sale).on("change", ".oe_cart input.js_quantity", function () {
var $input = $(this);
var value = parseInt($input.val(), 10);
var line_id = parseInt($input.data('line-id'),10);
@@ -26,11 +29,6 @@ $(document).ready(function () {
location.reload();
return;
}
- if (data.option_ids.length) {
- _.each(data.option_ids, function (line_id) {
- $(".js_quantity[data-line-id="+line_id+"]").text(data.quantity);
- });
- }
var $q = $(".my_cart_quantity");
$q.parent().parent().removeClass("hidden", !data.quantity);
$q.html(data.cart_quantity).hide().fadeIn(600);
@@ -42,7 +40,7 @@ $(document).ready(function () {
});
// hack to add and rome from cart with json
- $('.oe_website_sale').on('click', 'a.js_add_cart_json', function (ev) {
+ $(oe_website_sale).on('click', 'a.js_add_cart_json', function (ev) {
ev.preventDefault();
var $link = $(ev.currentTarget);
var $input = $link.parent().parent().find("input");
@@ -55,15 +53,15 @@ $(document).ready(function () {
return false;
});
- $('.a-submit').on('click', function () {
+ $('.a-submit', oe_website_sale).off('click').on('click', function () {
$(this).closest('form').submit();
});
- $('form.js_attributes input, form.js_attributes select').on('change', function () {
+ $('.form.js_attributes input, form.js_attributes select', oe_website_sale).on('change', function () {
$(this).closest("form").submit();
});
// change price when they are variants
- $('form.js_add_cart_json label').on('mouseup touchend', function (ev) {
+ $('form.js_add_cart_json label', oe_website_sale).on('mouseup touchend', function (ev) {
var $label = $(this);
var $price = $label.parents("form:first").find(".oe_price .oe_currency_value");
if (!$price.data("price")) {
@@ -74,7 +72,7 @@ $(document).ready(function () {
$price.html(value + (dec < 0.01 ? ".00" : (dec < 1 ? "0" : "") ));
});
// hightlight selected color
- $('.css_attribute_color input').on('change', function (ev) {
+ $('.css_attribute_color input', oe_website_sale).on('change', function (ev) {
$('.css_attribute_color').removeClass("active");
$('.css_attribute_color:has(input:checked)').addClass("active");
});
@@ -85,7 +83,7 @@ $(document).ready(function () {
return price + (dec ? '' : '.0') + (dec%10 ? '' : '0');
}
- $('.oe_website_sale').on('change', 'input.js_variant_change, select.js_variant_change', function (ev) {
+ $(oe_website_sale).on('change', 'input.js_variant_change, select.js_variant_change', function (ev) {
var $ul = $(this).parents('ul.js_add_cart_variants:first');
var $parent = $ul.closest('.js_product');
var $product_id = $parent.find('input.product_id').first();
@@ -138,21 +136,21 @@ $(document).ready(function () {
$parent.find(".js_check_product").attr("disabled", "disabled");
}
});
- $('ul.js_add_cart_variants').each(function () {
+ $('ul.js_add_cart_variants', oe_website_sale).each(function () {
$('input.js_variant_change, select.js_variant_change', this).first().trigger('change');
});
- $(".oe_website_sale").on('change', "select[name='country_id']", function () {
+ $(oe_website_sale).on('change', "select[name='country_id']", function () {
var $select = $("select[name='state_id']");
$select.find("option:not(:first)").hide();
var nb = $select.find("option[data-country_id="+($(this).val() || 0)+"]").show().size();
$select.parent().toggle(nb>1);
}).change();
- $(".oe_website_sale").on('change', "select[name='shipping_country_id']", function () {
+ $(oe_website_sale).on('change', "select[name='shipping_country_id']", function () {
var $select = $("select[name='shipping_state_id']");
$select.find("option:not(:first)").hide();
var nb = $select.find("option[data-country_id="+($(this).val() || 0)+"]").show().size();
$select.parent().toggle(nb>1);
}).change();
-
+});
});
diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py
index ec7d5ddb46d..3f79ac0ea81 100644
--- a/addons/website_sale/tests/test_sale_process.py
+++ b/addons/website_sale/tests/test_sale_process.py
@@ -4,7 +4,6 @@ import openerp.tests
inject = [
("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
- ("openerp.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
]
@openerp.tests.common.at_install(False)
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 7e4252df18e..28582020888 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -4,12 +4,6 @@
-
-
-
-
-
-
@@ -17,6 +11,17 @@
+
+
+
+
+
+
+
+
+
+
+