[CLN] payment(_*): clean view hooks and split files per model

When the payment views were updated with commit odoo/odoo@f7b8f075, a
hook was improperly renamed to `code`, which doesn't help to figure out
its purpose. This commit renames it to `provider_credentials` which
better fits its role.

While doing so, the view files are also renamed and/or split by model to
increase their readability.

closes odoo/odoo#102976

X-original-commit: 49d126d4fce18761d0261adac00e115b840b9b47
Related: odoo/enterprise#32662
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
This commit is contained in:
Antoine Vandevenne (anv)
2022-10-11 13:16:07 +02:00
parent e4ff2afaec
commit c4b78c203a
37 changed files with 91 additions and 68 deletions
@@ -70,8 +70,8 @@
</group>
</group>
<notebook attrs="{'invisible': ['&amp;', ('module_id', '!=', False), ('module_state', '!=', 'installed')]}">
<page string="Credentials" name="provider_credentials" attrs="{'invisible': ['|', ('code', '=', 'none'), ('show_credentials_page', '=', False)]}">
<group name="code"/>
<page string="Credentials" name="credentials" attrs="{'invisible': ['|', ('code', '=', 'none'), ('show_credentials_page', '=', False)]}">
<group name="provider_credentials"/>
</page>
<page string="Configuration" name="configuration">
<group name="provider_config">
+2 -1
View File
@@ -10,8 +10,9 @@
'depends': ['payment'],
'data': [
'views/payment_adyen_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'views/payment_templates.xml', # Only load the SDK on pages with a payment form.
'data/payment_provider_data.xml', # Depends on views/payment_adyen_templates.xml
],
'application': True,
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'adyen')]}">
<field name="adyen_merchant_account" attrs="{'required':[('code', '=', 'adyen'), ('state', '!=', 'disabled')]}"/>
<field name="adyen_api_key" attrs="{'required':[('code', '=', 'adyen'), ('state', '!=', 'disabled')]}" password="True"/>
+2 -1
View File
@@ -9,7 +9,8 @@
'depends': ['payment'],
'data': [
'views/payment_alipay_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': False,
@@ -14,7 +14,7 @@
Consider disabling it and moving to <strong>Asiapay</strong>.
</div>
</xpath>
<group name="code" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'alipay')]}">
<field name="alipay_payment_method" widget="radio"/>
<field name="alipay_seller_email"
+1 -1
View File
@@ -9,7 +9,7 @@
'depends': ['payment'],
'data': [
'views/payment_aps_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'aps')]}">
<field name="aps_merchant_identifier"
string="Merchant Identifier"
+1 -1
View File
@@ -9,8 +9,8 @@
"many different payment methods.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_asiapay_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'asiapay')]}">
<field name="asiapay_merchant_id"
string="Merchant ID"
+3 -1
View File
@@ -9,8 +9,10 @@
'description': """Authorize.Net Payment Provider""",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_authorize_templates.xml',
'views/payment_provider_views.xml',
'views/payment_token_views.xml',
'data/payment_provider_data.xml',
],
'application': True,
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'authorize')]}">
<field name="authorize_login" attrs="{'required':[('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
<field name="authorize_transaction_key" password="True" attrs="{'required':[ ('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
@@ -27,7 +27,7 @@
<field name="authorize_payment_method_type"
attrs="{'invisible': [('code', '!=', 'authorize')], 'required':[('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
</field>
<xpath expr="//field[@name='available_country_ids']" position="after">
<field name="available_country_ids" position="after">
<label for="authorize_currency_id" string="Currency" attrs="{'invisible': [('code', '!=', 'authorize')]}"/>
<div attrs="{'invisible': [('code', '!=', 'authorize')]}">
<field name="authorize_currency_id"/>
@@ -35,20 +35,7 @@
name="action_update_merchant_details"
string="Set Account Currency"/>
</div>
</xpath>
</field>
</record>
<record id="payment_token_form" model="ir.ui.view">
<field name='name'>Authorize.Net Token Form</field>
<field name='model'>payment.token</field>
<field name="inherit_id" ref="payment.payment_token_form"/>
<field name="arch" type="xml">
<xpath expr='//field[@name="provider_ref"]' position='after'>
<field name="provider_code" invisible="1"/>
<field name="authorize_profile" attrs="{'invisible':[('provider_code', '!=', 'authorize')]}"/>
<field name="authorize_payment_method_type" attrs="{'invisible': [('provider_code', '!=', 'authorize')]}"/>
</xpath>
</field>
</field>
</record>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="payment_token_form" model="ir.ui.view">
<field name="name">Authorize.Net Token Form</field>
<field name="model">payment.token</field>
<field name="inherit_id" ref="payment.payment_token_form"/>
<field name="arch" type="xml">
<field name="provider_ref" position="after">
<field name="provider_code" invisible="1"/>
<field name="authorize_profile" attrs="{'invisible':[('provider_code', '!=', 'authorize')]}"/>
<field name="authorize_payment_method_type" attrs="{'invisible': [('provider_code', '!=', 'authorize')]}"/>
</field>
</field>
</record>
</odoo>
+2 -1
View File
@@ -9,8 +9,9 @@
'description': """Buckaroo Payment Provider""",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_buckaroo_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': True,
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'buckaroo')]}">
<field name="buckaroo_website_key" attrs="{'required':[ ('code', '=', 'buckaroo'), ('state', '!=', 'disabled')]}"/>
<field name="buckaroo_secret_key" string="Secret Key" attrs="{'required':[ ('code', '=', 'buckaroo'), ('state', '!=', 'disabled')]}" password="True"/>
+2 -1
View File
@@ -8,7 +8,8 @@
'depends': ['payment'],
'data': [
'views/payment_custom_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'assets': {
+1 -1
View File
@@ -9,8 +9,8 @@
"methods.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_flutterwave_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='code']" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'flutterwave')]}"
name="flutterwave_credentials">
<field name="flutterwave_public_key"
@@ -21,7 +21,7 @@
attrs="{'required':[('code', '=', 'flutterwave'), ('state', '!=', 'disabled')]}"
password="True"/>
</group>
</xpath>
</group>
</field>
</record>
+1 -1
View File
@@ -10,7 +10,7 @@
'depends': ['payment'],
'data': [
'views/payment_mercado_pago_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml', # Depends on views/payment_mercado_pago_templates.xml
],
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'mercado_pago')]}">
<field name="mercado_pago_access_token"
string="Access Token"
+2 -1
View File
@@ -13,7 +13,8 @@
'depends': ['payment'],
'data': [
'views/payment_mollie_templates.xml',
'views/payment_views.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': True,
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="payment_provider_form" model="ir.ui.view">
<field name="name">Mollie Provider Form</field>
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'mollie')]}">
<field name="mollie_api_key" string="API Key" attrs="{'required': [('code', '=', 'mollie'), ('state', '!=', 'disabled')]}" password="True"/>
</group>
+2 -1
View File
@@ -8,8 +8,9 @@
'summary': "This module is deprecated.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_ogone_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': False,
@@ -14,7 +14,7 @@
Consider disabling it and moving to <strong>Stripe</strong>.
</div>
</xpath>
<group name="code" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'ogone')]}">
<field name="ogone_pspid" attrs="{'required':[('code', '=', 'ogone'), ('state', '!=', 'disabled')]}"/>
<field name="ogone_userid" attrs="{'required':[('code', '=', 'ogone'), ('state', '!=', 'disabled')]}"/>
+3 -1
View File
@@ -9,8 +9,10 @@
'description': """Paypal Payment Provider""",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_paypal_templates.xml',
'views/payment_provider_views.xml',
'views/payment_transaction_views.xml',
'data/payment_provider_data.xml',
'data/payment_paypal_email_data.xml',
],
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'paypal')]}">
<field name="paypal_email_account"
attrs="{'required':[('code', '=', 'paypal'), ('state', '!=', 'disabled')]}"/>
@@ -27,18 +27,4 @@
</field>
</record>
<record id="payment_transaction_form" model="ir.ui.view">
<field name="name">PayPal Transaction Form</field>
<field name="model">payment.transaction</field>
<field name="inherit_id" ref="payment.payment_transaction_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='provider_reference']" position="after">
<field name="paypal_type"
readonly="1"
attrs="{'invisible': [('provider_code', '!=', 'paypal')]}"
groups="base.group_no_one"/>
</xpath>
</field>
</record>
</odoo>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="payment_transaction_form" model="ir.ui.view">
<field name="name">PayPal Transaction Form</field>
<field name="model">payment.transaction</field>
<field name="inherit_id" ref="payment.payment_transaction_form"/>
<field name="arch" type="xml">
<field name="provider_reference" position="after">
<field name="paypal_type"
readonly="1"
attrs="{'invisible': [('provider_code', '!=', 'paypal')]}"
groups="base.group_no_one"/>
</field>
</field>
</record>
</odoo>
+2 -1
View File
@@ -8,8 +8,9 @@
'summary': "This module is deprecated.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_payulatam_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': False,
@@ -14,7 +14,7 @@
Consider disabling it and moving to <strong>Mercado Pago</strong>.
</div>
</xpath>
<group name="code" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'payulatam')]}">
<field name="payulatam_merchant_id"
attrs="{'required':[('code', '=', 'payulatam'), ('state', '!=', 'disabled')]}"/>
+2 -1
View File
@@ -8,8 +8,9 @@
'summary': "This module is deprecated.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_payumoney_templates.xml',
'views/payment_provider_views.xml',
'data/payment_provider_data.xml',
],
'application': False,
@@ -14,7 +14,7 @@
Consider disabling it and moving to <strong>Razorpay</strong>.
</div>
</xpath>
<group name="code" position="inside">
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'payumoney')]}">
<field name="payumoney_merchant_key" attrs="{'required':[ ('code', '=', 'payumoney'), ('state', '!=', 'disabled')]}"/>
<field name="payumoney_merchant_salt" attrs="{'required':[ ('code', '=', 'payumoney'), ('state', '!=', 'disabled')]}" password="True"/>
+1 -1
View File
@@ -8,7 +8,7 @@
'summary': "A Indian online payment provider covering 100+ payment methods.",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_provider_views.xml',
'views/payment_razorpay_templates.xml',
'data/payment_provider_data.xml', # Depends on views/payment_razorpay_templates.xml
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group name="razorpay_credentials"
attrs="{'invisible': [('code', '!=', 'razorpay')]}">
<field name="razorpay_key_id"
+2 -1
View File
@@ -14,8 +14,9 @@ Other SIPS providers may be compatible, though this is
not guaranteed.""",
'depends': ['payment'],
'data': [
'views/payment_views.xml',
'views/payment_provider_views.xml',
'views/payment_sips_templates.xml',
'data/payment_provider_data.xml',
],
'application': True,
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<group name="code" position='inside'>
<group name="provider_credentials" position='inside'>
<group attrs="{'invisible': [('code', '!=', 'sips')]}">
<field name="sips_merchant_id" attrs="{'required':[ ('code', '=', 'sips'), ('state', '!=', 'disabled')]}"/>
<field name="sips_secret" string="Secret Key" attrs="{'required':[ ('code', '=', 'sips'), ('state', '!=', 'disabled')]}" password="True"/>
+2 -1
View File
@@ -9,9 +9,10 @@
'description': """Stripe Payment Provider""",
'depends': ['payment'],
'data': [
'views/payment_provider_views.xml',
'views/payment_stripe_templates.xml',
'views/payment_templates.xml', # Only load the SDK on pages with a payment form.
'views/payment_views.xml',
'data/payment_provider_data.xml', # Depends on views/payment_stripe_templates.xml
],
'application': True,
@@ -6,7 +6,7 @@
<field name="model">payment.provider</field>
<field name="inherit_id" ref="payment.payment_provider_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='code']" position="before">
<group name="provider_credentials" position="before">
<div invisible="context.get('stripe_onboarding', False)"
name="stripe_onboarding_group"
attrs="{'invisible': ['|', '|', ('code', '!=', 'stripe'), ('stripe_secret_key', '!=', False), ('stripe_publishable_key', '!=', False)]}">
@@ -17,8 +17,8 @@
colspan="2"
attrs="{'invisible': [('state', '=', 'enabled')]}"/>
</div>
</xpath>
<xpath expr="//group[@name='code']" position="inside">
</group>
<group name="provider_credentials" position="inside">
<group attrs="{'invisible': [('code', '!=', 'stripe')]}" name="stripe_credentials">
<field name="stripe_publishable_key" attrs="{'required':[('code', '=', 'stripe'), ('state', '!=', 'disabled')]}"/>
<field name="stripe_secret_key" attrs="{'required':[('code', '=', 'stripe'), ('state', '!=', 'disabled')]}" password="True"/>
@@ -39,7 +39,7 @@
Get your Secret and Publishable keys
</a>
</div>
</xpath>
</group>
<field name="allow_express_checkout" position="replace">
<label for="allow_express_checkout" attrs="{'invisible': ['|', ('support_express_checkout', '=', False), ('show_allow_express_checkout', '=', False)]}"/>
<div class="o_row" col="2" attrs="{'invisible': ['|', ('support_express_checkout', '=', False), ('show_allow_express_checkout', '=', False)]}">