vouchers improvements

addons/payment_mollie/models/mollie.py

@@ -3,6 +3,7 @@
 
 import logging
 
+from odoo.osv import expression
 from odoo import _, api, fields, models
 
 _logger = logging.getLogger(__name__)
@@ -15,7 +16,7 @@ class MolliePaymentMethod(models.Model):
 
     name = fields.Char(translate=True)
     sequence = fields.Integer()
-    parent_id = fields.Many2one('payment.acquirer')  # This will be always mollie
+    acquirer_id = fields.Many2one('payment.acquirer')  # This will be always mollie
     method_code = fields.Char(string="Method code")
     payment_icon_ids = fields.Many2many('payment.icon', string='Supported Payment Icons')
     active = fields.Boolean(default=True)
@@ -36,7 +37,7 @@ class MolliePaymentIssuers(models.Model):
 
     name = fields.Char()
     sequence = fields.Integer()
-    parent_id = fields.Many2one('mollie.payment.method')
+    acquirer_id = fields.Many2one('mollie.payment.method')
     payment_icon_ids = fields.Many2many('payment.icon', string='Supported Payment Icons')
     issuers_code = fields.Char()
     active = fields.Boolean(default=True)
@@ -47,30 +48,19 @@ class MollieVoucherLines(models.Model):
     _description = 'Mollie voucher method'
 
     method_id = fields.Many2one('mollie.payment.method')
-    category_id = fields.Many2one('product.category')
-    mollie_voucher_category = fields.Selection(related="category_id.mollie_voucher_category", readonly=False)
-
-    def unlink(self):
-        for voucher_line in self:
-            voucher_line.mollie_voucher_category = False
-        return super().unlink()
-
-
-class ProductCategory(models.Model):
-    _inherit = 'product.category'
-
-    mollie_voucher_category = fields.Selection([('meal', 'Meal'), ('eco', 'Eco'), ('gift', 'Gift')])
+    method_id = fields.Many2one('mollie.payment.method')
+    category_ids = fields.Many2many('product.category')
+    product_ids = fields.Many2many('product.template')
+    mollie_voucher_category = fields.Selection([('meal', 'Meal'), ('eco', 'Eco'), ('gift', 'Gift')], required=True)
 
 
 class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
     def _get_mollie_voucher_category(self):
-        self.ensure_one()
-        mollie_voucher_category = False
-        category_id = self.categ_id
-        if category_id:
-            while not mollie_voucher_category and category_id:
-                mollie_voucher_category = category_id.mollie_voucher_category
-                category_id = category_id.parent_id
-        return mollie_voucher_category
+        domain = [('product_ids', 'in', self.ids)]
+        categories = self.mapped('categ_id')
+        if categories:
+            domain = expression.OR([domain, [('category_ids', 'parent_of', categories.ids)]])
+        voucher_line = self.env['mollie.voucher.line'].search(domain, limit=1)
+        return voucher_line and voucher_line.mollie_voucher_category or False

addons/payment_mollie/models/payment_acquirer.py

@@ -25,7 +25,7 @@ class PaymentAcquirerMollie(models.Model):
     mollie_api_key_test = fields.Char(string="Mollie Test API key", required_if_provider="mollie", groups="base.group_user")
     mollie_api_key_prod = fields.Char(string="Mollie Live API key", required_if_provider="mollie", groups="base.group_user")
     mollie_profile_id = fields.Char("Mollie Profile ID", groups="base.group_user")
-    mollie_methods_ids = fields.One2many('mollie.payment.method', 'parent_id', string='Mollie Payment Methods')
+    mollie_methods_ids = fields.One2many('mollie.payment.method', 'acquirer_id', string='Mollie Payment Methods')
 
     # ------------------
     # OVERRIDDEN METHODS
@@ -86,7 +86,7 @@ def _sync_mollie_methods(self, methods_data):
             create_vals = {
                 'name': method_info['description'],
                 'method_code': method_info['id'],
-                'parent_id': self.id,
+                'acquirer_id': self.id,
                 'supports_order_api': method_info.get('support_order_api', False),
                 'supports_payment_api': method_info.get('support_payment_api', False)
             }
@@ -174,10 +174,10 @@ def _mollie_get_supported_methods(self, order, invoice, amount, currency):
         if not self.sudo().mollie_profile_id:
             methods = methods.filtered(lambda m: m.method_code != 'creditcard')
 
-        remove_voucher_method, extra_params = True, {}
+        has_voucher_line, extra_params = False, {}
         if order:
             extra_params['amount'] = {'value': "%.2f" % order.amount_total, 'currency': order.currency_id.name}
-            remove_voucher_method = not any(map(lambda p: p._get_mollie_voucher_category(), order.mapped('order_line.product_id.product_tmpl_id')))
+            has_voucher_line = order.mapped('order_line.product_id.product_tmpl_id')._get_mollie_voucher_category()
             if order.partner_invoice_id.country_id:
                 extra_params['billingCountry'] = order.partner_invoice_id.country_id.code
         else:
@@ -192,7 +192,7 @@ def _mollie_get_supported_methods(self, order, invoice, amount, currency):
         if amount and currency:
             extra_params['amount'] = {'value': "%.2f" % amount, 'currency': currency.name}
 
-        if remove_voucher_method:
+        if not has_voucher_line:
             methods = methods.filtered(lambda m: m.method_code != 'voucher')
 
         # Hide based on country

addons/payment_mollie/views/payment_views.xml

@@ -30,7 +30,7 @@
                             <field name="payment_icon_ids" widget="many2many_tags"/>
                             <field name="active" invisible="1"/>
                             <field name="active_on_shop" widget="boolean_toggle"/>
-                            <field name="country_ids" widget="many2many_tags" optional="hide"/>
+                            <field name="country_ids" widget="many2many_tags"/>
                             <field name="supports_order_api" invisible="1"/>
                             <field name="supports_payment_api" invisible="1"/>
                             <field name="payment_issuer_ids" widget="many2many_tags" invisible="1"/>
@@ -60,8 +60,9 @@
                                 <page string="Voucher Configuration" name="voucher_config" attrs="{'invisible': [('method_code', '!=', 'voucher')]}">
                                     <field name="mollie_voucher_ids">
                                         <tree editable="bottom">
-                                            <field name="category_id"/>
                                             <field name="mollie_voucher_category"/>
+                                            <field name="category_ids" widget="many2many_tags"/>
+                                            <field name="product_ids" widget="many2many_tags"/>
                                         </tree>
                                     </field>
                                 </page>