[MIG] website_sale_charge_payment_fee: Migration to 18.0

Author: miguel-S73

website_sale_charge_payment_fee/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "eCommerce: charge payment fee",
     "summary": "Payment fee charged to customer",
-    "version": "14.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
     "maintainers": ["miguel-S73"],
@@ -18,6 +18,14 @@
     "license": "LGPL-3",
     "application": False,
     "installable": True,
-    "depends": ["website_sale"],
-    "data": ["views/payment_acquirer_views.xml", "views/website_sale_templates.xml"],
+    "depends": ["payment", "website_sale"],
+    "data": ["views/payment_provider_views.xml", "views/website_sale_templates.xml"],
+    "assets": {
+        "web.assets_frontend": [
+            "website_sale_charge_payment_fee/static/src/js/website_sale_fee.esm.js",
+        ],
+        "web.assets_tests": [
+            "website_sale_charge_payment_fee/static/tests/tours/website_sale_fee_tour.esm.js",
+        ],
+    },
 }

website_sale_charge_payment_fee/controllers/main.py

@@ -10,30 +10,29 @@
 
 
 class WebsiteSaleFee(WebsiteSale):
-    @http.route(
-        ["/shop/payment"], type="http", auth="public", website=True, sitemap=False
-    )
-    def payment(self, **post):
-        res = super().payment(**post)
-        values = res.qcontext
+    @http.route()
+    def shop_payment(self, **post):
+        res = super().shop_payment(**post)
         order = request.website.sale_get_order()
-        payment_fee_id = post.get("payment_fee_id")
-        checked_pm_id = post.get("pm_id")
-        if checked_pm_id:
-            values["checked_pm_id"] = int(checked_pm_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)
+        provider_id = post.get("provider_id")
+        payment_option_id = post.get("payment_option_id")
+        payment_methods_sudo = res.qcontext.get("payment_methods_sudo")
+        providers_sudo = res.qcontext.get("providers_sudo")
+        if payment_option_id:
+            res.qcontext["selected_payment_method"] = int(payment_option_id)
+        if provider_id or providers_sudo:
+            if provider_id:
+                selected_provider = request.env["payment.provider"].browse(
+                    int(provider_id)
                 )
             else:
-                selected_acquirer = values["acquirers"][0]
-            values["selected_acquirer"] = selected_acquirer
-            order.sudo().update_fee_line(selected_acquirer.sudo())
-            return request.render("website_sale.payment", values)
+                _selected_provider = [
+                    provider_sudo
+                    for provider_sudo in payment_methods_sudo.provider_ids
+                    if provider_sudo in providers_sudo
+                ][:1]
+                if len(_selected_provider) > 0:
+                    selected_provider = _selected_provider[0]
+                    res.qcontext["selected_provider"] = selected_provider
+            order.sudo().update_fee_line(selected_provider.sudo())
         return res

website_sale_charge_payment_fee/i18n/es.po

@@ -4,26 +4,24 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 18.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 09:03+0000\n"
-"PO-Revision-Date: 2024-02-18 17:34+0000\n"
-"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
+"POT-Creation-Date: 2025-04-17 16:07+0000\n"
+"PO-Revision-Date: 2025-04-17 16:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: \n"
-"Language: es\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 4.17\n"
+"Plural-Forms: \n"
 
 #. module: website_sale_charge_payment_fee
-#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.payment_tokens_list_fee
+#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.method_form_fee
 msgid "(Fee:"
 msgstr "(Tasa:"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee
+#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_provider__charge_fee
 msgid ""
 "An extra fee line will be added to online order when using this payment "
 "method"
@@ -32,94 +30,73 @@ msgstr ""
 "utilice este método de pago"
 
 #. module: website_sale_charge_payment_fee
-#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.acquirer_form_fee_inherit
+#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.provider_form_fee_inherit
 msgid "Charge payment fee"
 msgstr "Cargo por pago"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_type
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_type
 msgid "Computation type"
 msgstr "Tipo de computación"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__display_name
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order__display_name
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order_line__display_name
-msgid "Display Name"
-msgstr "Nombre mostrado"
-
-#. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_currency_id
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_currency_id
 msgid "Fee Currency"
 msgstr "Divisa de la Tasa"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_description
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_description
 msgid "Fee Description"
 msgstr "Descripción de Tasa"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_product_id
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_product_id
 msgid "Fee Product"
 msgstr "Producto de tarifa"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee
 msgid "Fee charged to customer"
 msgstr "Tarifa cobrada al cliente"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields.selection,name:website_sale_charge_payment_fee.selection__payment_acquirer__charge_fee_type__fixed
+#: model:ir.model.fields.selection,name:website_sale_charge_payment_fee.selection__payment_provider__charge_fee_type__fixed
 msgid "Fixed"
 msgstr "Fijo"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_fixed_price
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_fixed_price
 msgid "Fixed Price"
 msgstr "Precio Fijo"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__id
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order__id
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order_line__id
-msgid "ID"
-msgstr "ID"
-
-#. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer____last_update
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order____last_update
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order_line____last_update
-msgid "Last Modified on"
-msgstr "Última modificación el"
-
-#. module: website_sale_charge_payment_fee
-#: model:ir.model,name:website_sale_charge_payment_fee.model_payment_acquirer
-msgid "Payment Acquirer"
-msgstr "Método de Pago"
+#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.payment_fee
+msgid "Payment Fee"
+msgstr "Cuota de pago:"
 
 #. module: website_sale_charge_payment_fee
 #: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_sale_order__amount_payment_fee
 msgid "Payment Fee Amount"
 msgstr "Importe de la tarifa de pago"
 
 #. module: website_sale_charge_payment_fee
