From 6adac428b43718dee37b859e66ec84f24436dafe Mon Sep 17 00:00:00 2001
From: Adrien Horgnies <aho@odoo.com>
Date: Mon, 12 Oct 2020 15:43:22 +0000
Subject: [PATCH] [FIX] payment_stripe: hide disabled local payment methods

If a merchants didn't enable a local Payment Method Type (PMT) on Stripe
 side (such as bancontact), his customers eligible for it (ex.: Belgian
 and paying in EUR) won't be able to pay using it.

This commit fixes this issue by adding a condition on the payment icons
 assigned to Stripe: if the payment icon related to a given payment
 method is not listed as a supported payment icon, the related payment
 method is not offered to customers, unless the payment icon does not
 exist at all.

User can enable PMTs through (Payment Acquirers > Stripe
 > Configuration > Supported Payment Icons). This concerns: ideal,
 bancontact, eps, giropay and p24.

 This solution is not entirely satisfactory but it isn't possible to
  fetch enabled PMT from Stripe.

opw-2335482

closes odoo/odoo#60740

X-original-commit: 1d0f23599bbd425c81131a5f6c1c22531ffcd0ee
Signed-off-by: Antoine Vandevenne (anv) <AntoineVDV@users.noreply.github.com>
---
 addons/payment/data/payment_icon_data.xml  |  15 +++++
 addons/payment/static/img/eps.png          | Bin 0 -> 5935 bytes
 addons/payment/static/img/giropay.png      | Bin 0 -> 10372 bytes
 addons/payment/static/img/p24.png          | Bin 0 -> 5620 bytes
 addons/payment_stripe/models/payment.py    |   9 ++-
 addons/payment_stripe/tests/test_stripe.py |  68 ++++++++++++++++++++-
 6 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 addons/payment/static/img/eps.png
 create mode 100644 addons/payment/static/img/giropay.png
 create mode 100644 addons/payment/static/img/p24.png

diff --git a/addons/payment/data/payment_icon_data.xml b/addons/payment/data/payment_icon_data.xml
index 44780e8b493..19df0c52c54 100644
--- a/addons/payment/data/payment_icon_data.xml
+++ b/addons/payment/data/payment_icon_data.xml
@@ -50,6 +50,21 @@
         <field name="image" type="base64" file="payment/static/img/bancontact.png"/>
     </record>
 
+    <record id="payment_icon_cc_eps" model="payment.icon">
+        <field name="name">EPS</field>
+        <field name="image" type="base64" file="payment/static/img/eps.png"/>
+    </record>
+
+    <record id="payment_icon_cc_giropay" model="payment.icon">
+        <field name="name">Giropay</field>
+        <field name="image" type="base64" file="payment/static/img/giropay.png"/>
+    </record>
+
+    <record id="payment_icon_cc_p24" model="payment.icon">
+        <field name="name">P24</field>
+        <field name="image" type="base64" file="payment/static/img/p24.png"/>
+    </record>
+
     <record id="payment_icon_cc_codensa_easy_credit" model="payment.icon">
         <field name="name">Codensa Easy Credit</field>
         <field name="image" type="base64" file="payment/static/img/codensa_easy_credit.png"/>
diff --git a/addons/payment/static/img/eps.png b/addons/payment/static/img/eps.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ca13055395c7edcfce338f4697b9b60992177b
GIT binary patch
literal 5935
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

literal 0
HcmV?d00001

diff --git a/addons/payment/static/img/giropay.png b/addons/payment/static/img/giropay.png
new file mode 100644
index 0000000000000000000000000000000000000000..8869385fabb3734d18065b5f9b6beeb4dd3d1449
GIT binary patch
literal 10372
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

literal 0
HcmV?d00001

diff --git a/addons/payment/static/img/p24.png b/addons/payment/static/img/p24.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ed3f7bfdfe1a2a1266c915405d4448e4dbef971
GIT binary patch
literal 5620
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

literal 0
HcmV?d00001

diff --git a/addons/payment_stripe/models/payment.py b/addons/payment_stripe/models/payment.py
index 7e6a685c868..79123a769ff 100644
--- a/addons/payment_stripe/models/payment.py
+++ b/addons/payment_stripe/models/payment.py
@@ -88,8 +88,15 @@ class PaymentAcquirerStripe(models.Model):
             PMT('p24', ['pl'], ['eur', 'pln'], 'punctual'),
         ]
 
+        existing_icons = [icon.name.lower() for icon in self.env['payment.icon'].search([])]
+        linked_icons = [icon.name.lower() for icon in self.payment_icon_ids]
+
+        # We don't filter out pmt in the case the icon doesn't exist at all as it would be **implicit** exclusion
+        icon_filtered = filter(lambda pmt: pmt.name == 'card' or
+                                           pmt.name in linked_icons or
+                                           pmt.name not in existing_icons, all_payment_method_types)
         country = (tx_values['billing_partner_country'].code or 'no_country').lower()
