From 54d484e05a91cb0ac8ef1323b234e6bfe0d05b7d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 29 Nov 2024 11:22:29 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + setup/_metapackage/pyproject.toml | 3 +- website_sale_require_legal/README.rst | 36 +++++++++---------- .../static/description/index.html | 14 ++++---- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 48ab1ad95e..6b9d6dd4fc 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ addon | version | maintainers | summary [website_sale_hide_price](website_sale_hide_price/) | 17.0.1.1.1 | | Hide product prices on the shop [website_sale_product_description](website_sale_product_description/) | 17.0.1.0.0 | | Shows custom e-Commerce description for products [website_sale_product_reference_displayed](website_sale_product_reference_displayed/) | 17.0.1.0.0 | | Display product reference in e-commerce +[website_sale_require_legal](website_sale_require_legal/) | 17.0.1.0.0 | | Force the user to accept legal tems to buy in the web shop [website_sale_suggest_create_account](website_sale_suggest_create_account/) | 17.0.1.0.0 | | Suggest users to create an account when buying in the website [//]: # (end addons) diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml index 0434ede4d8..a760aade57 100644 --- a/setup/_metapackage/pyproject.toml +++ b/setup/_metapackage/pyproject.toml @@ -1,11 +1,12 @@ [project] name = "odoo-addons-oca-e-commerce" -version = "17.0.20241024.0" +version = "17.0.20241129.0" dependencies = [ "odoo-addon-website_sale_b2x_alt_price>=17.0dev,<17.1dev", "odoo-addon-website_sale_hide_price>=17.0dev,<17.1dev", "odoo-addon-website_sale_product_description>=17.0dev,<17.1dev", "odoo-addon-website_sale_product_reference_displayed>=17.0dev,<17.1dev", + "odoo-addon-website_sale_require_legal>=17.0dev,<17.1dev", "odoo-addon-website_sale_suggest_create_account>=17.0dev,<17.1dev", ] classifiers=[ diff --git a/website_sale_require_legal/README.rst b/website_sale_require_legal/README.rst index bb35ece9f4..849064504f 100644 --- a/website_sale_require_legal/README.rst +++ b/website_sale_require_legal/README.rst @@ -7,7 +7,7 @@ Require accepting legal terms to checkout !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:fb7818797158569b096d297241bf594892e1cf2b346237ca602f4f900edd90b6 + !! source digest: sha256:110fc2437cf0a83c09c41f0e87bf5281edfcc18d1471243bd25fc01b38162e13 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -89,19 +89,19 @@ Usage To use this module, you need to: -- Buy something from your website. +- Buy something from your website. Known issues / Roadmap ====================== -- Shopping terms and conditions are accepted only on user registration - or address edition. So if those terms change after the user signed - up, a notification should be made. An implicit acceptance could be - printed in the payment screen to solve this. Maybe that could be a - work to develop in another module. -- If you enable both acceptance views as explained in the configuration - section, first-time buyers will have to accept the legal terms - between 2 and 3 times to buy. +- Shopping terms and conditions are accepted only on user registration + or address edition. So if those terms change after the user signed up, + a notification should be made. An implicit acceptance could be printed + in the payment screen to solve this. Maybe that could be a work to + develop in another module. +- If you enable both acceptance views as explained in the configuration + section, first-time buyers will have to accept the legal terms between + 2 and 3 times to buy. Bug Tracker =========== @@ -124,15 +124,15 @@ Authors Contributors ------------ -- `Tecnativa `__: +- `Tecnativa `__: - - Rafael Blasco - - Jairo Llopis - - Vicent Cubells - - David Vidal - - Ernesto Tejeda - - Cristina Martin R. - - Pilar Vargas + - Rafael Blasco + - Jairo Llopis + - Vicent Cubells + - David Vidal + - Ernesto Tejeda + - Cristina Martin R. + - Pilar Vargas Maintainers ----------- diff --git a/website_sale_require_legal/static/description/index.html b/website_sale_require_legal/static/description/index.html index 2e465e655a..254edc6ca1 100644 --- a/website_sale_require_legal/static/description/index.html +++ b/website_sale_require_legal/static/description/index.html @@ -367,7 +367,7 @@

Require accepting legal terms to checkout

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:fb7818797158569b096d297241bf594892e1cf2b346237ca602f4f900edd90b6 +!! source digest: sha256:110fc2437cf0a83c09c41f0e87bf5281edfcc18d1471243bd25fc01b38162e13 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runboat

This module extends your e-commerce legal compliance options:

@@ -440,13 +440,13 @@

Usage

Known issues / Roadmap

  • Shopping terms and conditions are accepted only on user registration -or address edition. So if those terms change after the user signed -up, a notification should be made. An implicit acceptance could be -printed in the payment screen to solve this. Maybe that could be a -work to develop in another module.
    • +or address edition. So if those terms change after the user signed up, +a notification should be made. An implicit acceptance could be printed +in the payment screen to solve this. Maybe that could be a work to +develop in another module.
  • If you enable both acceptance views as explained in the configuration -section, first-time buyers will have to accept the legal terms -between 2 and 3 times to buy.
    • +section, first-time buyers will have to accept the legal terms between +2 and 3 times to buy.