-#: model_terms:ir.ui.view,arch_db:website_sale_charge_payment_fee.payment_fee
-msgid "Payment Fee:"
-msgstr "Cuota de pago:"
+#: model:ir.model,name:website_sale_charge_payment_fee.model_payment_provider
+msgid "Payment Provider"
+msgstr "Proveedor de pago"
 
 #. 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 "Línea de cuota pago"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_percentage
-#: model:ir.model.fields.selection,name:website_sale_charge_payment_fee.selection__payment_acquirer__charge_fee_type__percentage
+#: model:ir.model.fields,field_description:website_sale_charge_payment_fee.field_payment_provider__charge_fee_percentage
+#: model:ir.model.fields.selection,name:website_sale_charge_payment_fee.selection__payment_provider__charge_fee_type__percentage
 msgid "Percentage"
 msgstr "Porcentaje"
 
 #. module: website_sale_charge_payment_fee
-#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_acquirer__charge_fee_percentage
+#: model:ir.model.fields,help:website_sale_charge_payment_fee.field_payment_provider__charge_fee_percentage
 msgid "Percentage applied to order total"
 msgstr "Porcentaje aplicado al total del pedido"
 

website_sale_charge_payment_fee/models/__init__.py

@@ -1,3 +1,3 @@
-from . import payment_acquirer
+from . import payment_provider
 from . import sale_order
 from . import sale_order_line

…e_payment_fee/models/payment_acquirer.py …e_payment_fee/models/payment_provider.pywebsite_sale_charge_payment_fee/models/payment_acquirer.py renamed to website_sale_charge_payment_fee/models/payment_provider.py website_sale_charge_payment_fee/models/payment_acquirer.py renamed to website_sale_charge_payment_fee/models/payment_provider.py

@@ -8,15 +8,17 @@
 import odoo.addons.decimal_precision as dp
 
 
-class PaymentAcquirer(models.Model):
-    _inherit = "payment.acquirer"
+class PaymentProvider(models.Model):
+    _inherit = "payment.provider"
 
     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_description = fields.Text(
+        "Fee Description", compute="_compute_charge_fee_description"
+    )
     charge_fee_product_id = fields.Many2one("product.product", string="Fee Product")
     charge_fee_fixed_price = fields.Float(
         "Fixed Price", digits=dp.get_precision("Product Price")
@@ -31,7 +33,11 @@ class PaymentAcquirer(models.Model):
         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
+    @api.depends("charge_fee_product_id")
+    def _compute_charge_fee_description(self):
+        for provider in self:
+            provider.charge_fee_description = (
+                provider.charge_fee_product_id.name
+                if provider.charge_fee_product_id
+                else None
+            )

website_sale_charge_payment_fee/models/sale_order.py

@@ -20,10 +20,14 @@ class SaleOrder(models.Model):
     )
 
     def _compute_website_order_line(self):
-        super()._compute_website_order_line()
-        self.website_order_line = self.website_order_line.filtered(
-            lambda l: not l.payment_fee_line
-        )
+        res = super()._compute_website_order_line()
+        website_order_line = self.env["sale.order.line"]
+        for order in self:
+            for line in order.website_order_line:
+                if not line.payment_fee_line:
+                    website_order_line |= line
+            order.website_order_line = website_order_line
+        return res
 
     @api.depends(
         "order_line.price_unit",
@@ -33,46 +37,59 @@ def _compute_website_order_line(self):
     )
     def _compute_amount_payment_fee(self):
         for order in self:
-            if self.env.user.has_group(
-                "account.group_show_line_subtotals_tax_excluded"
+            amount_payment_fee = 0.0
+            if (
+                self.env["website"]
+                .get_current_website()
+                .show_line_subtotals_tax_selection
+                == "tax_excluded"
             ):
-                order.amount_payment_fee = sum(
-                    order.order_line.filtered("payment_fee_line").mapped(
-                        "price_subtotal"
-                    )
-                )
+                for line in order.order_line:
+                    if line.payment_fee_line:
+                        amount_payment_fee += line.price_subtotal
             else:
-                order.amount_payment_fee = sum(
-                    order.order_line.filtered("payment_fee_line").mapped("price_total")
-                )
+                for line in order.order_line:
+                    if line.payment_fee_line:
+                        amount_payment_fee += line.price_total
+            order.amount_payment_fee = amount_payment_fee
 
-    def update_fee_line(self, acquirer):
+    def update_fee_line(self, provider):
         self.ensure_one()
         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 provider.charge_fee:
+            if provider.charge_fee_type == "fixed":
+                price = provider.charge_fee_fixed_price
                 if (
-                    acquirer.charge_fee_currency_id.id
+                    provider.charge_fee_currency_id.id
                     != self.pricelist_id.currency_id.id
                 ):
-                    price = acquirer.charge_fee_currency_id._convert(
+                    price = provider.charge_fee_currency_id._convert(
                         price,
                         self.pricelist_id.currency_id,
                         self.company_id,
                         self.date_order,
                     )
-            elif acquirer.charge_fee_type == "percentage":
-                price = (acquirer.charge_fee_percentage / 100.0) * self.amount_total
+            elif provider.charge_fee_type == "percentage":
+                if (
+                    self.env["website"]
+                    .get_current_website()
+                    .show_line_subtotals_tax_selection
+                    == "tax_excluded"
+                ):
+                    price = (
+                        provider.charge_fee_percentage / 100.0
+                    ) * self.amount_untaxed
+                else:
+                    price = (provider.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,
+                    "product_id": provider.charge_fee_product_id.id,
+                    "product_uom": provider.charge_fee_product_id.uom_id.id,
+                    "name": provider.charge_fee_description,
                     "price_unit": price,
                     "product_uom_qty": 1,
                 }