From 12e4f9230d9cba6839a0664420652d4fb95335a7 Mon Sep 17 00:00:00 2001
From: Antoni Marroig Campomar <amarroig@apsl.net>
Date: Thu, 4 Apr 2024 13:09:03 +0200
Subject: [PATCH] [MIG] payment_redsys: Migration to 17.0

---
 payment_redsys/README.rst                    |  4 ++
 payment_redsys/__manifest__.py               |  2 +-
 payment_redsys/data/payment_redsys.xml       | 28 +++++++----
 payment_redsys/readme/CONTRIBUTORS.md        |  2 +
 payment_redsys/static/description/index.html |  4 ++
 payment_redsys/views/payment_provider.xml    | 51 +++++---------------
 6 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/payment_redsys/README.rst b/payment_redsys/README.rst
index 8f470a0db8a..288001c61d2 100644
--- a/payment_redsys/README.rst
+++ b/payment_redsys/README.rst
@@ -150,6 +150,10 @@ Contributors
 
    -  Pablo De Andrés <pablo.deandres@factorlibre.com>
 
+-  `APSL <https://apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
+
 Maintainers
 -----------
 
diff --git a/payment_redsys/__manifest__.py b/payment_redsys/__manifest__.py
index c101cef3b51..d9484c8e20f 100644
--- a/payment_redsys/__manifest__.py
+++ b/payment_redsys/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Pasarela de pago Redsys",
     "category": "Payment Acquirer",
     "summary": "Payment Acquirer: Redsys Implementation",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-spain",
     "depends": ["payment", "website_sale"],
diff --git a/payment_redsys/data/payment_redsys.xml b/payment_redsys/data/payment_redsys.xml
index 6d30230ff4a..dce7c6197bd 100644
--- a/payment_redsys/data/payment_redsys.xml
+++ b/payment_redsys/data/payment_redsys.xml
@@ -2,6 +2,18 @@
 <!-- Copyright 2016-2017 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3). -->
 <odoo noupdate="1">
+    <record id="payment_method_redsys" model="account.payment.method">
+        <field name="name">Redsys</field>
+        <field name="code">redsys</field>
+        <field name="payment_type">inbound</field>
+    </record>
+
+    <record id="payment_method_cc_bizum" model="payment.method">
+        <field name="name">Bizum</field>
+        <field name="code">Bizum</field>
+        <field name="image" type="base64" file="payment_redsys/static/img/bizum.png" />
+    </record>
+
     <record id="payment_provider_redsys" model="payment.provider">
         <field name="name">Redsys</field>
         <field
@@ -21,16 +33,12 @@
             name="pre_msg"
         ><![CDATA[
 <p>You will be redirected to the Redsys payment gateway after clicking on the payment button.</p>]]></field>
-    </record>
-    <record id="payment_icon_cc_bizum" model="payment.icon">
-        <field name="name">Bizum</field>
-        <field name="image" type="base64" file="payment_redsys/static/img/bizum.png" />
-    </record>
-
-    <record id="payment_method_redsys" model="account.payment.method">
-        <field name="name">Redsys</field>
-        <field name="code">redsys</field>
-        <field name="payment_type">inbound</field>
+        <field
+            name="payment_method_ids"
+            eval="[Command.set([
+                         ref('payment_redsys.payment_method_cc_bizum'),
+                     ])]"
+        />
     </record>
 
 </odoo>
diff --git a/payment_redsys/readme/CONTRIBUTORS.md b/payment_redsys/readme/CONTRIBUTORS.md
index 1a13e5e8c53..45a44eb3f3d 100644
--- a/payment_redsys/readme/CONTRIBUTORS.md
+++ b/payment_redsys/readme/CONTRIBUTORS.md
@@ -13,3 +13,5 @@
   - Rafa Ferri \<<rafa.ferri@studio73.es>\>
 - [Factor Libre](https://factorlibre.com/):
   - Pablo De Andrés \<<pablo.deandres@factorlibre.com>\>
+- [APSL](https://apsl.tech):
+  - Antoni Marroig \<<amarroig@apsl.net>\>
\ No newline at end of file
diff --git a/payment_redsys/static/description/index.html b/payment_redsys/static/description/index.html
index 570f8adeee9..0bcb5136ec6 100644
--- a/payment_redsys/static/description/index.html
+++ b/payment_redsys/static/description/index.html
@@ -496,6 +496,10 @@ <h2><a class="toc-backref" href="#toc-entry-9">Contributors</a></h2>
 <li>Pablo De Andrés &lt;<a class="reference external" href="mailto:pablo.deandres&#64;factorlibre.com">pablo.deandres&#64;factorlibre.com</a>&gt;</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://apsl.tech">APSL</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/payment_redsys/views/payment_provider.xml b/payment_redsys/views/payment_provider.xml
index 2ea680002a8..b1a6885261f 100644
--- a/payment_redsys/views/payment_provider.xml
+++ b/payment_redsys/views/payment_provider.xml
@@ -8,50 +8,23 @@
         <field name="inherit_id" ref="payment.payment_provider_form" />
         <field name="arch" type="xml">
             <xpath expr='//group[@name="provider_credentials"]' position='inside'>
-                <group attrs="{'invisible': [('code', '!=', 'redsys')]}">
-                    <field
-                        name="redsys_merchant_name"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_merchant_code"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_secret_key"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_terminal"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_currency"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_transaction_type"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_merchant_lang"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_pay_method"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
-                    <field
-                        name="redsys_merchant_data"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
-                    />
+                <group invisible="code  != 'redsys'">
+                    <field name="redsys_merchant_name" required="code == 'redsys'" />
+                    <field name="redsys_merchant_code" required="code == 'redsys'" />
+                    <field name="redsys_secret_key" required="code == 'redsys'" />
+                    <field name="redsys_terminal" required="code == 'redsys'" />
+                    <field name="redsys_currency" required="code == 'redsys'" />
+                    <field name="redsys_transaction_type" required="code == 'redsys'" />
+                    <field name="redsys_merchant_lang" required="code == 'redsys'" />
+                    <field name="redsys_pay_method" required="code == 'redsys'" />
+                    <field name="redsys_merchant_data" required="code == 'redsys'" />
                     <field
                         name="redsys_merchant_description"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
+                        required="code == 'redsys'"
                     />
                     <field
                         name="redsys_signature_version"
-                        attrs="{'required': [('code', '=', 'redsys')]}"
+                        required="code == 'redsys'"
                     />
                 </group>
             </xpath>