diff --git a/website_apps_store/README.rst b/website_apps_store/README.rst
new file mode 100644
index 00000000..098b1107
--- /dev/null
+++ b/website_apps_store/README.rst
@@ -0,0 +1,86 @@
+==================
+Website Apps Store
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e1a07ed3537367248ca005e8ca2a08b5077fa74bc33b4ea65005121eb6bf0bf9
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fapps--store-lightgray.png?logo=github
+    :target: https://github.com/OCA/apps-store/tree/18.0/website_apps_store
+    :alt: OCA/apps-store
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/apps-store-18-0/apps-store-18-0-website_apps_store
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/apps-store&target_branch=18.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Providing facility for displaying the module specific information in a
+standard Odoo e-commerce website (front-end) and download the zip file
+of the selected product.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/apps-store/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/apps-store/issues/new?body=module:%20website_apps_store%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* BizzAppDev
+
+Contributors
+------------
+
+-  Ruchir Shukla <ruchir@bizzappdev.com
+-  Divya Modi <divya.modi@bizzappdev.com>
+-  Eric Caudal <eric.caudal@elico-corp.com>
+-  Oscar Alcala <oscar@vauxoo.com>
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Víctor M.M. Torres
+   -  Alexandre D. Díaz
+   -  Ernesto Tejeda
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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/apps-store <https://github.com/OCA/apps-store/tree/18.0/website_apps_store>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_apps_store/__init__.py b/website_apps_store/__init__.py
new file mode 100644
index 00000000..91c5580f
--- /dev/null
+++ b/website_apps_store/__init__.py
@@ -0,0 +1,2 @@
+from . import controllers
+from . import models
diff --git a/website_apps_store/__manifest__.py b/website_apps_store/__manifest__.py
new file mode 100644
index 00000000..e57ff84e
--- /dev/null
+++ b/website_apps_store/__manifest__.py
@@ -0,0 +1,33 @@
+# Copyright 2018 BizzAppDev
+# Copyright 2018-2021 Tecnativa
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Website Apps Store",
+    "version": "18.0.1.0.0",
+    "author": "Odoo Community Association (OCA), BizzAppDev",
+    "website": "https://github.com/OCA/apps-store",
+    "license": "AGPL-3",
+    "category": "Sales",
+    "depends": [
+        "website_sale",
+        "apps_download",
+        "apps_product_creator",
+    ],
+    "summary": "Website Apps Store",
+    "data": [
+        "views/templates.xml",
+        "views/suspicious_templates.xml",
+    ],
+    "assets": {
+        "web.assets_frontend": [
+            "website_apps_store/static/src/scss/main.scss",
+            "website_apps_store/static/src/js/website_sale.js",
+        ],
+        "web.assets_tests": [
+            "website_apps_store/static/src/js/website_apps_store_tour.js",
+        ],
+    },
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/website_apps_store/controllers/__init__.py b/website_apps_store/controllers/__init__.py
new file mode 100644
index 00000000..12a7e529
--- /dev/null
+++ b/website_apps_store/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/website_apps_store/controllers/main.py b/website_apps_store/controllers/main.py
new file mode 100644
index 00000000..df1f1470
--- /dev/null
+++ b/website_apps_store/controllers/main.py
@@ -0,0 +1,253 @@
+# Copyright 2017-2018 BizzAppDev
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import base64
+import logging
+
+from odoo import _, http
+from odoo.exceptions import UserError, ValidationError
+from odoo.http import request
+
+from odoo.addons.http_routing.models.ir_http import IrHttp
+from odoo.addons.website.controllers.main import QueryURL
+from odoo.addons.website_sale.controllers.main import TableCompute, WebsiteSale
+
+_logger = logging.getLogger(__name__)
+
+PPG = 20  # Products Per Page
+PPR = 4  # Products Per Row
+
+
+class WebsiteSaleCustom(WebsiteSale):
+    def _get_search_domain(
+        self, search, category, attrib_values, search_in_description=True
+    ):
+        domain = request.website.sale_product_domain()
+        if search:
+            for srch in search.split(" "):
+                domain += [
+                    "|",
+                    "|",
+                    "|",
+                    "|",
+                    "|",
+                    "|",
+                    "|",
+                    "|",
+                    ("name", "ilike", srch),
+                    ("technical_name", "ilike", srch),
+                    ("description", "ilike", srch),
+                    ("description_sale", "ilike", srch),
+                    ("product_variant_ids.default_code", "ilike", srch),
+                    (
+                        "product_variant_ids.product_template_attribute_value_ids.name",
+                        "ilike",
+                        srch,
+                    ),
+                    ("product_variant_ids.app_description_rst_html", "ilike", srch),
+                    ("product_variant_ids.app_author_ids.name", "ilike", srch),
+                    ("product_variant_ids.app_summary", "ilike", srch),
+                ]
+        if category:
+            domain += [("public_categ_ids", "child_of", int(category))]
+
+        if attrib_values:
+            attrib = None
+            ids = []
+            for value in attrib_values:
+                if not attrib:
+                    attrib = value[0]
+                    ids.append(value[1])
+                elif value[0] == attrib:
+                    ids.append(value[1])
+                else:
+                    domain += [("attribute_line_ids.value_ids", "in", ids)]
+                    attrib = value[0]
+                    ids = [value[1]]
+            if attrib:
+                domain += [("attribute_line_ids.value_ids", "in", ids)]
+
+        return domain
+
+    @http.route()
+    def shop(self, page=0, category=None, search="", ppg=False, **post):
+        res = super().shop(page=page, category=category, search=search, ppg=ppg, **post)
+
+        if ppg:
+            try:
+                ppg = int(ppg)
+            except ValueError:
+                ppg = PPG
+            post["ppg"] = ppg
+        else:
+            ppg = PPG
+
+        attrib_list = request.httprequest.args.getlist("attrib")
+        attrib_values = [[int(x) for x in v.split("-")] for v in attrib_list if v]
+        attributes_ids = {v[0] for v in attrib_values}
+        attrib_set = {v[1] for v in attrib_values}
+        domain = self._get_search_domain(search, category, attrib_values)
+
+        keep = QueryURL(
+            "/shop",
+            category=category and int(category),
+            search=search,
+            attrib=attrib_list,
+            order=post.get("order"),
+            maturity=post.get("maturity"),
+            version=post.get("version"),
+            author=post.get("author"),
+        )
+        if post.get("version"):
+            field_name = (
+                "product_variant_ids.product_template_attribute_value_ids"
+                + ".product_attribute_value_id.id"
+            )
+            domain += [
+                (
+                    field_name,
+                    "=",
+                    post.get("version"),
+                )
+            ]
+        if post.get("author"):
+            domain += [
+                ("product_variant_ids.app_author_ids.id", "=", post.get("author"))
+            ]
+        if post.get("maturity", False):
+            domain += [
+                (
+                    "product_variant_ids.app_development_status",
+                    "=",
+                    post.get("maturity"),
+                )
+            ]
+
+        url = "/shop"
+        if search:
+            post["search"] = search
+        if attrib_list:
+            post["attrib"] = attrib_list
+
+        category = request.env["product.public.category"].browse(int(category or 0))
+        if category:
+            url = f"/shop/category/{IrHttp._slug(category)}"
+
+        attribute_id = request.env.ref("apps_product_creator.attribute_odoo_version")
+        category_all = request.env["product.public.category"].search([])
+        versions = request.env["product.attribute.value"].search(
+            [("attribute_id", "=", attribute_id.id)]
+        )
+        authors = request.env["odoo.author"].search([])
+        Product = request.env["product.template"]
+
+        product_count = Product.search_count(domain)
+        pager = request.website.pager(
+            url=url, total=product_count, page=page, step=ppg, scope=7, url_args=post
+        )
+        products = Product.search(
+            domain,
+            limit=ppg,
+            offset=pager["offset"],
+            order=self._get_search_order(post),
+        )
+
+        ProductAttribute = request.env["product.attribute"]
+        if products:
+            # get all products without limit
+            selected_products = Product.search(domain, limit=False)
+            attributes = ProductAttribute.search(
+                [("attribute_line_ids.product_tmpl_id", "in", selected_products.ids)]
+            )
+        else:
+            attributes = ProductAttribute.browse(attributes_ids)
+
+        res.qcontext.update(
+            {
+                "search": search,
+                "category": category,
+                "attrib_values": attrib_values,
+                "attrib_set": attrib_set,
+                "pager": pager,
+                "products": products,
+                "search_count": product_count,  # common for all searchbox
+                "bins": TableCompute().process(products, ppg),
+                "category_all": category_all,
+                "versions": versions,
+                "authors": authors,
+                "version": post.get("version"),
+                "author": post.get("author"),
+                "attributes": attributes,
+                "keep": keep,
+                "maturity": post.get("maturity"),
+            }
+        )
+        return res
+
+    @http.route(
+        [
+            '/shop/download_product_zip/<model("product.template"):product_tmpl>'
+            '/<model("product.product"):product>/'
+            "<string:recaptcha_token_response>",
+            '/shop/download_product_zip/<model("product.template"):product_tmpl>/'
+            "<string:recaptcha_token_response>",
+        ],
+        type="http",
+        auth="public",
+        website=True,
+    )
+    def download_product_zip(
+        self, product_tmpl, product=False, recaptcha_token_response="", **kwargs
+    ):
+        request.params["recaptcha_token_response"] = recaptcha_token_response
+        try:
+            # The except clause below should not let what has been done inside
+            # here be committed. It should not either roll back everything in
+            # this controller method. Instead, we use a savepoint to roll back
+            # what has been done inside the try clause.
+            with request.env.cr.savepoint():
+                if request.env["ir.http"]._verify_request_recaptcha_token(
+                    "download_product_zip"
+                ):
+                    return self._handle_download_product_zip(product_tmpl, product)
+            error = _("Suspicious activity detected by <b>Google reCaptcha<b/>.")
+        except (ValidationError, UserError) as e:
+            error = e.args[0]
+        values = {"error_msg": error}
+        return request.render("website_apps_store.suspicious_product_download", values)
+
+    def _handle_download_product_zip(self, product_tmpl, product):
+        if not product:
+            product = product_tmpl.get_version_info()
+        attachment = (
+            request.env["ir.attachment"]
+            .sudo()
+            .search(
+                [("res_id", "=", product.id), ("res_model", "=", product._name)],
+                limit=1,
+            )
+        )
+        if not attachment:
+            product.sudo().generate_zip_file()
+            attachment = (
+                request.env["ir.attachment"]
+                .sudo()
+                .search(
+                    [("res_id", "=", product.id), ("res_model", "=", product._name)],
+                    limit=1,
+                )
+            )
+        if attachment:
+            filecontent = base64.b64decode(attachment.datas)
+            disposition = f'attachment; filename="{attachment.name}"'
+            # increasing count for the product downloadg
+            product.sudo().download_count += 1
+            return request.make_response(
+                filecontent,
+                [
+                    ("Content-Type", "application/zip, application/octet-stream"),
+                    ("Content-Length", len(filecontent)),
+                    ("Content-Disposition", disposition),
+                ],
+            )
+        return False
diff --git a/website_apps_store/i18n/es.po b/website_apps_store/i18n/es.po
new file mode 100644
index 00000000..5a7fb8c6
--- /dev/null
+++ b/website_apps_store/i18n/es.po
@@ -0,0 +1,181 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_apps_store
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-08-26 03:55+0000\n"
+"PO-Revision-Date: 2024-01-26 16:33+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Author: </b>"
+msgstr "<b>Autor: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>License: </b>"
+msgstr "<b>Licencia: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Maintainer: </b>"
+msgstr "<b>Mantenedor: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Repository: </b>"
+msgstr "<b>Repositorio: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Technical Name: </b>"
+msgstr "<b>Nombre técnico: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Version: </b>"
+msgstr "<b>Versión: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Website: </b>"
+msgstr "<b>Sitio web: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<span class=\"main_detail\">https://odoo-community.org</span>"
+msgstr "<span class=\"main_detail\">https://odoo-community.org</span>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "All"
+msgstr "Todas"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Alpha"
+msgstr "Alfa"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Beta"
+msgstr "Beta"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+msgid "Category:"
+msgstr "Categoría:"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__display_name
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid ""
+"Download\n"
+"                            <span class=\"fa fa-download\"/>"
+msgstr ""
+"Descargar\n"
+"                            <span class=\"fa fa-download\"/>"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__download_count
+msgid "Download Count"
+msgstr "Descargas"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Max to Min"
+msgstr "Descargas - Max to Min"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Min to Max"
+msgstr "Descargas - Min to Max"
+
+#. module: website_apps_store
+#. openerp-web
+#: code:addons/website_apps_store/static/src/js/website_sale.js:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.suspicious_product_download
+msgid "Error during product download"
+msgstr "Ocurrió un error mientras se descargaba el producto"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__id
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__id
+msgid "ID"
+msgstr "ID"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product____last_update
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Mature"
+msgstr "Maduro"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Maturity:"
+msgstr "Madurez:"
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "Product Name"
+msgstr "Nombre del producto"
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Production/Stable"
+msgstr "Producción/Estable"
+
+#. module: website_apps_store
+#: code:addons/website_apps_store/controllers/main.py:0
+#, python-format
+msgid "Suspicious activity detected by <b>Google reCaptcha<b/>."
+msgstr "Actividad sospechosa detectada por <b>Google reCaptcha<b/>."
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__total_download_count
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__total_download_count
+msgid "Total Download Count"
+msgstr "Total de descargas"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "Version:"
+msgstr "Versión:"
diff --git a/website_apps_store/i18n/hr.po b/website_apps_store/i18n/hr.po
new file mode 100644
index 00000000..57043132
--- /dev/null
+++ b/website_apps_store/i18n/hr.po
@@ -0,0 +1,182 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_apps_store
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-03-05 18:13+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10\n"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Author: </b>"
+msgstr "<b>Autor: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>License: </b>"
+msgstr "<b>Licenca: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Maintainer: </b>"
+msgstr "<b>Održava: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Repository: </b>"
+msgstr "<b>Repositorij: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Technical Name: </b>"
+msgstr "<b>Tehnički naziv: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Version: </b>"
+msgstr "<b>Verzija: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Website: </b>"
+msgstr "<b>Webstranica: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<span class=\"main_detail\">https://odoo-community.org</span>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "All"
+msgstr "Sve"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Alpha"
+msgstr "Alfa"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Beta"
+msgstr "Beta"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+msgid "Category:"
+msgstr "Kategorija:"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__display_name
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid ""
+"Download\n"
+"                            <span class=\"fa fa-download\"/>"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__download_count
+msgid "Download Count"
+msgstr "Broj preuzimanja"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Max to Min"
+msgstr "Broj preuzimanja - Najviše do najmanje"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Min to Max"
+msgstr ""
+
+#. module: website_apps_store
+#. openerp-web
+#: code:addons/website_apps_store/static/src/js/website_sale.js:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.suspicious_product_download
+msgid "Error during product download"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__id
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__id
+msgid "ID"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product____last_update
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Mature"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Maturity:"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_product
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "Product Name"
+msgstr "Naziv proizvoda"
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_template
+msgid "Product Template"
+msgstr "Predložak proizvoda"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Production/Stable"
+msgstr "Produkcija/Stabilno"
+
+#. module: website_apps_store
+#: code:addons/website_apps_store/controllers/main.py:0
+#, python-format
+msgid "Suspicious activity detected by <b>Google reCaptcha<b/>."
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__total_download_count
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__total_download_count
+msgid "Total Download Count"
+msgstr "Ukupni broj preuzimanja"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "Version:"
+msgstr ""
+
+#~ msgid "Name, Author, Version..."
+#~ msgstr "Naziv, Autor, Verzija..."
diff --git a/website_apps_store/i18n/it.po b/website_apps_store/i18n/it.po
new file mode 100644
index 00000000..bc858046
--- /dev/null
+++ b/website_apps_store/i18n/it.po
@@ -0,0 +1,183 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_apps_store
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2025-01-20 11:06+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.6.2\n"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Author: </b>"
+msgstr "<b>Autore: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>License: </b>"
+msgstr "<b>Licenza: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Maintainer: </b>"
+msgstr "<b>Manutentore: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Repository: </b>"
+msgstr "<b>Repository: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Technical Name: </b>"
+msgstr "<b>Nome tecnico: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Version: </b>"
+msgstr "<b>Versione: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Website: </b>"
+msgstr "<b>Sito web: </b>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<span class=\"main_detail\">https://odoo-community.org</span>"
+msgstr "<span class=\"main_detail\">https://odoo-community.org</span>"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "All"
+msgstr "Tutte"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Alpha"
+msgstr "Alfa"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Beta"
+msgstr "Beta"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+msgid "Category:"
+msgstr "Categoria:"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__display_name
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid ""
+"Download\n"
+"                            <span class=\"fa fa-download\"/>"
+msgstr ""
+"Scarica\n"
+"                            <span class=\"fa fa-download\"/>"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__download_count
+msgid "Download Count"
+msgstr "Numero scaricamenti"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Max to Min"
+msgstr "Conteggio download - Massimo a minimo"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Min to Max"
+msgstr "Conteggio download - Minimo a massimo"
+
+#. module: website_apps_store
+#. openerp-web
+#: code:addons/website_apps_store/static/src/js/website_sale.js:0
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.suspicious_product_download
+msgid "Error during product download"
+msgstr "Errore nel download prodotto"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__id
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__id
+msgid "ID"
+msgstr "ID"
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product____last_update
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template____last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Mature"
+msgstr "Maturo"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Maturity:"
+msgstr "Maturità:"
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_product
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "Product Name"
+msgstr "Nome prodotto"
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_template
+msgid "Product Template"
+msgstr "Modello prodotto"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Production/Stable"
+msgstr "Produzione/stabile"
+
+#. module: website_apps_store
+#: code:addons/website_apps_store/controllers/main.py:0
+#, python-format
+msgid "Suspicious activity detected by <b>Google reCaptcha<b/>."
+msgstr "Attività sospetta rilevata da <b>Google reCaptcha<b/>."
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__total_download_count
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__total_download_count
+msgid "Total Download Count"
+msgstr "Numero totale scaricamenti"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "Version:"
+msgstr "Versione:"
+
+#~ msgid "Name, Author, Version..."
+#~ msgstr "Nome, autore, versione..."
diff --git a/website_apps_store/i18n/website_apps_store.pot b/website_apps_store/i18n/website_apps_store.pot
new file mode 100644
index 00000000..5e01f35c
--- /dev/null
+++ b/website_apps_store/i18n/website_apps_store.pot
@@ -0,0 +1,175 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_apps_store
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Author: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>License: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Maintainer: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Repository: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Technical Name: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Version: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<b>Website: </b>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "<span class=\"main_detail\">https://odoo-community.org</span>"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "All"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Alpha"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Beta"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.category_display
+msgid "Category:"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__display_name
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid ""
+"Download\n"
+"                            <span class=\"fa fa-download\"/>"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__download_count
+msgid "Download Count"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Max to Min"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.sort_customize
+msgid "Download Count - Min to Max"
+msgstr ""
+
+#. module: website_apps_store
+#. openerp-web
+#: code:addons/website_apps_store/static/src/js/website_sale.js:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.suspicious_product_download
+msgid "Error during product download"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__id
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__id
+msgid "ID"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product____last_update
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Mature"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Maturity:"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.product
+msgid "Product Name"
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model,name:website_apps_store.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.maturity_display
+msgid "Production/Stable"
+msgstr ""
+
+#. module: website_apps_store
+#: code:addons/website_apps_store/controllers/main.py:0
+#, python-format
+msgid "Suspicious activity detected by <b>Google reCaptcha<b/>."
+msgstr ""
+
+#. module: website_apps_store
+#: model:ir.model.fields,field_description:website_apps_store.field_product_product__total_download_count
+#: model:ir.model.fields,field_description:website_apps_store.field_product_template__total_download_count
+msgid "Total Download Count"
+msgstr ""
+
+#. module: website_apps_store
+#: model_terms:ir.ui.view,arch_db:website_apps_store.version_display
+msgid "Version:"
+msgstr ""
diff --git a/website_apps_store/models/__init__.py b/website_apps_store/models/__init__.py
new file mode 100644
index 00000000..6a7d91ce
--- /dev/null
+++ b/website_apps_store/models/__init__.py
@@ -0,0 +1,2 @@
+from . import product
+from . import product_template
diff --git a/website_apps_store/models/product.py b/website_apps_store/models/product.py
new file mode 100644
index 00000000..ee090416
--- /dev/null
+++ b/website_apps_store/models/product.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2017-Today: Odoo Community Association (OCA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    download_count = fields.Integer()
diff --git a/website_apps_store/models/product_template.py b/website_apps_store/models/product_template.py
new file mode 100644
index 00000000..40d40e7d
--- /dev/null
+++ b/website_apps_store/models/product_template.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2017-Today: Odoo Community Association (OCA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    @api.depends("product_variant_ids", "product_variant_ids.download_count")
+    def _compute_total_download_count(self):
+        for product in self:
+            product.total_download_count = sum(
+                product.mapped("product_variant_ids.download_count")
+            )
+
+    total_download_count = fields.Integer(
+        compute="_compute_total_download_count", store=True
+    )
+
+    def get_author_details(self):
+        return self.mapped("product_variant_ids.app_author_ids")
+
+    def get_version_info(self):
+        products = self.product_variant_ids.sorted(
+            lambda a: a._get_combination_info_variant().get("attribute_seq", 0),
+            reverse=True,
+        )
+        return products[0]
+
+    def _get_combination_info(
+        self,
+        combination=False,
+        product_id=False,
+        add_qty=1,
+        parent_combination=False,
+        only_template=False,
+    ):
+        vals = super()._get_combination_info(
+            combination=combination,
+            product_id=product_id,
+            add_qty=add_qty,
+            parent_combination=parent_combination,
+            only_template=only_template,
+        )
+        if not vals["product_id"]:
+            return vals
+        product = self.env["product.product"].browse(vals["product_id"])
+        if product.odoo_module_id:
+            module_id = product.odoo_module_version_id.module_id
+            vals.update(
+                {
+                    "is_odoo_module": True,
+                    "name_product": product.name,
+                    "technical_name": module_id.technical_name,
+                    "license": product.app_license_id.name,
+                    "license_url": product.app_license_id.website,
+                    "author": ", ".join(
+                        author.name for author in product.app_author_ids
+                    ),
+                    "website": product.app_website,
+                    "repository": product.app_github_url,
+                    "rst_html": product.app_description_rst_html,
+                    "app_summary": product.app_summary,
+                    "attribute_seq": combination.attribute_id.sequence,
+                }
+            )
+        return vals
+
+    def _get_first_possible_combination(
+        self, parent_combination=None, necessary_values=None
+    ):
+        """Override method to load last version first in app store"""
+        values = list(
+            self._get_possible_combinations(parent_combination, necessary_values)
+        )
+        if not any(values):
+            return self.env["product.template.attribute.value"]
+        return values[-1]
diff --git a/website_apps_store/pyproject.toml b/website_apps_store/pyproject.toml
new file mode 100644
index 00000000..4231d0cc
--- /dev/null
+++ b/website_apps_store/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/website_apps_store/readme/CONTRIBUTORS.md b/website_apps_store/readme/CONTRIBUTORS.md
new file mode 100644
index 00000000..0498bea5
--- /dev/null
+++ b/website_apps_store/readme/CONTRIBUTORS.md
@@ -0,0 +1,8 @@
+- Ruchir Shukla \<<ruchir@bizzappdev.com>
+- Divya Modi \<<divya.modi@bizzappdev.com>\>
+- Eric Caudal \<<eric.caudal@elico-corp.com>\>
+- Oscar Alcala \<<oscar@vauxoo.com>\>
+- [Tecnativa](https://www.tecnativa.com):
+  - Víctor M.M. Torres
+  - Alexandre D. Díaz
+  - Ernesto Tejeda
diff --git a/website_apps_store/readme/DESCRIPTION.md b/website_apps_store/readme/DESCRIPTION.md
new file mode 100644
index 00000000..e7858072
--- /dev/null
+++ b/website_apps_store/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+Providing facility for displaying the module specific information in a
+standard Odoo e-commerce website (front-end) and download the zip file
+of the selected product.
diff --git a/website_apps_store/static/description/icon.png b/website_apps_store/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/website_apps_store/static/description/icon.png differ
diff --git a/website_apps_store/static/description/index.html b/website_apps_store/static/description/index.html
new file mode 100644
index 00000000..dac57a8b
--- /dev/null
+++ b/website_apps_store/static/description/index.html
@@ -0,0 +1,434 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Website Apps Store</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="website-apps-store">
+<h1 class="title">Website Apps Store</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e1a07ed3537367248ca005e8ca2a08b5077fa74bc33b4ea65005121eb6bf0bf9
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/apps-store/tree/18.0/website_apps_store"><img alt="OCA/apps-store" src="https://img.shields.io/badge/github-OCA%2Fapps--store-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/apps-store-18-0/apps-store-18-0-website_apps_store"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/apps-store&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Providing facility for displaying the module specific information in a
+standard Odoo e-commerce website (front-end) and download the zip file
+of the selected product.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/apps-store/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/apps-store/issues/new?body=module:%20website_apps_store%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>BizzAppDev</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li>Ruchir Shukla &lt;<a class="reference external" href="mailto:ruchir&#64;bizzappdev.com">ruchir&#64;bizzappdev.com</a></li>
+<li>Divya Modi &lt;<a class="reference external" href="mailto:divya.modi&#64;bizzappdev.com">divya.modi&#64;bizzappdev.com</a>&gt;</li>
+<li>Eric Caudal &lt;<a class="reference external" href="mailto:eric.caudal&#64;elico-corp.com">eric.caudal&#64;elico-corp.com</a>&gt;</li>
+<li>Oscar Alcala &lt;<a class="reference external" href="mailto:oscar&#64;vauxoo.com">oscar&#64;vauxoo.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Víctor M.M. Torres</li>
+<li>Alexandre D. Díaz</li>
+<li>Ernesto Tejeda</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/apps-store/tree/18.0/website_apps_store">OCA/apps-store</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/website_apps_store/static/src/js/website_apps_store_tour.js b/website_apps_store/static/src/js/website_apps_store_tour.js
new file mode 100644
index 00000000..6d89d121
--- /dev/null
+++ b/website_apps_store/static/src/js/website_apps_store_tour.js
@@ -0,0 +1,155 @@
+/** @odoo-module **/
+
+import {registry} from "@web/core/registry";
+
+const tour = registry.category("web_tour.tours");
+
+tour.add("successfully_download_zip", {
+    name: "Download Zip File - successfully",
+    url: "/shop/page/2",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".oe_product_cart a:contains('Odoo Module')",
+            run: "click",
+        },
+        {
+            content: "Select Version",
+            trigger: "input[type=radio]",
+            run() {
+                const radios = document.querySelectorAll("input[type='radio']");
+                if (radios.length) {
+                    radios[radios.length - 1].checked = true;
+                }
+            },
+        },
+        {
+            content: "Download",
+            trigger: "#download_zip",
+            run: "click",
+        },
+        {
+            content: "No failure, we are in the same page",
+            trigger: "#product_detail",
+        },
+    ],
+});
+
+tour.add("download_zip_failed", {
+    name: "Download Zip File - Failed",
+    url: "/shop/page/2",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".oe_product_cart a:contains('Odoo Module')",
+            run: "click",
+        },
+        {
+            content: "Select Version",
+            trigger: "input[type=radio]",
+            run() {
+                const radios = document.querySelectorAll("input[type='radio']");
+                if (radios.length) {
+                    radios[radios.length - 1].checked = true;
+                }
+            },
+        },
+        {
+            content: "Download",
+            trigger: "#download_zip",
+            run: "click",
+        },
+        {
+            content: "Suspicious",
+            trigger: "#wrap.wrap-download-zip-failed",
+        },
+    ],
+});
+
+tour.add("select_version_search", {
+    name: "Select Version",
+    url: "/shop",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".dropdown_version_by a.dropdown-toggle",
+            run: "click",
+        },
+        {
+            content: "Select Version",
+            trigger: ".dropdown_version_by .dropdown-menu a:contains('10.0')",
+            run: "click",
+        },
+    ],
+});
+
+tour.add("select_category_search", {
+    name: "Select Category",
+    url: "/shop",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".dropdown_category_by a.dropdown-toggle",
+            run: "click",
+        },
+        {
+            content: "Select Category",
+            trigger: ".dropdown_category_by .dropdown-menu a:contains('Category')",
+            run: "click",
+        },
+    ],
+});
+
+tour.add("module_search", {
+    name: "Select Product(Module)",
+    url: "/shop",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".search-query",
+            run() {
+                const el = document.querySelector(".search-query");
+                if (el) el.value = "Test";
+            },
+        },
+        {
+            content: "Search Button",
+            trigger: ".oe_search_button",
+            run: "click",
+        },
+        {
+            content: "There is one or more products as a search result",
+            trigger: "#products_grid td.oe_product a:contains('Odoo Module')",
+        },
+    ],
+});
+
+tour.add("technical_name_search", {
+    name: "Select Product(Module) by Technical Name",
+    url: "/shop",
+    test: true,
+    steps: [
+        {
+            content: "Shop",
+            trigger: ".search-query",
+            run() {
+                const el = document.querySelector(".search-query");
+                if (el) el.value = "odoo_module";
+            },
+        },
+        {
+            content: "Search Button",
+            trigger: ".oe_search_button",
+            run: "click",
+        },
+        {
+            content: "There is one or more products as a search result",
+            trigger: "#products_grid td.oe_product a:contains('Odoo Module')",
+        },
+    ],
+});
diff --git a/website_apps_store/static/src/js/website_sale.js b/website_apps_store/static/src/js/website_sale.js
new file mode 100644
index 00000000..4e9ddc78
--- /dev/null
+++ b/website_apps_store/static/src/js/website_sale.js
@@ -0,0 +1,102 @@
+/**
+ *    Copyright 2018 BizzAppDev
+ *    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+ **/
+/** @odoo-module **/
+
+import "web.dom_ready";
+import publicWidget from "@web/legacy/js/public/public_widget";
+import {_t} from "@web/core/l10n/translation";
+import {ReCaptcha} from "google_recaptcha.ReCaptchaV3";
+
+const WebsiteSale = publicWidget.registry.WebsiteSale;
+
+WebsiteSale.include({
+    // use legacy widget 'events' in Odoo 18
+    events: Object.assign({}, WebsiteSale.prototype.events, {
+        "click #download_zip": "_onClickDownload",
+    }),
+
+    init: function () {
+        this._super.apply(this, arguments);
+        this._recaptcha = new ReCaptcha();
+        this.__started = new Promise((resolve) => (this.__startResolve = resolve));
+    },
+
+    willStart: function () {
+        const res = this._super(...arguments);
+        this._recaptchaLoaded = true;
+        this._recaptcha.loadLibs();
+        return res;
+    },
+
+    _onChangeCombination: function (ev, $parent, combination) {
+        this._super.apply(this, arguments);
+        if ("is_odoo_module" in combination && combination.is_odoo_module) {
+            // fixed selector to match template class 'tech_detail'
+            const $tech_detail = this.$(".tech_detail");
+            const $license_detail = this.$(".license_detail");
+            const $license_url = this.$(".license_url");
+            const $author_detail = this.$(".author_detail");
+            const $website_detail = this.$(".website_detail");
+            const $website_detail_href = this.$("#website_detail_href");
+            const $repo_detail = this.$(".repo_detail");
+            const $rst_html = this.$(".desc_rst");
+            const $app_summary = this.$(".app_summary");
+            const $name_product = this.$(".name_product");
+
+            $tech_detail.text(combination.technical_name);
+            $license_detail.text(combination.license);
+            $license_url.attr("href", combination.license_url);
+            $author_detail.text(combination.author);
+            $website_detail.text(combination.website);
+            $website_detail_href.attr("href", combination.website);
+            $repo_detail.text(combination.repository);
+            if ($repo_detail.length) {
+                $repo_detail.parent()[0].href = combination.repository;
+            }
+            $rst_html.html(combination.rst_html);
+            $app_summary.text(combination.app_summary);
+            $name_product.text(combination.name_product);
+        }
+    },
+
+    _onClickDownload: async function (ev) {
+        ev.preventDefault();
+        // Prevent users from crazy clicking
+        this.$("#download_zip").addClass("disabled").attr("disabled", "disabled");
+
+        let recaptcha_token_response = "";
+        if (this._recaptchaLoaded) {
+            const tokenObj = await this._recaptcha.getToken("download_product_zip");
+            if (tokenObj.token) {
+                recaptcha_token_response = tokenObj.token;
+            } else if (tokenObj.error) {
+                this.displayNotification({
+                    type: "danger",
+                    title: _t("Error"),
+                    message: tokenObj.error,
+                    sticky: true,
+                });
+                return false;
+            }
+        }
+        const product_template_id = this.$(".product_template_id").val();
+        const product_id = this.$(".product_id").val();
+        if (product_id) {
+            window.location.href =
+                "/shop/download_product_zip/" +
+                product_template_id +
+                "/" +
+                product_id +
+                "/" +
+                recaptcha_token_response;
+        } else {
+            window.location.href =
+                "/shop/download_product_zip/" +
+                product_template_id +
+                "/" +
+                recaptcha_token_response;
+        }
+    },
+});
diff --git a/website_apps_store/static/src/scss/main.scss b/website_apps_store/static/src/scss/main.scss
new file mode 100644
index 00000000..27687e95
--- /dev/null
+++ b/website_apps_store/static/src/scss/main.scss
@@ -0,0 +1,33 @@
+.desc_rst > {
+    .document > .reference {
+        display: none;
+    }
+}
+
+.font_12 {
+    font-size: 12px;
+}
+
+.dropdown-scrollable {
+    max-height: 15rem;
+    overflow-y: auto;
+}
+
+#product_details .col-form-label {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+#o-carousel-product {
+    .carousel-outer {
+        height: unset;
+    }
+}
+
+#product_detail[data-is-module="1"]
+    #o-carousel-product
+    .carousel-outer
+    .carousel-inner
+    img {
+    width: auto;
+}
diff --git a/website_apps_store/tests/__init__.py b/website_apps_store/tests/__init__.py
new file mode 100644
index 00000000..34a97dc5
--- /dev/null
+++ b/website_apps_store/tests/__init__.py
@@ -0,0 +1,2 @@
+from . import test_website_apps_store
+from . import test_tour_website_apps_store
diff --git a/website_apps_store/tests/test_tour_website_apps_store.py b/website_apps_store/tests/test_tour_website_apps_store.py
new file mode 100644
index 00000000..fd4d37e4
--- /dev/null
+++ b/website_apps_store/tests/test_tour_website_apps_store.py
@@ -0,0 +1,105 @@
+# Copyright 2017-2018 BizzAppDev
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import os
+from unittest import mock
+
+from odoo.tests import HttpCase, tagged
+
+mock_get_module_path = (
+    "odoo.addons.apps_download.models.product_product.ProductProduct._get_module_path"
+)
+mock_verify_recaptcha_token = (
+    "odoo.addons.google_recaptcha.models.ir_http.Http._verify_recaptcha_token"
+)
+
+
+@tagged("post_install", "-at_install")
+class TestUi(HttpCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env.ref("website_sale.products").active = True
+        cls._req_patcher = mock.patch(
+            "odoo.addons.github_connector_odoo.models.github_repository.requests.get"
+        )
+        cls._mock_get = cls._req_patcher.start()
+        cls.addClassCleanup(cls._req_patcher.stop)
+        resp = mock.MagicMock()
+        resp.status_code = 200
+        resp.text = "login/Repository1 1234\n"
+        resp.json.return_value = ["login/Repository1 1234"]
+        resp.iter_lines.return_value = [b"login/Repository1 1234"]
+        resp.raise_for_status.return_value = None
+        resp.__iter__.return_value = iter([b"login/Repository1 1234"])
+        cls._mock_get.return_value = resp
+
+        cls.env["product.public.category"].create({"name": "Category"})
+        cls.organization = cls.env.ref("github_connector.oca_organization")
+
+        cls.organization_serie = cls.env["github.organization.serie"].create(
+            {"name": "14.0", "sequence": 1, "organization_id": cls.organization.id}
+        )
+        cls.repository = cls.env["github.repository"].create(
+            {"name": "Repository1", "organization_id": cls.organization.id}
+        )
+        cls.branch = cls.env["github.repository.branch"].create(
+            {
+                "name": "14.0",
+                "repository_id": cls.repository.id,
+                "organization_id": cls.organization.id,
+            }
+        )
+        cls.odoo_module = cls.env["odoo.module"].create(
+            {"technical_name": "odoo_module"}
+        )
+        cls.attribute = cls.env.ref("apps_product_creator.attribute_odoo_version")
+        cls.version = cls.env.ref("apps_product_creator.odoo_version_140")
+        cls.env["odoo.module.version"].create(
+            {
+                "name": "Odoo Module",
+                "technical_name": "odoo_module",
+                "module_id": cls.odoo_module.id,
+                "repository_branch_id": cls.branch.id,
+                "license": "AGPL-3",
+                "summary": "Summary Test",
+                "website": "Website Test",
+                "description_rst": "Description Test",
+                "version": "14.0",
+                "author": "OCA",
+                "depends": "base",
+                "external_dependencies": "{}",
+            }
+        )
+        cls.odoo_module.action_create_product()
+
+    def test_successfully_download_zip_tour(self):
+        test_path = os.path.dirname(os.path.realpath(__file__))
+        test_path = test_path.split("/website_apps_store")[0]
+        test_module_path = os.path.join(
+            test_path + "/apps_download" + "/tests", "test_modules", "second_module"
+        )
+        with mock.patch(mock_get_module_path) as mock_mod_path:
+            mock_mod_path.return_value = test_module_path
+            with mock.patch(mock_verify_recaptcha_token) as mock_verify:
+                mock_verify.return_value = "is_human"
+                self.start_tour(
+                    "/shop/page/2", "successfully_download_zip", login="admin"
+                )
+
+    def test_download_zip_failed_tour(self):
+        with mock.patch(mock_verify_recaptcha_token) as mock_verify:
+            mock_verify.return_value = "is_bot"
+            self.start_tour("/shop/page/2", "download_zip_failed", login="admin")
+
+    def test_select_version_search_tour(self):
+        self.start_tour("/shop", "select_version_search", login="admin")
+
+    def test_select_category_search_tour(self):
+        self.start_tour("/shop", "select_category_search", login="admin")
+
+    def test_module_search_tour(self):
+        self.start_tour("/shop", "module_search", login="admin")
+
+    def test_technical_name_search_tour(self):
+        self.start_tour("/shop", "technical_name_search", login="admin")
diff --git a/website_apps_store/tests/test_website_apps_store.py b/website_apps_store/tests/test_website_apps_store.py
new file mode 100644
index 00000000..c9a4ab8a
--- /dev/null
+++ b/website_apps_store/tests/test_website_apps_store.py
@@ -0,0 +1,64 @@
+# Copyright (C) 2018-Today: Odoo Community Association (OCA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo.tests.common import TransactionCase
+
+
+class TestWebsiteAppsStore(TransactionCase):
+    def setUp(self):
+        super().setUp()
+
+        self.organization2 = self.env["github.organization"].create(
+            {"name": "Organization 2", "github_name": "login"}
+        )
+
+        self.organization_serie2 = self.env["github.organization.serie"].create(
+            {"name": "12.0", "sequence": 1, "organization_id": self.organization2.id}
+        )
+
+        self.repository2 = self.env["github.repository"].create(
+            {"name": "Repository1", "organization_id": self.organization2.id}
+        )
+
+        self.branch2 = self.env["github.repository.branch"].create(
+            {
+                "name": "12.0",
+                "repository_id": self.repository2.id,
+                "organization_id": self.organization2.id,
+            }
+        )
+
+        self.odoo_module2 = self.env["odoo.module"].create(
+            {"technical_name": "odoo_module2"}
+        )
+
+        self.attribute = self.env.ref("apps_product_creator.attribute_odoo_version")
+        self.version = self.env.ref("apps_product_creator.odoo_version_100")
+
+        self.odoo_module2_version2 = self.env["odoo.module.version"].create(
+            {
+                "name": "Odoo Module 2",
+                "technical_name": "odoo_module2",
+                "module_id": self.odoo_module2.id,
+                "repository_branch_id": self.branch2.id,
+                "license": "AGPL-3",
+                "summary": "Summary Test",
+                "website": "Website Test",
+                "description_rst": "Description Test",
+                "version": "10.0",
+                "author": "OCA",
+                "depends": "base",
+                "external_dependencies": "{}",
+            }
+        )
+
+    def test_product_author_version_info(self):
+        self.assertFalse(self.odoo_module2.product_template_id)
+        self.odoo_module2.action_create_product()
+        self.assertTrue(self.odoo_module2.product_template_id)
+        action = self.odoo_module2.action_view_products()
+        self.assertEqual(
+            self.odoo_module2.product_template_id.product_variant_ids.ids[0],
+            action["res_id"],
+        )
+        self.odoo_module2.product_template_id.get_author_details()
+        self.odoo_module2.product_template_id.get_version_info()
diff --git a/website_apps_store/views/suspicious_templates.xml b/website_apps_store/views/suspicious_templates.xml
new file mode 100644
index 00000000..cfd8220d
--- /dev/null
+++ b/website_apps_store/views/suspicious_templates.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright 2021 Tecnativa - Ernesto Tejeda
+        License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <template id="suspicious_product_download" name="Suspicious Product Download">
+        <t t-call="website.layout">
+            <div id="wrap" class="wrap-download-zip-failed">
+                <div class="container mt-4">
+                    <div class="row">
+                        <div
+                            class="col-lg-12 col-xl-12 oe_structure"
+                            id="oe_structure_suspicious_product_download"
+                        >
+                            <section
+                                class="pt40 s_text_block pb40 o_colored_level o_cc o_cc1"
+                                data-snippet="s_text_block"
+                                data-name="Text"
+                            >
+                                <div class="container mt-5 mb-5">
+                                    <span
+                                        class="d-block fa fa-5x fa-exclamation-triangle mx-auto text-danger"
+                                    />
+                                    <br />
+                                    <h5
+                                        class="text-center"
+                                    >Error during product download</h5>
+                                    <div
+                                        class="pb16 pt16 s_hr"
+                                        data-snippet="s_hr"
+                                        data-name="Separator"
+                                    >
+                                        <hr
+                                            class="mx-auto border-top w-25 border-dark text-center"
+                                        />
+                                    </div>
+                                    <h2 class="text-center">
+                                        <span t-raw="error_msg" />
+                                    </h2>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+</odoo>
diff --git a/website_apps_store/views/templates.xml b/website_apps_store/views/templates.xml
new file mode 100644
index 00000000..c8f9db64
--- /dev/null
+++ b/website_apps_store/views/templates.xml
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright 2017-Today BizzAppDev - Ruchir Shukla <ruchir@bizzappdev.com>
+    License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+    <!-- Filter: Category by -->
+    <template id="category_display" name="Show Category by">
+        <div class="dropdown dropdown mt-2 ml-md-2 dropdown_category_by">
+            <!-- Search selected category -->
+            <t t-set="selected_category" t-value="False" />
+            <t t-foreach="category_all" t-as="cat">
+                <t
+                    t-if="cat.id == int(category or 0)"
+                    t-set="selected_category"
+                    t-value="cat"
+                />
+            </t>
+
+            <!-- Dropdown menu -->
+            <a
+                class="btn btn-secondary dropdown-toggle"
+                href="#"
+                role="button"
+                id="dropdownMenuFilterCategoryBy"
+                data-bs-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+            >
+                Category: <t
+                t-esc="(selected_category and selected_category.name) or 'All'"
+            />
+            </a>
+
+            <div
+                class="dropdown-menu dropdown-scrollable"
+                aria-labelledby="dropdownMenuFilterCategoryBy"
+            >
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if not category else '')"
+                    t-att-href="keep('/shop/', category='')"
+                >All</a>
+                <t t-foreach="category_all" t-as="c">
+                    <a
+                        t-att-class="'dropdown-item %s' % ('active' if c.id == int(category or 0) else '')"
+                        t-att-href="keep('/shop/category/' + slug(c), category=0)"
+                        t-field="c.name"
+                    />
+                </t>
+            </div>
+        </div>
+    </template>
+
+    <!-- Filter: Version by -->
+    <template id="version_display" name="Show Version by">
+        <div class="dropdown mt-2 ml-md-2 dropdown_version_by">
+            <!-- Search selected version -->
+            <t t-set="selected_version" t-value="False" />
+            <t t-foreach="versions" t-as="ver">
+                <t
+                    t-if="ver.id == int(version or 0)"
+                    t-set="selected_version"
+                    t-value="ver"
+                />
+            </t>
+
+            <!-- Dropdown menu -->
+            <a
+                class="btn btn-secondary dropdown-toggle"
+                href="#"
+                role="button"
+                id="dropdownMenuFilterVersionBy"
+                data-bs-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+            >
+                Version: <t
+                t-esc="(selected_version and selected_version.name) or 'All'"
+            />
+            </a>
+
+            <div
+                class="dropdown-menu dropdown-scrollable"
+                aria-labelledby="dropdownMenuFilterVersionBy"
+            >
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if not version else '')"
+                    t-att-href="keep('/shop', version='')"
+                >All</a>
+                <t t-foreach="versions" t-as="v">
+                    <a
+                        t-att-class="'dropdown-item %s' % ('active' if v.id == int(version or 0) else '')"
+                        t-att-href="keep('/shop', version=v.id)"
+                    >
+                        <t t-esc="v.name" />
+                    </a>
+                </t>
+            </div>
+        </div>
+    </template>
+
+    <!-- Filter: Maturity by -->
+    <template id="maturity_display">
+        <div class="dropdown mt-2 ml-md-2 dropdown_maturity_by">
+            <!-- Search selected maturity -->
+            <t t-set="selected_maturity" t-value="False" />
+            <t t-if="maturity == 'alpha'" t-set="selected_maturity" t-value="'Alpha'" />
+            <t t-if="maturity == 'beta'" t-set="selected_maturity" t-value="'Beta'" />
+            <t
+                t-if="maturity == 'production/stable'"
+                t-set="selected_maturity"
+                t-value="'Production/Stable'"
+            />
+            <t
+                t-if="maturity == 'mature'"
+                t-set="selected_maturity"
+                t-value="'Mature'"
+            />
+
+            <!-- Dropdown menu -->
+            <a
+                class="btn btn-secondary dropdown-toggle"
+                href="#"
+                role="button"
+                id="dropdownMenuFilterMaturityBy"
+                data-bs-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+            >
+                Maturity: <t t-esc="selected_maturity or 'All'" />
+            </a>
+
+            <div class="dropdown-menu" aria-labelledby="dropdownMenuFilterMaturityBy">
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if not maturity else '')"
+                    t-att-href="keep('/shop', maturity='')"
+                >All</a>
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if maturity == 'alpha' else '')"
+                    t-att-href="keep('/shop', maturity='alpha')"
+                >Alpha</a>
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if maturity == 'beta' else '')"
+                    t-att-href="keep('/shop', maturity='beta')"
+                >Beta</a>
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if maturity == 'production/stable' else '')"
+                    t-att-href="keep('/shop', maturity='production/stable')"
+                >Production/Stable</a>
+                <a
+                    t-att-class="'dropdown-item %s' % ('active' if maturity == 'mature' else '')"
+                    t-att-href="keep('/shop', maturity='mature')"
+                >Mature</a>
+            </div>
+        </div>
+    </template>
+
+    <!-- Add new filters -->
+    <template id="sort_customize" inherit_id="website_sale.sort" priority="99">
+        <!-- Add extra sort options after built-in items -->
+        <xpath
+            expr="//div[@role='menu']/t[@t-foreach='website_sale_sortable']"
+            position="after"
+        >
+            <t
+                t-set="apps_extra_sortable"
+                t-value="[
+                   ('total_download_count desc', 'Download Count - Max to Min'),
+                   ('total_download_count asc', 'Download Count - Min to Max')
+               ]"
+            />
+            <t t-foreach="apps_extra_sortable" t-as="s">
+                <a
+                    role="menuitem"
+                    rel="noindex,nofollow"
+                    t-att-href="keep('/shop', order=s[0])"
+                    class="dropdown-item"
+                >
+                    <span t-esc="s[1]" />
+                </a>
+            </t>
+        </xpath>
+        <xpath
+            expr="//div[contains(@t-attf-class, 'o_sortby_dropdown')]"
+            position="after"
+        >
+            <div class="d-inline-block ms-2 align-top">
+                <t t-call="website_apps_store.category_display" />
+            </div>
+            <div class="d-inline-block ms-2 align-top">
+                <t t-call="website_apps_store.version_display" />
+            </div>
+            <div class="d-inline-block ms-2 align-top">
+                <t t-call="website_apps_store.maturity_display" />
+            </div>
+        </xpath>
+    </template>
+
+    <!-- Modify search box placeholder -->
+    <template id="search_placeholder" inherit_id="website.website_search_box">
+        <xpath expr="//input" position="attributes">
+            <attribute name="t-att-placeholder">"Name, Author, Version..."</attribute>
+        </xpath>
+    </template>
+
+    <template
+        id="products_item_customize"
+        inherit_id="website_sale.products_item"
+        priority="99"
+    >
+        <xpath
+            expr="//div[hasclass('o_wsale_product_information_text')]"
+            position="attributes"
+        >
+            <attribute
+                name="t-att-style"
+            >'padding-bottom: 1px;' if product.odoo_module_id else ''</attribute>
+        </xpath>
+
+        <xpath expr="//h6" position="attributes">
+            <attribute
+                name="t-att-style"
+            >'margin-bottom: 4px;' if product.odoo_module_id else ''</attribute>
+        </xpath>
+
+        <xpath expr="//h6//a[1]" position="after">
+            <t t-if="product.odoo_module_id">
+                <br />
+                <span t-esc="product.technical_name" class="font_12" />
+                <br />
+                <t t-set="author_ids" t-value="product.get_author_details()" />
+                <span
+                    t-esc="', '.join(author.name for author in author_ids)"
+                    class="font_12"
+                />
+                <br />
+                <div class="d-flex d-flex-row mt-2">
+                    <!-- Versions -->
+                    <div class="text-left">
+                        <t t-foreach="product.attribute_line_ids" t-as="attr">
+                            <span
+                                t-esc="' / '.join(value.name for value in attr.value_ids.sorted(reverse=True))"
+                                class="font_12"
+                            />
+                            <br />
+                        </t>
+                    </div>
+
+                    <!-- Download counter -->
+                    <div class="ml-auto text-right">
+                        <span class="fa fa-download" />
+                        <span t-esc="product.total_download_count" />
+                    </div>
+                </div>
+            </t>
+        </xpath>
+
+        <!-- Hide price span for module products instead of replacing it -->
+        <xpath expr='//div[hasclass("product_price")]//span[1]' position="attributes">
+            <attribute
+                name="t-if"
+            >(combination_info and combination_info.get('price')) and not product.odoo_module_id</attribute>
+        </xpath>
+    </template>
+
+    <!-- Product Detail Page Customization -->
+    <template id="product" inherit_id="website_sale.product" priority="99">
+        <!-- Mark product as module -->
+        <section id="product_detail" position="attributes">
+            <attribute
+                name="t-att-data-is-module"
+            >'1' if product.odoo_module_id else '0'</attribute>
+        </section>
+
+        <!-- Hide standard price + unavailable message for module products -->
+        <xpath expr="//t[@t-call='website_sale.product_price']" position="attributes">
+            <attribute name="t-if">not product.odoo_module_id</attribute>
+        </xpath>
+        <xpath expr='//p[hasclass("css_not_available_msg")]' position="attributes">
+            <attribute
+                name="t-if"
+            >len(product.product_variant_ids) &gt; 1 and not product.odoo_module_id</attribute>
+        </xpath>
+        <xpath
+            expr="//*[hasclass('js_check_product')] | //*[@t-attf-class and contains(@t-attf-class, 'js_check_product')]"
+            position="attributes"
+        >
+            <attribute name="t-if">not product.odoo_module_id</attribute>
+        </xpath>
+
+        <!-- Initialize version variable -->
+        <xpath expr="//section[@id='product_detail']" position="inside">
+            <t t-if="product.odoo_module_id">
+                <t t-set="product_var_id" t-value="product.get_version_info()" />
+            </t>
+        </xpath>
+        <xpath expr="//t[@t-call='website_sale.product_price']" position="after">
+            <div class="col-md-12 p-0 mt16 mb16" t-if="product.odoo_module_id">
+                <button
+                    class="btn btn-primary btn-lg"
+                    name="download_zip"
+                    id="download_zip"
+                    t-att-data-tmpl-id="product.id"
+                >
+                    Download <span class="fa fa-download" />
+                </button>
+            </div>
+        </xpath>
+
+        <xpath expr="//section" position="inside">
+            <div class="desc_rst mt-5" t-if="product.odoo_module_id">
+                <p
+                    t-esc="product_var_id.app_description_rst_html"
+                    t-options='{"widget": "html"}'
+                />
+            </div>
+        </xpath>
+
+        <xpath expr="//div[@id='product_details']" position="after">
+            <t t-if="product.odoo_module_id">
+                <t t-set="product_var_id" t-value="product.get_version_info()" />
+            </t>
+            <div class="col-md-4">
+                <!-- Technical Name -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Technical Name: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <span
+                                class="tech_detail"
+                                t-esc="product_var_id.odoo_module_version_id.module_id.technical_name"
+                            />
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Version -->
+                <div
+                    class="col-md-12 p-0"
+                    t-if="product.odoo_module_id and len(product.odoo_module_id.organization_serie_ids) == 1"
+                >
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Version: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <span
+                                class="tech_detail"
+                                t-esc="product_var_id.odoo_module_id.organization_serie_ids[0].name"
+                            />
+                        </div>
+                    </div>
+                </div>
+
+                <!-- License -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>License: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <a
+                                t-att-href="product_var_id.app_license_id.website"
+                                class="license_url"
+                                target="_blank"
+                            >
+                                <span
+                                    class="license_detail"
+                                    t-esc="product_var_id.app_license_id.name"
+                                />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Author -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Author: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <span
+                                class="author_detail"
+                                t-esc="', '.join(author.name for author in product_var_id.app_author_ids)"
+                            />
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Maintainer -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Maintainer: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <a href="https://odoo-community.org" target="_blank">
+                                <span
+                                    class="main_detail"
+                                >https://odoo-community.org</span>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Website -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Website: </b>
+                        </div>
+                        <div class="col-md-8 p-0">
+                            <a
+                                t-att-href="product_var_id.app_website"
+                                id="website_detail_href"
+                                target="_blank"
+                            >
+                                <span
+                                    class="website_detail"
+                                    t-esc="product_var_id.app_website"
+                                />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Repository -->
+                <div class="col-md-12 p-0" t-if="product.odoo_module_id">
+                    <div class="row">
+                        <div class="col-md-4 p-0">
+                            <b>Repository: </b>
+                        </div>
+                        <div class="col-md-8 p-0" style="overflow-wrap:break-word;">
+                            <a
+                                t-att-href="product_var_id.app_github_url"
+                                target="_blank"
+                            >
+                                <span
+                                    class="repo_detail"
+                                    t-esc="product_var_id.app_github_url"
+                                />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </xpath>
+
+        <xpath expr="//div[@id='product_details']" position="attributes">
+            <attribute
+                name="class"
+                remove="col-md-6 col-xl-8"
+                add="col-md-4"
+                separator=" "
+            />
+        </xpath>
+
+        <xpath expr="//div[hasclass('row')][2]" position="before">
+            <div class="col-sm-12 text-center mb48">
+                <t t-if="product.odoo_module_id">
+                    <t t-set="product_var_id" t-value="product.get_version_info()" />
+                </t>
+                <h1 itemprop="name" t-field="product.name">Product Name</h1>
+                <p
+                    t-if="product.odoo_module_id"
+                    class="app_summary"
+                    t-esc="product_var_id.app_summary"
+                />
+            </div>
+        </xpath>
+
+        <!-- Hide standard product description -->
+        <xpath expr="//*[@itemprop='description']" position="attributes">
+            <attribute name="t-if">not product.odoo_module_id</attribute>
+        </xpath>
+    </template>
+
+    <!-- Remove Detail Product Page Carousel Height -->
+    <template
+        id="shop_product_carousel"
+        inherit_id="website_sale.shop_product_carousel"
+        priority="200"
+    >
+        <xpath expr="//div[hasclass('carousel-inner')]" position="attributes">
+            <attribute name="class" remove="h-100" separator=" " />
+        </xpath>
+
+        <xpath
+            expr="//*[@id='o-carousel-product']//*[contains(@t-attf-class,'carousel-item')]"
+            position="attributes"
+        >
+            <attribute
+                name="t-attf-class"
+            >carousel-item text-center#{' active' if product_image_first else ''}</attribute>
+        </xpath>
+
+        <xpath expr="//t[@t-set='image_classes']" position="replace">
+            <t
+                t-set="image_classes"
+                t-value="'d-flex align-items-center justify-content-center'"
+            />
+        </xpath>
+    </template>
+</odoo>