diff --git a/setup/website_sale_product_detail_attribute_image/odoo/addons/website_sale_product_detail_attribute_image b/setup/website_sale_product_detail_attribute_image/odoo/addons/website_sale_product_detail_attribute_image new file mode 120000 index 0000000000..8dc0dc1cf2 --- /dev/null +++ b/setup/website_sale_product_detail_attribute_image/odoo/addons/website_sale_product_detail_attribute_image @@ -0,0 +1 @@ +../../../../website_sale_product_detail_attribute_image \ No newline at end of file diff --git a/setup/website_sale_product_detail_attribute_image/setup.py b/setup/website_sale_product_detail_attribute_image/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/website_sale_product_detail_attribute_image/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/website_sale_product_detail_attribute_image/README.rst b/website_sale_product_detail_attribute_image/README.rst index 8cfa8cd78d..e7130c91de 100644 --- a/website_sale_product_detail_attribute_image/README.rst +++ b/website_sale_product_detail_attribute_image/README.rst @@ -14,13 +14,13 @@ Website Sale Product Detail Attribute Image :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github - :target: https://github.com/OCA/e-commerce/tree/15.0/website_sale_product_detail_attribute_image + :target: https://github.com/OCA/e-commerce/tree/16.0/website_sale_product_detail_attribute_image :alt: OCA/e-commerce .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_product_detail_attribute_image + :target: https://translation.odoo-community.org/projects/e-commerce-16-0/e-commerce-16-0-website_sale_product_detail_attribute_image :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/113/15.0 + :target: https://runbot.odoo-community.org/runbot/113/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -62,6 +62,7 @@ Authors ~~~~~~~ * Tecnativa +* Studio73 Contributors ~~~~~~~~~~~~ @@ -73,7 +74,9 @@ Contributors * Studio73 : * `Studio73 `_: + * Miguel Gandia + * Óscar Seguí Other credits ~~~~~~~~~~~~~ @@ -93,6 +96,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/e-commerce `_ project on GitHub. +This module is part of the `OCA/e-commerce `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_product_detail_attribute_image/__manifest__.py b/website_sale_product_detail_attribute_image/__manifest__.py index f69a6e821c..906420138d 100644 --- a/website_sale_product_detail_attribute_image/__manifest__.py +++ b/website_sale_product_detail_attribute_image/__manifest__.py @@ -1,9 +1,10 @@ # Copyright 2019 Tecnativa - Sergio Teruel +# Copyright 2023 Studio73 - Óscar Seguí # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Website Sale Product Detail Attribute Image", "summary": "Display attributes images in shop product detail", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "development_status": "Production/Stable", "category": "Website", "website": "https://github.com/OCA/e-commerce", @@ -21,8 +22,8 @@ "/website_sale_product_detail_attribute_image/static/src/scss/style.scss", ], "web.assets_tests": [ - "/website_sale_product_detail_attribute_image/static/src/js/" - "website_sale_product_detail_attribute_image_tour.js", + "/website_sale_product_detail_attribute_image/static/tests/tours" + "/website_sale_product_detail_attribute_image.js", ], }, } diff --git a/website_sale_product_detail_attribute_image/readme/CONTRIBUTORS.rst b/website_sale_product_detail_attribute_image/readme/CONTRIBUTORS.rst index 8db1484e78..6a4be09f25 100644 --- a/website_sale_product_detail_attribute_image/readme/CONTRIBUTORS.rst +++ b/website_sale_product_detail_attribute_image/readme/CONTRIBUTORS.rst @@ -5,4 +5,6 @@ * Studio73 : * `Studio73 `_: - * Miguel Gandia + + * Miguel Gandia + * Óscar Seguí diff --git a/website_sale_product_detail_attribute_image/static/description/index.html b/website_sale_product_detail_attribute_image/static/description/index.html index 0a4ed92a32..cb3b713316 100644 --- a/website_sale_product_detail_attribute_image/static/description/index.html +++ b/website_sale_product_detail_attribute_image/static/description/index.html @@ -367,7 +367,7 @@

Website Sale Product Detail Attribute Image

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Production/Stable License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

Production/Stable License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

This module extends the functionality of website sale module to allow to display images, name and values related to product attributes in e-commerce product page.

@@ -442,7 +442,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/e-commerce project on GitHub.

+

This module is part of the OCA/e-commerce project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/website_sale_product_detail_attribute_image/static/src/js/website_sale_product_detail_attribute_image_tour.js b/website_sale_product_detail_attribute_image/static/tests/tours/website_sale_product_detail_attribute_image.js similarity index 79% rename from website_sale_product_detail_attribute_image/static/src/js/website_sale_product_detail_attribute_image_tour.js rename to website_sale_product_detail_attribute_image/static/tests/tours/website_sale_product_detail_attribute_image.js index bb12871d02..e6bfb9555e 100644 --- a/website_sale_product_detail_attribute_image/static/src/js/website_sale_product_detail_attribute_image_tour.js +++ b/website_sale_product_detail_attribute_image/static/tests/tours/website_sale_product_detail_attribute_image.js @@ -4,8 +4,13 @@ odoo.define("website_sale_product_detail_attribute_image.tour", function (require) { "use strict"; + var session = require("web.session"); + + var domReady = new Promise(function (resolve) { + $(resolve); + }); + var ready = Promise.all([domReady, session.is_bound]); var tour = require("web_tour.tour"); - var base = require("web_editor.base"); var steps = [ { @@ -22,7 +27,7 @@ odoo.define("website_sale_product_detail_attribute_image.tour", function (requir { url: "/shop", test: true, - wait_for: base.ready(), + wait_for: ready, }, steps ); diff --git a/website_sale_product_detail_attribute_image/tests/test_website_sale_product_detail_attribute_image.py b/website_sale_product_detail_attribute_image/tests/test_website_sale_product_detail_attribute_image.py index f967847f4e..1705d1de48 100644 --- a/website_sale_product_detail_attribute_image/tests/test_website_sale_product_detail_attribute_image.py +++ b/website_sale_product_detail_attribute_image/tests/test_website_sale_product_detail_attribute_image.py @@ -1,8 +1,9 @@ # Copyright 2019 Tecnativa - Sergio Teruel # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo.tests.common import HttpCase +from odoo.tests import HttpCase, tagged +@tagged("post_install", "-at_install") class WebsiteSaleHttpCase(HttpCase): def setUp(self): super().setUp() @@ -87,13 +88,9 @@ def setUp(self): def test_ui_website(self): """Test frontend tour.""" - tour = ( - "odoo.__DEBUG__.services['web_tour.tour']", + self.start_tour( + "/", "website_sale_product_detail_attribute_image", - ) - self.browser_js( - url_path="/", - code="%s.run('%s')" % tour, - ready="%s.tours['%s'].ready" % tour, login="admin", + timeout=200, ) diff --git a/website_sale_product_detail_attribute_image/views/templates.xml b/website_sale_product_detail_attribute_image/views/templates.xml index 5d0a3edaa3..67f7b5ad84 100644 --- a/website_sale_product_detail_attribute_image/views/templates.xml +++ b/website_sale_product_detail_attribute_image/views/templates.xml @@ -10,7 +10,7 @@ name="Attribute's Images" >