-        pmt_country_filtered = filter(lambda pmt: not pmt.countries or country in pmt.countries, all_payment_method_types)
+        pmt_country_filtered = filter(lambda pmt: not pmt.countries or country in pmt.countries, icon_filtered)
         currency = (tx_values.get('currency').name or 'no_currency').lower()
         pmt_currency_filtered = filter(lambda pmt: not pmt.currencies or currency in pmt.currencies, pmt_country_filtered)
         pmt_recurrence_filtered = filter(lambda pmt: tx_values.get('type') != 'form_save' or pmt.recurrence == 'recurring',
diff --git a/addons/payment_stripe/tests/test_stripe.py b/addons/payment_stripe/tests/test_stripe.py
index 4102fd48319..2ac2819398d 100644
--- a/addons/payment_stripe/tests/test_stripe.py
+++ b/addons/payment_stripe/tests/test_stripe.py
@@ -29,6 +29,13 @@ class StripeCommon(PaymentAcquirerCommon):
             'partner_id': cls.buyer.id,
             'verified': True,
         })
+        cls.ideal_icon = cls.env.ref("payment.payment_icon_cc_ideal")
+        cls.bancontact_icon = cls.env.ref("payment.payment_icon_cc_bancontact")
+        cls.p24_icon = cls.env.ref("payment.payment_icon_cc_p24")
+        cls.eps_icon = cls.env.ref("payment.payment_icon_cc_eps")
+        cls.giropay_icon = cls.env.ref("payment.payment_icon_cc_giropay")
+        cls.all_icons = [cls.ideal_icon, cls.bancontact_icon, cls.p24_icon, cls.eps_icon, cls.giropay_icon]
+        cls.stripe.write({'payment_icon_ids': [(5, 0, 0)]})
 
 
 @odoo.tests.tagged('post_install', '-at_install', '-standard', 'external')
@@ -87,7 +94,8 @@ class StripeTest(StripeCommon):
         self.assertEqual(tx.state, 'done', 'Stripe: validation did not put tx into done state')
         self.assertEqual(tx.acquirer_reference, stripe_post_data.get('id'), 'Stripe: validation did not update tx id')
 
-    def test_add_available_payment_method_types(self):
+    def test_add_available_payment_method_types_local_enabled(self):
+        self.stripe.payment_icon_ids = [(6, 0, [i.id for i in self.all_icons])]
         tx_values = {
             'billing_partner_country': self.env.ref('base.be'),
             'currency': self.env.ref('base.EUR'),
@@ -100,6 +108,61 @@ class StripeTest(StripeCommon):
         actual = {pmt for key, pmt in stripe_session_data.items() if key.startswith('payment_method_types')}
         self.assertEqual({'card', 'bancontact'}, actual)
 
+    def test_add_available_payment_method_types_local_enabled_2(self):
+        self.stripe.payment_icon_ids = [(6, 0, [i.id for i in self.all_icons])]
+        tx_values = {
+            'billing_partner_country': self.env.ref('base.pl'),
+            'currency': self.env.ref('base.PLN'),
+            'type': 'form'
+        }
+        stripe_session_data = {}
+
+        self.stripe._add_available_payment_method_types(stripe_session_data, tx_values)
+
+        actual = {pmt for key, pmt in stripe_session_data.items() if key.startswith('payment_method_types')}
+        self.assertEqual({'card', 'p24'}, actual)
+
+    def test_add_available_payment_method_types_pmt_does_not_exist(self):
+        self.bancontact_icon.unlink()
+        tx_values = {
+            'billing_partner_country': self.env.ref('base.be'),
+            'currency': self.env.ref('base.EUR'),
+            'type': 'form'
+        }
+        stripe_session_data = {}
+
+        self.stripe._add_available_payment_method_types(stripe_session_data, tx_values)
+
+        actual = {pmt for key, pmt in stripe_session_data.items() if key.startswith('payment_method_types')}
+        self.assertEqual({'card', 'bancontact'}, actual)
+
+    def test_add_available_payment_method_types_local_disabled(self):
+        tx_values = {
+            'billing_partner_country': self.env.ref('base.be'),
+            'currency': self.env.ref('base.EUR'),
+            'type': 'form'
+        }
+        stripe_session_data = {}
+
+        self.stripe._add_available_payment_method_types(stripe_session_data, tx_values)
+
+        actual = {pmt for key, pmt in stripe_session_data.items() if key.startswith('payment_method_types')}
+        self.assertEqual({'card'}, actual)
+
+    def test_add_available_payment_method_types_local_all_but_bancontact(self):
+        self.stripe.payment_icon_ids = [(4, icon.id) for icon in self.all_icons if icon.name.lower() != 'bancontact']
+        tx_values = {
+            'billing_partner_country': self.env.ref('base.be'),
+            'currency': self.env.ref('base.EUR'),
+            'type': 'form'
+        }
+        stripe_session_data = {}
+
+        self.stripe._add_available_payment_method_types(stripe_session_data, tx_values)
+
+        actual = {pmt for key, pmt in stripe_session_data.items() if key.startswith('payment_method_types')}
+        self.assertEqual({'card'}, actual)
+
     def test_add_available_payment_method_types_recurrent(self):
         tx_values = {
             'billing_partner_country': self.env.ref('base.be'),
@@ -114,8 +177,7 @@ class StripeTest(StripeCommon):
         self.assertEqual({'card'}, actual)
 
     def test_discarded_webhook(self):
-        with self.assertRaises(ValidationError):
-            self.env['payment.acquirer']._handle_stripe_webhook(dict(type='payment.intent.succeeded'))
+        self.assertFalse(self.env['payment.acquirer']._handle_stripe_webhook(dict(type='payment.intent.succeeded')))
 
     def test_handle_checkout_webhook_no_secret(self):
         self.stripe.stripe_webhook_secret = None