diff --git a/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js b/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js index 007ad6a24b72435055bc6434980ae2fc82280730..f04e56a0495b515efd0f3261f6581ac2da37c91e 100644 --- a/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js +++ b/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js @@ -31,6 +31,8 @@ tour.register('shop_cart_recovery', { 'method': 'sale_get_order', 'args': [[$('html').data('website-id')]], }).then(function (data) { + var orderId = parseInt(data.match(/sale\.order\((\d+),\)/)[1]); + localStorage.setItem(orderIdKey, orderId); window.location.href = "/web/session/logout?redirect=/web/login"; }); }, @@ -39,7 +41,8 @@ tour.register('shop_cart_recovery', { content: "login as admin and go to the SO (backend)", trigger: '.oe_login_form', run: function () { - var url = "/web#action=website_sale.action_orders_ecommerce&view_type=list"; + var orderId = localStorage.getItem(orderIdKey); + var url = "/web#action=sale.action_orders&view_type=form&id=" + orderId; var $loginForm = $('.oe_login_form'); $loginForm.find('input[name="login"]').val("admin"); $loginForm.find('input[name="password"]').val("admin"); @@ -47,14 +50,6 @@ tour.register('shop_cart_recovery', { $loginForm.submit(); }, }, - { - content: "remove filter Confirmed Orders", - trigger: '.o_searchview_input_container .o_searchview_facet:first .o_facet_remove' - }, - { - content: "select the order", - trigger: 'tbody tr:first .o_list_record_selector input[type="checkbox"]', - }, { content: "click action", trigger: '.btn:containsExact("Action")', @@ -67,10 +62,6 @@ tour.register('shop_cart_recovery', { content: "click Send email", trigger: '.btn[name="action_send_mail"]', }, - { - content: "click on the order", - trigger: '.o_data_row:first', - }, { content: "check the mail is sent, grab the recovery link, and logout", trigger: '.o_thread_message_content a:containsExact("Resume order")', diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml index be648ef240f6a54e48a61004baa3a747c63e67b1..cb31ebe716b56f2be1e66147fe822b63f05a6478 100644 --- a/addons/website_sale/views/sale_order_views.xml +++ b/addons/website_sale/views/sale_order_views.xml @@ -141,7 +141,7 @@ action = records.action_recovery_email_send() </field> <field name="binding_model_id" ref="sale.model_sale_order"/> - <field name="binding_view_types">list</field> + <field name="binding_view_types">list,form</field> </record> <record id="action_view_unpaid_quotation_tree" model="ir.actions.act_window">