[FIX] payment: enable manual capture for payment method brands

Versions
--------
- saas-18.2+

Steps
-----
1. Set up Adyen as a payment provider;
2. enable manual capture;
3. set up a sales order;
4. pay for sales order with Adyen using VISA;
5. do a partial manual capture.

Issue
-----
Payment method doesn't support partial capture.

Additionally, you're not allowed to enable the Hipercard & Elo payment
method brands for the Card payment method.

Cause
-----
Commit 25feb5b added the `support_manual_capture` field to
`payment.method`. This field is only set to a non-default value for
primary payment methods, e.g. Card. For branded payment method, e.g.
VISA, it defaults to 'none'.

Solution
--------
Add a `_get_primary_method` to `payment.method` and
`payment.transaction`, retrieving the relevant primary payment method
to check support on.

On master: add a `primary_payment_method_id` computed field on
`payment.transaction`.

opw-4817961

closes odoo#217743

X-original-commit: c4823e8
Signed-off-by: Antoine Vandevenne (anv) <[email protected]>
Signed-off-by: Levi Siuzdak <[email protected]>

Author: lvsz

addons/payment/models/payment_method.py

@@ -180,9 +180,10 @@ def _onchange_provider_ids_warn_before_attaching_payment_method(self):
     @api.constrains('active', 'support_manual_capture')
     def _check_manual_capture_supported_by_providers(self):
         incompatible_pms = self.filtered(
-            lambda method: method.active and method.support_manual_capture == 'none' and any(
-                provider.capture_manually for provider in method.provider_ids
-            )
+            lambda pm:
+                pm.active
+                and (pm.primary_payment_method_id or pm).support_manual_capture == 'none'
+                and any(provider.capture_manually for provider in pm.provider_ids),
         )
         if incompatible_pms:
             raise ValidationError(_(

addons/payment/models/payment_transaction.py

@@ -43,6 +43,11 @@ def _lang_get(self):
     payment_method_code = fields.Char(
         string="Payment Method Code", related='payment_method_id.code'
     )
+    primary_payment_method_id = fields.Many2one(
+        string="Primary Payment Method",
+        comodel_name='payment.method',
+        compute='_compute_primary_payment_method_id',
+    )
     reference = fields.Char(
         string="Reference", help="The internal reference of the transaction", readonly=True,
         required=True)  # Already has an index from the UNIQUE SQL constraint.
@@ -128,6 +133,10 @@ def _lang_get(self):
 
     #=== COMPUTE METHODS ===#
 
+    def _compute_primary_payment_method_id(self):
+        for pm, txs in self.grouped('payment_method_id').items():
+            txs.primary_payment_method_id = pm.primary_payment_method_id or pm
+
     def _compute_refunds_count(self):
         rg_data = self.env['payment.transaction']._read_group(
             domain=[('source_transaction_id', 'in', self.ids), ('operation', '=', 'refund')],

addons/payment/tests/__init__.py

@@ -4,6 +4,7 @@
 from . import http_common
 from . import test_flows
 from . import test_multicompany_flows
+from . import test_payment_capture_wizard
 from . import test_payment_method
 from . import test_payment_provider
 from . import test_payment_token

addons/payment/tests/test_payment_capture_wizard.py

@@ -0,0 +1,57 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests import tagged
+
+from odoo.addons.payment.tests.common import PaymentCommon
+
+
+@tagged('post_install', '-at_install')
+class TestPaymentCaptureWizard(PaymentCommon):
+
+    def test_partial_capture_wizard(self):
+        self.provider.update({
+            'capture_manually': True,
+            'support_manual_capture': 'partial',
+        })
+        source_tx = self._create_transaction('direct', state='authorized')
+
+        wizard = self.env['payment.capture.wizard'].create({
+            'transaction_ids': source_tx.ids,
+        })
+        wizard.amount_to_capture = 511.11
+        wizard.action_capture()
+
+        child_tx_1 = source_tx.child_transaction_ids
+        self.assertEqual(child_tx_1.state, 'draft')
+        child_tx_1._set_done()
+
+        self.env['payment.capture.wizard'].create({
+            'transaction_ids': source_tx.ids,
+        }).action_capture()
+
+        child_tx_2 = (source_tx.child_transaction_ids - child_tx_1).ensure_one()
+        child_tx_2._set_done()
+        self.assertAlmostEqual(
+            sum(source_tx.child_transaction_ids.mapped('amount')),
+            source_tx.amount,
+        )
+        self.assertEqual(source_tx.state, 'done')
+
+    def test_support_partial_capture_computation_with_brands(self):
+        self.provider.update({
+            'capture_manually': True,
+            'support_manual_capture': 'partial',
+        })
+        dummy_brand = self.env['payment.method'].create({
+            'name': "Dummy Brand",
+            'code': 'dumbrand',
+            'primary_payment_method_id': self.payment_method.id,
+            'provider_ids': self.provider.ids,
+        })
+        source_tx = self._create_transaction(
+            'direct', state='authorized', payment_method_id=dummy_brand.id,
+        )
+        wizard = self.env['payment.capture.wizard'].create({
+            'transaction_ids': source_tx.ids,
+        })
+        self.assertTrue(wizard.support_partial_capture)

addons/payment/tests/test_payment_method.py

@@ -1,6 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 from odoo.fields import Command
 from odoo.tests import tagged
 
@@ -26,6 +26,23 @@ def test_payment_method_requires_provider_to_be_activated(self):
         with self.assertRaises(UserError):
             self.payment_methods.active = True
 
+    def test_brand_compatible_with_manual_capture(self):
+        """ Test that a "brand" can be enabled for providers which support manual capture. """
+        self.provider.update({
+            'capture_manually': True,
+            'support_manual_capture': 'partial',
+        })
+        self.payment_method.support_manual_capture = 'partial'
+        brand_payment_method = self.env['payment.method'].create({
+            'name': "Dummy Brand",
+            'code': 'dumbrand',
+            'primary_payment_method_id': self.payment_method.id,
+            'active': False,
+            'provider_ids': self.provider.ids,
+        })
+        self._assert_does_not_raise(ValidationError, brand_payment_method.action_unarchive)
+        self.assertTrue(brand_payment_method.active)
+
     def test_payment_method_compatible_when_provider_is_enabled(self):
         """ Test that a payment method is available when it is supported by an enabled provider. """
         compatible_payment_methods = self.env['payment.method']._get_compatible_payment_methods(

addons/payment/wizards/payment_capture_wizard.py

@@ -88,7 +88,7 @@ def _compute_support_partial_capture(self):
         for wizard in self:
             wizard.support_partial_capture = all(
                 tx.provider_id.support_manual_capture == 'partial'
-                and tx.payment_method_id.support_manual_capture == 'partial'
+                and tx.primary_payment_method_id.support_manual_capture == 'partial'
                 for tx in wizard.transaction_ids
             )