diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 6f29d3a188d..e6f0a4cf23d 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -283,15 +283,30 @@ Product Kanban product.product - primary - - - - - - - + + + + + +
+ +
+

+ + + + +

+
+
    +
  • Price:
  • +
+
+
+ + + @@ -361,7 +376,7 @@

- + Variants

diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py index 51359c4851a..f01a90c604f 100644 --- a/addons/website_sale/models/product.py +++ b/addons/website_sale/models/product.py @@ -211,5 +211,5 @@ class product_attribute(osv.Model): class product_attribute_value(osv.Model): _inherit = "product.attribute.value" _columns = { - 'color': fields.char("Color for Color Attributes"), + 'color': fields.char("HTML Color Index", help="Here you can set a specific HTML color index (e.g. #ff0000) to display the color on the website if the attibute type is 'Color'."), } diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js index c8b4213b870..d91ca072e28 100644 --- a/addons/website_sale/static/src/js/website.tour.sale.js +++ b/addons/website_sale/static/src/js/website.tour.sale.js @@ -64,8 +64,17 @@ element: "#customize-menu a:contains(Confirm: Add To Cart)", }, { - title: "finish", + title: "click on 'My Cart'", waitFor: "a.a-submit:contains(Add to Cart)", + element: "a[href='/shop/cart']", + }, + { + title: "remove ipad from cart", + element: '#cart_products a.js_add_cart_json:first', + }, + { + title: "finish", + waitFor: '.my_cart_quantity:contains(1)', }, ] });