Merge pull request #733 from OCA/18.0

Syncing from upstream OCA/e-commerce (18.0)

README.md

@@ -17,7 +17,12 @@ e-commerce
 
 [//]: # (addons)
 
-This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools.
+Available addons
+----------------
+addon | version | maintainers | summary
+--- | --- | --- | ---
+[website_sale_checkout_skip_payment](website_sale_checkout_skip_payment/) | 18.0.1.0.0 |  | Skip payment for logged users in checkout process
+[website_sale_product_attribute_value_filter_existing](website_sale_product_attribute_value_filter_existing/) | 18.0.1.1.0 |  | Allow hide attributes values not used in variants
 
 [//]: # (end addons)
 

setup/_metapackage/pyproject.toml

@@ -0,0 +1,12 @@
+[project]
+name = "odoo-addons-oca-e-commerce"
+version = "18.0.20241028.1"
+dependencies = [
+    "odoo-addon-website_sale_checkout_skip_payment==18.0.*",
+    "odoo-addon-website_sale_product_attribute_value_filter_existing==18.0.*",
+]
+classifiers=[
+    "Programming Language :: Python",
+    "Framework :: Odoo",
+    "Framework :: Odoo :: 18.0",
+]

website_sale_checkout_skip_payment/README.rst

@@ -0,0 +1,105 @@
+==================================
+Website Sale Checkout Skip Payment
+==================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:d85f22d8b6d1c73f8200caddf84441b15b175961c8abfdeed9ba4bbe04b99ec9
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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-LGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+    :alt: License: LGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github
+    :target: https://github.com/OCA/e-commerce/tree/18.0/website_sale_checkout_skip_payment
+    :alt: OCA/e-commerce
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_checkout_skip_payment
+    :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/e-commerce&target_branch=18.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module allows to logged users to checkout with no payment step. At
+the end of the checkout proccess the quotation is sent to the user email
+address and set to *Qoutation Sent* state.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+1. Go to *Sales > Customers > Sales and Purchases > Sale*
+2. Set on *Skip Website Checkout Payment* so this partner will override
+   the payment step on website sales.
+
+Usage
+=====
+
+To use this module, you need to:
+
+1. Go to *Website > shop* and perform a checkout.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/e-commerce/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/e-commerce/issues/new?body=module:%20website_sale_checkout_skip_payment%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
+-------
+
+* Tecnativa
+
+Contributors
+------------
+
+-  `Tecnativa <https://www.tecnativa.com>`__
+
+   -  Sergio Teruel
+   -  David Vidal
+   -  Alexandre Díaz
+   -  Carlos Roca
+   -  Pilar Vargas
+
+-  Martin Wilderoth <[email protected]>
+-  `Studio73 <https://www.studio73.es>`__:
+
+   -  Miguel Gandia <[email protected]>
+
+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/e-commerce <https://github.com/OCA/e-commerce/tree/18.0/website_sale_checkout_skip_payment>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_sale_checkout_skip_payment/__init__.py

@@ -0,0 +1,2 @@
+from . import models
+from . import controllers

website_sale_checkout_skip_payment/__manifest__.py

@@ -0,0 +1,27 @@
+# Copyright 2017 Sergio Teruel <[email protected]>
+# Copyright 2017 David Vidal <[email protected]>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+{
+    "name": "Website Sale Checkout Skip Payment",
+    "summary": "Skip payment for logged users in checkout process",
+    "version": "18.0.1.0.0",
+    "category": "Website",
+    "website": "https://github.com/OCA/e-commerce",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "license": "LGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": ["website_sale"],
+    "data": [
+        "views/website_sale_skip_payment.xml",
+        "views/website_sale_template.xml",
+        "views/partner_view.xml",
+        "views/res_config_settings_views.xml",
+    ],
+    "assets": {
+        "web.assets_tests": [
+            "website_sale_checkout_skip_payment/static/tests/**/*",
+        ],
+    },
+}

website_sale_checkout_skip_payment/controllers/__init__.py

@@ -0,0 +1 @@
+from . import main

website_sale_checkout_skip_payment/controllers/main.py

@@ -0,0 +1,37 @@
+# Copyright 2017 Sergio Teruel <[email protected]>
+# Copyright 2017 David Vidal <[email protected]>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import http
+from odoo.http import request
+
+from odoo.addons.website_sale.controllers.main import WebsiteSale
+
+
+class CheckoutSkipPaymentWebsite(WebsiteSale):
+    def _get_shop_payment_values(self, order, **kwargs):
+        values = super()._get_shop_payment_values(order, **kwargs)
+        partner = values.get("partner")
+        if partner.skip_website_checkout_payment:
+            values["hide_payment_button"] = True
+        return values
+
+    @http.route()
+    def shop_payment_confirmation(self, **post):
+        """When we skip the payment, we'll just confirm the order and send the proper
+        confirmation message"""
+        order_id = request.session.get("sale_last_order_id")
+        if not request.website.checkout_skip_payment or not order_id:
+            return super().shop_payment_confirmation(**post)
+        order = request.env["sale.order"].sudo().browse(order_id)
+        try:
+            order.with_context(mark_so_as_sent=True)._send_order_confirmation_mail()
+        except Exception:
+            return request.render(
+                "website_sale_checkout_skip_payment.confirmation_order_error"
+            )
+        # This could not finish (e.g.: sale_financial_risk exceeded)
+        order.action_confirm()
+        request.website.sale_reset()
+        values = self._prepare_shop_payment_confirmation_values(order)
+        return request.render("website_sale.confirmation", values)

website_sale_checkout_skip_payment/i18n/am.po

@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_sale_checkout_skip_payment
+#
+# Translators:
+# OCA Transbot <[email protected]>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-05-18 10:04+0000\n"
+"PO-Revision-Date: 2021-05-18 12:12+0200\n"
+"Last-Translator: Carlos <[email protected]>\n"
+"Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
+"Language: am\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: Poedit 2.0.6\n"
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons
+msgid "<span class=\"px-3\">or</span>"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons
+msgid "<span>Confirm <span class=\"fa fa-angle-right ms-2 fw-light\"/></span>"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.confirmation_order_error
+msgid ""
+"<strong>Error!</strong> An error occurred trying to\n"
+"                            confirm the sale order."
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__checkout_skip_payment
+msgid "Checkout Skip Payment"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model,name:website_sale_checkout_skip_payment.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons
+msgid "Confirm"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model,name:website_sale_checkout_skip_payment.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.res_config_settings_view_form
+msgid "Message shown to the user when the purchase is finished"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#. odoo-python
+#: code:addons/website_sale_checkout_skip_payment/models/website.py:0
+msgid "Our team will check your order and send you payment information soon."
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.res_config_settings_view_form
+msgid "Sale Checkout Skip Message"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.confirmation_order_error
+msgid "Shop - Confirmation - Error"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_partner__skip_website_checkout_payment
+#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_users__skip_website_checkout_payment
+msgid "Skip Website Checkout Payment"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model,name:website_sale_checkout_skip_payment.model_website
+msgid "Website"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_config_settings__website_sale_checkout_skip_message
+msgid "Website Sale Checkout Skip Message"
+msgstr ""
+
+#. module: website_sale_checkout_skip_payment
+#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__website_sale_checkout_skip_message
+msgid "Website Sale SKip Message"
+msgstr ""