From c01814659ec92205125d9dea27e07084846892db Mon Sep 17 00:00:00 2001 From: Kimkhoi3010 Date: Mon, 19 Jan 2026 16:35:24 +0700 Subject: [PATCH 001/101] [FIX] website_sale_*: fix jsdoc tag name lint error --- .../tests/tours/website_sale_checkout_skip_payment_tour.esm.js | 2 -- .../static/tests/tours/website_sale_order_type_tour.esm.js | 1 - ...duct_attribute_value_filter_existing_search_desk_tour.esm.js | 2 -- ...ite_sale_product_attribute_value_filter_existing_tour.esm.js | 2 -- .../tests/tours/website_sale_wishlist_hide_price_tour.esm.js | 2 -- 5 files changed, 9 deletions(-) diff --git a/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js b/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js index 97ee37201c..c752d0f494 100644 --- a/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js +++ b/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js @@ -1,5 +1,3 @@ -/** @odoo-module **/ - import {registry} from "@web/core/registry"; import * as tourUtils from "@website_sale/js/tours/tour_utils"; diff --git a/website_sale_order_type/static/tests/tours/website_sale_order_type_tour.esm.js b/website_sale_order_type/static/tests/tours/website_sale_order_type_tour.esm.js index 01ccd896e7..f35bac0b07 100644 --- a/website_sale_order_type/static/tests/tours/website_sale_order_type_tour.esm.js +++ b/website_sale_order_type/static/tests/tours/website_sale_order_type_tour.esm.js @@ -1,4 +1,3 @@ -/** @odoo-module */ /* Copyright 2020 Tecnativa - João Marques * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ diff --git a/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_search_desk_tour.esm.js b/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_search_desk_tour.esm.js index 9124ba41a4..3413b73ee8 100644 --- a/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_search_desk_tour.esm.js +++ b/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_search_desk_tour.esm.js @@ -1,5 +1,3 @@ -/** @odoo-module **/ - import {registry} from "@web/core/registry"; registry diff --git a/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_tour.esm.js b/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_tour.esm.js index 2d4569e809..c3f3837513 100644 --- a/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_tour.esm.js +++ b/website_sale_product_attribute_value_filter_existing/static/src/js/website_sale_product_attribute_value_filter_existing_tour.esm.js @@ -1,5 +1,3 @@ -/** @odoo-module **/ - import {registry} from "@web/core/registry"; registry diff --git a/website_sale_wishlist_hide_price/static/tests/tours/website_sale_wishlist_hide_price_tour.esm.js b/website_sale_wishlist_hide_price/static/tests/tours/website_sale_wishlist_hide_price_tour.esm.js index 4797165eb4..db8737241e 100644 --- a/website_sale_wishlist_hide_price/static/tests/tours/website_sale_wishlist_hide_price_tour.esm.js +++ b/website_sale_wishlist_hide_price/static/tests/tours/website_sale_wishlist_hide_price_tour.esm.js @@ -1,5 +1,3 @@ -/** @odoo-module **/ - import {registry} from "@web/core/registry"; registry.category("web_tour.tours").add("website_sale_wishlist_hide_price_tour", { From 7259bac3e922a57b3759afdb4fe0d0d152227606 Mon Sep 17 00:00:00 2001 From: Kimkhoi3010 Date: Mon, 19 Jan 2026 16:38:10 +0700 Subject: [PATCH 002/101] [FIX] website_sale_*: sort-imports --- .../src/js/website_sale_acquirer_confirm_order_tour.esm.js | 2 +- .../tests/tours/website_sale_checkout_skip_payment_tour.esm.js | 2 +- website_sale_require_legal/static/tests/tours/tour.esm.js | 2 +- .../src/js/website_sale_stock_provisioning_date_tour.esm.js | 2 +- website_snippet_product_category/static/src/js/frontend.esm.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website_sale_acquirer_confirm_order/static/src/js/website_sale_acquirer_confirm_order_tour.esm.js b/website_sale_acquirer_confirm_order/static/src/js/website_sale_acquirer_confirm_order_tour.esm.js index 44490df55f..3408252b98 100644 --- a/website_sale_acquirer_confirm_order/static/src/js/website_sale_acquirer_confirm_order_tour.esm.js +++ b/website_sale_acquirer_confirm_order/static/src/js/website_sale_acquirer_confirm_order_tour.esm.js @@ -1,7 +1,7 @@ /* Copyright 2025 Tecnativa - Pilar Vargas * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ -import {registry} from "@web/core/registry"; import * as tourUtils from "@website_sale/js/tours/tour_utils"; +import {registry} from "@web/core/registry"; registry.category("web_tour.tours").add("website_sale_acquirer_confirm_order", { url: "/shop", diff --git a/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js b/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js index c752d0f494..80a069d5b8 100644 --- a/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js +++ b/website_sale_checkout_skip_payment/static/tests/tours/website_sale_checkout_skip_payment_tour.esm.js @@ -1,5 +1,5 @@ -import {registry} from "@web/core/registry"; import * as tourUtils from "@website_sale/js/tours/tour_utils"; +import {registry} from "@web/core/registry"; registry.category("web_tour.tours").add("website_sale_checkout_skip_payment", { url: "/shop", diff --git a/website_sale_require_legal/static/tests/tours/tour.esm.js b/website_sale_require_legal/static/tests/tours/tour.esm.js index 61bc6e17b8..6d2fd204c2 100644 --- a/website_sale_require_legal/static/tests/tours/tour.esm.js +++ b/website_sale_require_legal/static/tests/tours/tour.esm.js @@ -2,8 +2,8 @@ * Copyright 2023 Pilar Vargas * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ -import {registry} from "@web/core/registry"; import * as tourUtils from "@website_sale/js/tours/tour_utils"; +import {registry} from "@web/core/registry"; registry.category("web_tour.tours").add("website_sale_require_legal_with_payment", { url: "/shop", diff --git a/website_sale_stock_provisioning_date/static/src/js/website_sale_stock_provisioning_date_tour.esm.js b/website_sale_stock_provisioning_date/static/src/js/website_sale_stock_provisioning_date_tour.esm.js index 4db0539502..29c8759eb2 100644 --- a/website_sale_stock_provisioning_date/static/src/js/website_sale_stock_provisioning_date_tour.esm.js +++ b/website_sale_stock_provisioning_date/static/src/js/website_sale_stock_provisioning_date_tour.esm.js @@ -1,9 +1,9 @@ /* Copyright 2020 Tecnativa - Ernesto Tejeda * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ +import {clickOnElement} from "@website/js/tours/tour_utils"; import {registry} from "@web/core/registry"; import {searchProduct} from "@website_sale/js/tours/tour_utils"; -import {clickOnElement} from "@website/js/tours/tour_utils"; registry.category("web_tour.tours").add("website_sale_stock_provisioning_date", { test: true, diff --git a/website_snippet_product_category/static/src/js/frontend.esm.js b/website_snippet_product_category/static/src/js/frontend.esm.js index 89481809bd..05a0836e43 100644 --- a/website_snippet_product_category/static/src/js/frontend.esm.js +++ b/website_snippet_product_category/static/src/js/frontend.esm.js @@ -1,9 +1,9 @@ // Copyright 2020 Tecnativa - Alexandre Díaz // Copyright 2025 Tecnativa - Pilar Vargas // License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). -import sAnimation from "@website/js/content/snippets.animation"; import {_t} from "@web/core/l10n/translation"; import {rpc} from "@web/core/network/rpc"; +import sAnimation from "@website/js/content/snippets.animation"; sAnimation.registry.js_product_category = sAnimation.Class.extend({ selector: ".js_product_category", From 5fe4b7522f20481bab7f648fd0ba9f99d707a086 Mon Sep 17 00:00:00 2001 From: Kimkhoi3010 Date: Mon, 19 Jan 2026 17:08:27 +0700 Subject: [PATCH 003/101] [FIX] website_sale_secondary_unit: avoid reassigning event parameter --- .../static/src/js/website_sale_secondary_unit.esm.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.esm.js b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.esm.js index dd2f0a143d..676f9f0d66 100644 --- a/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.esm.js +++ b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.esm.js @@ -52,16 +52,17 @@ publicWidget.registry.sale_secondary_unit = publicWidget.Widget.extend(VariantMi }, _onChangeSecondaryUom: function (ev) { - if (!ev) { + let eventToUse = ev; + if (!eventToUse) { // HACK: Create a fake event to locate the form on "onChangeAddQuantity" // odoo method - ev = jQuery.Event("fakeEvent"); - ev.currentTarget = $(".form-control.quantity"); + eventToUse = jQuery.Event("fakeEvent"); + eventToUse.currentTarget = $(".form-control.quantity"); } this._setValues(); const factor = this.secondary_uom_factor * this.product_uom_factor; this.$product_qty.val(this.secondary_uom_qty * factor); - this.onChangeAddQuantity(ev); + this.onChangeAddQuantity(eventToUse); }, _onChangeProductQty: function () { this._setValues(); From 0388cd9607bb31d1df05cd0cd4e097aaae3a5719 Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Thu, 12 Feb 2026 13:26:44 +0100 Subject: [PATCH 004/101] [FIX] website_sale_product_brand: fix top panel brand filtering and clear filters TT60818 --- .../controllers/main.py | 19 ++-- .../views/templates.xml | 95 ++++++++++++++++++- 2 files changed, 100 insertions(+), 14 deletions(-) diff --git a/website_sale_product_brand/controllers/main.py b/website_sale_product_brand/controllers/main.py index 7b3175227d..8551266461 100644 --- a/website_sale_product_brand/controllers/main.py +++ b/website_sale_product_brand/controllers/main.py @@ -20,7 +20,12 @@ def _get_shop_domain( ) # add selected brands to product search domain brands_list = self._get_brand_ids(request.httprequest.args) - return self._update_domain(brands_list, domain) + domain = self._update_domain(brands_list, domain) + if "brand_id" in request.context: + domain = expression.AND( + [domain, [("product_brand_id", "=", request.context["brand_id"])]] + ) + return domain def _update_domain(self, brands_list, domain): selected_brand_ids = [int(brand) for brand in brands_list] @@ -93,18 +98,6 @@ def _get_search_options( res["brand"] = request.context.get("brand_id") return res - def _get_shop_domain( - self, search, category, attrib_values, search_in_description=True - ): - domain = super()._get_shop_domain( - search, category, attrib_values, search_in_description=search_in_description - ) - if "brand_id" in request.context: - domain = expression.AND( - [domain, [("product_brand_id", "=", request.context["brand_id"])]] - ) - return domain - @http.route( [ "/shop", diff --git a/website_sale_product_brand/views/templates.xml b/website_sale_product_brand/views/templates.xml index e3b8731792..40515a2ef5 100644 --- a/website_sale_product_brand/views/templates.xml +++ b/website_sale_product_brand/views/templates.xml @@ -56,7 +56,7 @@ class="accordion-item rounded-0 border-top-0 py-3" > @@ -85,4 +85,97 @@ + From 952d33f2812a3caf98fccbae80b1e6e396a478d2 Mon Sep 17 00:00:00 2001 From: eLBati Date: Mon, 4 Jun 2018 16:54:54 +0200 Subject: [PATCH 005/101] ADD website_sale_charge_payment_fee ADD website_sale_charge_payment_fee_delivery: link module ADD website_sale_charge_payment_fee_quote: link module --- website_sale_charge_payment_fee/README.rst | 82 ++++ website_sale_charge_payment_fee/__init__.py | 5 + .../__manifest__.py | 23 + .../controllers/__init__.py | 4 + .../controllers/website_sale.py | 31 ++ website_sale_charge_payment_fee/i18n/it.po | 105 +++++ .../i18n/website_sale_charge_payment_fee.pot | 96 ++++ .../models/__init__.py | 5 + .../models/payment.py | 32 ++ .../models/sale.py | 44 ++ .../readme/CONFIGURE.rst | 5 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/index.html | 426 ++++++++++++++++++ .../static/src/js/website_sale_fee.js | 26 ++ .../templates/website_sale.xml | 60 +++ .../views/payment_view.xml | 40 ++ 17 files changed, 986 insertions(+) create mode 100644 website_sale_charge_payment_fee/README.rst create mode 100644 website_sale_charge_payment_fee/__init__.py create mode 100644 website_sale_charge_payment_fee/__manifest__.py create mode 100644 website_sale_charge_payment_fee/controllers/__init__.py create mode 100644 website_sale_charge_payment_fee/controllers/website_sale.py create mode 100644 website_sale_charge_payment_fee/i18n/it.po create mode 100644 website_sale_charge_payment_fee/i18n/website_sale_charge_payment_fee.pot create mode 100644 website_sale_charge_payment_fee/models/__init__.py create mode 100644 website_sale_charge_payment_fee/models/payment.py create mode 100644 website_sale_charge_payment_fee/models/sale.py create mode 100644 website_sale_charge_payment_fee/readme/CONFIGURE.rst create mode 100644 website_sale_charge_payment_fee/readme/CONTRIBUTORS.rst create mode 100644 website_sale_charge_payment_fee/readme/DESCRIPTION.rst create mode 100644 website_sale_charge_payment_fee/static/description/index.html create mode 100644 website_sale_charge_payment_fee/static/src/js/website_sale_fee.js create mode 100644 website_sale_charge_payment_fee/templates/website_sale.xml create mode 100644 website_sale_charge_payment_fee/views/payment_view.xml diff --git a/website_sale_charge_payment_fee/README.rst b/website_sale_charge_payment_fee/README.rst new file mode 100644 index 0000000000..6ae8a6e2f7 --- /dev/null +++ b/website_sale_charge_payment_fee/README.rst @@ -0,0 +1,82 @@ +============================= +eCommerce: charge payment fee +============================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/10.0/website_sale_charge_payment_fee + :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-10-0/e-commerce-10-0-website_sale_charge_payment_fee + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/113/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to associate generic payment fee to online payment methods. Thus, when website user select a payment method with additional fee, an additional sale order line will be added to online order + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Click + +Accounting -> Configuration -> Payments -> Payment Acquirers + +open an acquirer and in CHARGE PAYMENT FEE tab, you can set the fee to be charged to customer. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Agile Business Group + +Contributors +~~~~~~~~~~~~ + +* Lorenzo Battistini + +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 `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_charge_payment_fee/__init__.py b/website_sale_charge_payment_fee/__init__.py new file mode 100644 index 0000000000..17a5bf9ce5 --- /dev/null +++ b/website_sale_charge_payment_fee/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from . import models +from . import controllers diff --git a/website_sale_charge_payment_fee/__manifest__.py b/website_sale_charge_payment_fee/__manifest__.py new file mode 100644 index 0000000000..18e2f6b951 --- /dev/null +++ b/website_sale_charge_payment_fee/__manifest__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Lorenzo Battistini - Agile Business Group +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +{ + "name": "eCommerce: charge payment fee", + "summary": "Payment fee charged to customer", + "version": "10.0.1.0.0", + "development_status": "Beta", + "category": "Website", + "website": "https://github.com/OCA/e-commerce", + "author": "Agile Business Group, Odoo Community Association (OCA)", + "license": "LGPL-3", + "application": False, + "installable": True, + "depends": [ + "website_sale", + ], + "data": [ + "views/payment_view.xml", + "templates/website_sale.xml" + ], +} diff --git a/website_sale_charge_payment_fee/controllers/__init__.py b/website_sale_charge_payment_fee/controllers/__init__.py new file mode 100644 index 0000000000..ac49d820bd --- /dev/null +++ b/website_sale_charge_payment_fee/controllers/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from . import website_sale diff --git a/website_sale_charge_payment_fee/controllers/website_sale.py b/website_sale_charge_payment_fee/controllers/website_sale.py new file mode 100644 index 0000000000..50cf76fdef --- /dev/null +++ b/website_sale_charge_payment_fee/controllers/website_sale.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from odoo.http import request +from odoo import http +from odoo.addons.website_sale.controllers.main import WebsiteSale + + +class WebsiteSaleFee(WebsiteSale): + + @http.route() + def payment(self, **post): + res = super(WebsiteSaleFee, self).payment(**post) + values = res.qcontext + order = request.website.sale_get_order() + payment_fee_id = post.get('payment_fee_id') + if payment_fee_id or 'acquirers' in values: + # If 'acquirers' in values, default behaviour when acquirers are + # present, we update the order with the first one + # (see 'payment' template) + # If payment_fee_id, it means user selected it + # (see website_sale_fee.js) + if payment_fee_id: + selected_acquirer = request.env[ + 'payment.acquirer'].browse(int(payment_fee_id)) + values['selected_acquirer'] = selected_acquirer + else: + selected_acquirer = values['acquirers'][0] + order.sudo().update_fee_line(selected_acquirer.sudo()) + return request.render("website_sale.payment", values) + return res diff --git a/website_sale_charge_payment_fee/i18n/it.po b/website_sale_charge_payment_fee/i18n/it.po new file mode 100644 index 0000000000..911aa9afa3 --- /dev/null +++ b/website_sale_charge_payment_fee/i18n/it.po @@ -0,0 +1,105 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_sale_charge_payment_fee +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-08 10:08+0000\n" +"PO-Revision-Date: 2018-06-08 10:08+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: website_sale_charge_payment_fee +#: model:ir.ui.view,arch_db:website_sale_charge_payment_fee.payment_fee +msgid "(Fee:" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee +msgid "" +"An extra fee line will be added to online order when using this payment " +"method" +msgstr "" +"Una tariffa aggiuntiva verrà aggiunta all'ordine online quando si utilizza " +"questo metodo di pagamento" + +#. module: website_sale_charge_payment_fee +#: model:ir.ui.view,arch_db:website_sale_charge_payment_fee.acquirer_form_fee +msgid "Charge payment fee" +msgstr "Addebita tariffa di pagamento" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_type +msgid "Computation type" +msgstr "Tipo di calcolo" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_description +msgid "Fee Description" +msgstr "Descrizione tariffa" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_product_id +msgid "Fee Product" +msgstr "Prodotto tariffa" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee +msgid "Fee charged to customer" +msgstr "Tariffa addebitata al cliente" + +#. module: website_sale_charge_payment_fee +#: selection:payment.acquirer,charge_fee_type:0 +msgid "Fixed" +msgstr "Fisso" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_fixed_price +msgid "Fixed Price" +msgstr "Prezzo Fisso" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_payment_acquirer +msgid "Payment Acquirer" +msgstr "Acquirente di Pagamento" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order_line_payment_fee_line +msgid "Payment fee line" +msgstr "Riga tariffa pagamento" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_percentage +#: selection:payment.acquirer,charge_fee_type:0 +msgid "Percentage" +msgstr "Percentuale" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_percentage +msgid "Percentage applied to order total" +msgstr "Percentuale applicata al totale dell'ordine" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_sale_order +msgid "Sales Order" +msgstr "Ordine di vendita" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_sale_order_line +msgid "Sales Order Line" +msgstr "Riga d'Ordine di Vendita" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_tax_ids +msgid "Taxes" +msgstr "Imposte" + +#~ msgid "(Fee:" +#~ msgstr "(Tariffa:" diff --git a/website_sale_charge_payment_fee/i18n/website_sale_charge_payment_fee.pot b/website_sale_charge_payment_fee/i18n/website_sale_charge_payment_fee.pot new file mode 100644 index 0000000000..9b18067401 --- /dev/null +++ b/website_sale_charge_payment_fee/i18n/website_sale_charge_payment_fee.pot @@ -0,0 +1,96 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_sale_charge_payment_fee +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.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_sale_charge_payment_fee +#: model:ir.ui.view,arch_db:website_sale_charge_payment_fee.payment_fee +msgid "(Fee:" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee +msgid "An extra fee line will be added to online order when using this payment method" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.ui.view,arch_db:website_sale_charge_payment_fee.acquirer_form_fee +msgid "Charge payment fee" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_type +msgid "Computation type" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_description +msgid "Fee Description" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_product_id +msgid "Fee Product" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee +msgid "Fee charged to customer" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: selection:payment.acquirer,charge_fee_type:0 +msgid "Fixed" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_fixed_price +msgid "Fixed Price" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_payment_acquirer +msgid "Payment Acquirer" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order_line_payment_fee_line +msgid "Payment fee line" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_percentage +#: selection:payment.acquirer,charge_fee_type:0 +msgid "Percentage" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_percentage +msgid "Percentage applied to order total" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model,name:website_sale_charge_payment_fee.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: website_sale_charge_payment_fee +#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer_charge_fee_tax_ids +msgid "Taxes" +msgstr "" + diff --git a/website_sale_charge_payment_fee/models/__init__.py b/website_sale_charge_payment_fee/models/__init__.py new file mode 100644 index 0000000000..b80a3a9e3e --- /dev/null +++ b/website_sale_charge_payment_fee/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from . import payment +from . import sale diff --git a/website_sale_charge_payment_fee/models/payment.py b/website_sale_charge_payment_fee/models/payment.py new file mode 100644 index 0000000000..3788f0acf1 --- /dev/null +++ b/website_sale_charge_payment_fee/models/payment.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from odoo import models, fields, api +import odoo.addons.decimal_precision as dp + + +class PaymentAcquirer(models.Model): + _inherit = 'payment.acquirer' + + charge_fee = fields.Boolean( + "Fee charged to customer", + help="An extra fee line will be added to online order when using this " + "payment method") + charge_fee_description = fields.Text("Fee Description") + charge_fee_product_id = fields.Many2one( + 'product.product', string="Fee Product") + charge_fee_tax_ids = fields.Many2many( + 'account.tax', string='Taxes') + charge_fee_fixed_price = fields.Float( + 'Fixed Price', digits=dp.get_precision('Product Price')) + charge_fee_percentage = fields.Float( + 'Percentage', help="Percentage applied to order total") + charge_fee_type = fields.Selection([ + ('fixed', 'Fixed'), + ('percentage', 'Percentage'), + ], string="Computation type", default='fixed') + + @api.onchange("charge_fee_product_id") + def onchange_charge_fee_product_id(self): + if self.charge_fee_product_id: + self.charge_fee_description = self.charge_fee_product_id.name diff --git a/website_sale_charge_payment_fee/models/sale.py b/website_sale_charge_payment_fee/models/sale.py new file mode 100644 index 0000000000..989f9a79a2 --- /dev/null +++ b/website_sale_charge_payment_fee/models/sale.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). + +from odoo import models, fields + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + def update_fee_line(self, acquirer): + for line in self.order_line: + if line.payment_fee_line: + line.unlink() + if acquirer.charge_fee: + if acquirer.charge_fee_type == 'fixed': + price = acquirer.charge_fee_fixed_price + if ( + self.company_id.currency_id.id != + self.pricelist_id.currency_id.id + ): + price = self.company_id.currency_id.with_context( + date=self.date_order + ).compute(price, self.pricelist_id.currency_id) + elif acquirer.charge_fee_type == 'percentage': + price = ( + acquirer.charge_fee_percentage / 100.0 + ) * self.amount_total + self.env['sale.order.line'].create({ + 'order_id': self.id, + 'payment_fee_line': True, + 'product_id': acquirer.charge_fee_product_id.id, + 'product_uom': acquirer.charge_fee_product_id.uom_id.id, + 'name': acquirer.charge_fee_description, + 'price_unit': price, + 'product_uom_qty': 1, + 'tax_id': [ + (6, 0, [t.id for t in acquirer.charge_fee_tax_ids]) + ], + }) + + +class SaleOrderLine(models.Model): + _inherit = 'sale.order.line' + payment_fee_line = fields.Boolean("Payment fee line", readonly=True) diff --git a/website_sale_charge_payment_fee/readme/CONFIGURE.rst b/website_sale_charge_payment_fee/readme/CONFIGURE.rst new file mode 100644 index 0000000000..66a127433f --- /dev/null +++ b/website_sale_charge_payment_fee/readme/CONFIGURE.rst @@ -0,0 +1,5 @@ +Click + +Accounting -> Configuration -> Payments -> Payment Acquirers + +open an acquirer and in CHARGE PAYMENT FEE tab, you can set the fee to be charged to customer. diff --git a/website_sale_charge_payment_fee/readme/CONTRIBUTORS.rst b/website_sale_charge_payment_fee/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..65a7e30bc6 --- /dev/null +++ b/website_sale_charge_payment_fee/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Lorenzo Battistini diff --git a/website_sale_charge_payment_fee/readme/DESCRIPTION.rst b/website_sale_charge_payment_fee/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..229cd5325a --- /dev/null +++ b/website_sale_charge_payment_fee/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to associate generic payment fee to online payment methods. Thus, when website user select a payment method with additional fee, an additional sale order line will be added to online order diff --git a/website_sale_charge_payment_fee/static/description/index.html b/website_sale_charge_payment_fee/static/description/index.html new file mode 100644 index 0000000000..f2a0c18070 --- /dev/null +++ b/website_sale_charge_payment_fee/static/description/index.html @@ -0,0 +1,426 @@ + + + + + + +eCommerce: charge payment fee + + + +
+

eCommerce: charge payment fee

+ + +

Beta License: LGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

This module allows to associate generic payment fee to online payment methods. Thus, when website user select a payment method with additional fee, an additional sale order line will be added to online order

+

Table of contents

+ +
+

Configuration

+

Click

+

Accounting -> Configuration -> Payments -> Payment Acquirers

+

open an acquirer and in CHARGE PAYMENT FEE tab, you can set the fee to be charged to customer.

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Agile Business Group
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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

+

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

+

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

+
+
+
+ + diff --git a/website_sale_charge_payment_fee/static/src/js/website_sale_fee.js b/website_sale_charge_payment_fee/static/src/js/website_sale_fee.js new file mode 100644 index 0000000000..1f01b75309 --- /dev/null +++ b/website_sale_charge_payment_fee/static/src/js/website_sale_fee.js @@ -0,0 +1,26 @@ +$(document).ready(function () { + + if (_.str.startsWith(window.location.pathname, "/shop/payment")) { + var $pay_button = $('.oe_sale_acquirer_button button'); + $pay_button.prop('disabled', false); + + // When choosing a payment, update the quotation. Disable the 'Pay + // Now' button to avoid being redirected to payment acquirer if the delivery carrier update is + // not over. + var $payment_method = $("#payment_method"); + var $selected_acquirer_id = $("input[name='selected_acquirer_id']"); + var selected_acquirer_id = $selected_acquirer_id.val(); + $payment_method.find("input[name='acquirer']").click(function (ev) { + var payment_id = $(ev.currentTarget).val(); + // We need to check selected_acquirer_id because website_sale module clicks on checked acquirer at page load. + // See website_sale/static/src/js/website_sale_payment.js : + // .find("input[name='acquirer']:checked").click(); + // Without this check, redirect would be performed right after page load + if (selected_acquirer_id != null && payment_id != selected_acquirer_id) { + $pay_button.prop('disabled', true); + window.location.href = '/shop/payment?payment_fee_id=' + payment_id; + } + }); + } + +}); diff --git a/website_sale_charge_payment_fee/templates/website_sale.xml b/website_sale_charge_payment_fee/templates/website_sale.xml new file mode 100644 index 0000000000..2d772d42f2 --- /dev/null +++ b/website_sale_charge_payment_fee/templates/website_sale.xml @@ -0,0 +1,60 @@ + + +