diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 02ffecba335..f58bd048e80 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -380,39 +380,42 @@ window.localStorage.removeItem(testId); } } + overlapsCrash = setTimeout(function () { throwError("Test: '" + testId + "' can't resolve step: '" + step.stepId + "'"); }, (step.delay || defaultDelay) + 1000); - var $element = $(step.element); - if (step.triggers) { - try { - step.triggers(next); - } catch (e) { - throwError(e); + setTimeout(function () { + var $element = $(step.element); + if (step.triggers) { + try { + step.triggers(next); + } catch (e) { + throwError(e); + } } - } - if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return; - - if (step.snippet && step.trigger === 'drag') { - website.TestConsole.dragAndDropSnippet(step.snippet); - } else if (step.trigger && step.trigger.id === 'change') { - $element.trigger($.Event("change", { srcElement: $element })); - } else if (step.sampleText) { - $element.val(step.sampleText); - $element.trigger($.Event("change", { srcElement: $element })); - } else if ($element.is(":visible")) { // Click by default - if (step.trigger.id === 'mousedown') { - $element.trigger($.Event("mousedown", { srcElement: $element })); + if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return; + + if (step.snippet && step.trigger === 'drag') { + website.TestConsole.dragAndDropSnippet(step.snippet); + } else if (step.trigger && step.trigger.id === 'change') { + $element.trigger($.Event("change", { srcElement: $element })); + } else if (step.sampleText) { + $element.val(step.sampleText); + $element.trigger($.Event("change", { srcElement: $element })); + } else if ($element.is(":visible")) { // Click by default + if (step.trigger.id === 'mousedown') { + $element.trigger($.Event("mousedown", { srcElement: $element })); + } + var evt = document.createEvent("MouseEvents"); + evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + $element[0].dispatchEvent(evt); + if (step.trigger.id === 'mouseup') { + $element.trigger($.Event("mouseup", { srcElement: $element })); + } } - var evt = document.createEvent("MouseEvents"); - evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); - $element[0].dispatchEvent(evt); - if (step.trigger.id === 'mouseup') { - $element.trigger($.Event("mouseup", { srcElement: $element })); - } - } - if (!step.triggers) next(); + if (!step.triggers) next(); + },0); } var url = new website.UrlParser(window.location.href); if (tour.path && url.pathname !== tour.path && !window.localStorage.getItem(testId)) { diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index a54fa2a1a7a..7b9d8f5eaa7 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -707,7 +707,7 @@ class Ecommerce(http.Controller): order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context) assert order.website_session_id == request.httprequest.session['website_session_id'] - self._ecommerce_change_pricelist(cr, uid, None, context=None) + request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=None) return request.website.render("website_sale.confirmation", {'order': order})