From bc2c4fbb3f3c35d66e1cc4a1fc34cccc4437f125 Mon Sep 17 00:00:00 2001
From: "Valeriya(vchu)" <vchu@odoo.com>
Date: Thu, 22 Feb 2024 11:55:57 +0100
Subject: [PATCH] [FIX] payment(_demo,_custom): show 'Secured by' element

If payment_custom or payment_demo is installed 'Secured by' element is
overriden and becomes hidden for all payment providers.

We removed xpath as it is more convenient for the users to see which
provider is behind a payment method. After this commit 'Secured by'
element is shown for all providers except for custom.

closes odoo/odoo#155014

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment/views/payment_form_templates.xml       | 11 ++++++++---
 .../payment_custom/views/payment_custom_templates.xml | 10 ----------
 addons/payment_demo/views/payment_demo_templates.xml  | 10 ----------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/addons/payment/views/payment_form_templates.xml b/addons/payment/views/payment_form_templates.xml
index 1a1bef66829..5da119f290b 100644
--- a/addons/payment/views/payment_form_templates.xml
+++ b/addons/payment/views/payment_form_templates.xml
@@ -214,7 +214,8 @@
                 <!-- === Provider name (only for desktop and tablet) === -->
                 <div class="col d-none d-md-block">
                     <p name="o_payment_secured_by_desktop" t-att-class="'mb-0 small text-600'
-                                    + (' ms-4 ms-md-0' if allow_token_selection else '')"
+                                    + (' ms-4 ms-md-0' if allow_token_selection else '')
+                                    + (' d-none' if provider_sudo.code == 'custom' else '')"
                     >
                         <span><i class="fa fa-lock"/> Secured by</span>
                         <span t-out="dict(provider_sudo._fields['code']._description_selection(
@@ -240,7 +241,8 @@
         </div>
         <!-- === Provider name (only for mobile) === -->
         <p name="o_payment_secured_by_mobile"
-           class="align-self-end d-block d-md-none mb-0 small text-600"
+           t-att-class="'align-self-end d-block d-md-none mb-0 small text-600'
+                        + (' d-none' if provider_sudo.code == 'custom' else '')"
         >
             <span><i class="fa fa-lock"/> Secured by</span>
             <span t-out="dict(provider_sudo._fields['code']._description_selection(
@@ -350,7 +352,10 @@
                     </label>
                 </div>
                 <!-- === Provider name === -->
-                <p name="o_payment_secured_by" class="align-self-end mb-0 ms-auto small text-600">
+                <p name="o_payment_secured_by"
+                   t-att-class="'align-self-end mb-0 ms-auto small text-600'
+                    + (' d-none' if provider_sudo.code == 'custom' else '')"
+                >
                     <span><i class="fa fa-lock"/> Secured by</span>
                     <span t-out="dict(provider_sudo._fields['code']._description_selection(
                                      provider_sudo.env
diff --git a/addons/payment_custom/views/payment_custom_templates.xml b/addons/payment_custom/views/payment_custom_templates.xml
index 3cd980fbc17..774dff4b29f 100644
--- a/addons/payment_custom/views/payment_custom_templates.xml
+++ b/addons/payment_custom/views/payment_custom_templates.xml
@@ -2,19 +2,9 @@
 <odoo>
 
     <template id="payment_custom.token_form" inherit_id="payment.token_form">
-        <xpath expr="//p[@name='o_payment_secured_by_desktop']" position="attributes">
-            <attribute name="t-att-class"/>
-            <attribute name="class">d-none</attribute>
-        </xpath>
-        <xpath expr="//p[@name='o_payment_secured_by_mobile']" position="attributes">
-            <attribute name="class" separator=" " add="d-none"/>
-        </xpath>
     </template>
 
     <template id="payment_custom.payment_method_form" inherit_id="payment.method_form">
-        <xpath expr="//p[@name='o_payment_secured_by']" position="attributes">
-            <attribute name="class" separator=" " add="d-none"/>
-        </xpath>
     </template>
 
     <template id="redirect_form">
diff --git a/addons/payment_demo/views/payment_demo_templates.xml b/addons/payment_demo/views/payment_demo_templates.xml
index 3d48cc8e37a..96d89896d5f 100644
--- a/addons/payment_demo/views/payment_demo_templates.xml
+++ b/addons/payment_demo/views/payment_demo_templates.xml
@@ -2,19 +2,9 @@
 <odoo>
 
     <template id="payment_demo.token_form" inherit_id="payment.token_form">
-        <xpath expr="//p[@name='o_payment_secured_by_desktop']" position="attributes">
-            <attribute name="t-att-class"/>
-            <attribute name="class">d-none</attribute>
-        </xpath>
-        <xpath expr="//p[@name='o_payment_secured_by_mobile']" position="attributes">
-            <attribute name="class" separator=" " add="d-none"/>
-        </xpath>
     </template>
 
     <template id="payment_demo.payment_method_form" inherit_id="payment.method_form">
-        <xpath expr="//p[@name='o_payment_secured_by']" position="attributes">
-            <attribute name="class" separator=" " add="d-none"/>
-        </xpath>
     </template>
 
     <template id="inline_form">