[IMP] payment_acquirer, paypal, ogone: improved back-end form viewsé

bzr revid: tde@openerp.com-20131118161102-4kw3xewd1czbyrdb
This commit is contained in:
Thibault Delavallée 2013-11-18 17:11:02 +01:00
parent 882f398666
commit b5d142e08a
8 changed files with 99 additions and 69 deletions

View File

@ -1,32 +1,13 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Payment Acquirer',
'category': 'Hidden',
'summary': 'Payment Acquirer Base Module',
'version': '0.1',
'version': '1.0',
'description': """Payment Acquirer Base Module""",
'author': 'OpenERP SA',
'depends': ['decimal_precision', 'mail'],
'depends': ['mail'],
'data': [
'views/payment_acquirer.xml',
'security/ir.model.access.csv',

View File

@ -32,7 +32,7 @@ class ValidationError(ValueError):
class PaymentAcquirer(osv.Model):
_name = 'payment.acquirer'
_description = 'Online Payment Acquirer'
_description = 'Payment Acquirer'
_columns = {
'name': fields.char('Name', required=True),
@ -133,6 +133,7 @@ class PaymentAcquirer(osv.Model):
class PaymentTransaction(osv.Model):
_name = 'payment.transaction'
_description = 'Payment Transaction'
_inherit = ['mail.thread']
_order = 'id desc'

View File

@ -8,10 +8,11 @@
parent='base.menu_administration'/>
<record id="acquirer_form" model="ir.ui.view">
<field name="name">acquirer.form</field>
<field name="model">payment.acquirer</field>
<field name="arch" type="xml">
<form string="Payment Acquirer" version="7.0">
<group>
<group name="acquirer_base">
<field name="name"/>
<field name="portal_published"/>
<field name="env"/>
@ -60,7 +61,7 @@
</field>
</record>
<record model="ir.actions.act_window" id="action_payment_acquirer">
<record id="action_payment_acquirer" model="ir.actions.act_window">
<field name="name">Payment Acquirers</field>
<field name="res_model">payment.acquirer</field>
<field name='view_type'>form</field>
@ -73,7 +74,7 @@
parent='root_payment_menu'
sequence='10' />
<record model="ir.ui.view" id="transaction_form">
<record id="transaction_form" model="ir.ui.view">
<field name="model">payment.transaction</field>
<field name="arch" type="xml">
<form string="Payment Transactions" version="7.0">
@ -96,6 +97,8 @@
<field name="state_message"/>
</group>
</group>
<notebook>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
@ -105,7 +108,7 @@
</field>
</record>
<record model="ir.ui.view" id="transaction_list">
<record id="transaction_list" model="ir.ui.view">
<field name="model">payment.transaction</field>
<field name="arch" type="xml">
<tree string="Payment Transactions">
@ -119,7 +122,7 @@
</field>
</record>
<record model="ir.ui.view" id="transaction">
<record id="transaction" model="ir.ui.view">
<field name="model">payment.transaction</field>
<field name="arch" type="xml">
<search>
@ -131,7 +134,7 @@
</field>
</record>
<record model="ir.actions.act_window" id="action_payment_transaction">
<record id="action_payment_transaction" model="ir.actions.act_window">
<field name="name">Payment Transactions</field>
<field name="res_model">payment.transaction</field>
<field name='view_type'>form</field>

View File

@ -1,34 +1,16 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Ogone Payment Acquirer',
'category': 'Hidden',
'summary': 'Payment Acquirer: Ogone Implementation',
'version': '0.1',
'version': '1.0',
'description': """Ogone Payment Acquirer""",
'author': 'OpenERP SA',
'depends': ['payment_acquirer'],
'data': [
'views/ogone.xml',
'views/payment_acquirer.xml',
'data/ogone.xml',
],
'installable': True,

View File

@ -161,7 +161,7 @@ class PaymentTxOgone(osv.Model):
'ogone_feedback_model': fields.char(),
'ogone_feedback_eval': fields.char(),
'ogone_complus': fields.char('Complus'),
'ogone_payid': fields.char()
'ogone_payid': fields.char('PayID', help='Payment ID, generated by Ogone')
}
# --------------------------------------------------

View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="acquirer_form_ogone" model="ir.ui.view">
<field name="name">acquirer.form.ogone</field>
<field name="model">payment.acquirer</field>
<field name="inherit_id" ref="payment_acquirer.acquirer_form"/>
<field name="arch" type="xml">
<xpath expr='//group[@name="acquirer_base"]' position='after'>
<group string="Ogone Details"
attrs="{'invisible': [('name', '!=', 'ogone')]}">
<field name="ogone_pspid"/>
<field name="ogone_userid"/>
<field name="ogone_password"/>
<field name="ogone_shakey_in"/>
<field name="ogone_shakey_out"/>
</group>
</xpath>
</field>
</record>
<record id="transaction_form_ogone" model="ir.ui.view">
<field name="name">acquirer.transaction.form.ogone</field>
<field name="model">payment.transaction</field>
<field name="inherit_id" ref="payment_acquirer.transaction_form"/>
<field name="arch" type="xml">
<xpath expr='//notebook' position='inside'>
<page string="Ogone TX Details">
<group>
<field name="ogone_payid"/>
<!-- <field name="ogone_3ds"/>
<field name="ogone_3ds_html"/> -->
</group>
</page>
</xpath>
</field>
</record>
</data>
</openerp>

View File

@ -1,34 +1,16 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Paypal Payment Acquirer',
'category': 'Hidden',
'summary': 'Payment Acquirer: Paypal Implementation',
'version': '0.1',
'version': '1.0',
'description': """Paypal Payment Acquirer""",
'author': 'OpenERP SA',
'depends': ['payment_acquirer'],
'data': [
'views/paypal.xml',
'views/payment_acquirer.xml',
'data/paypal.xml',
],
'installable': True,

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="acquirer_form_paypal" model="ir.ui.view">
<field name="name">acquirer.form.paypal</field>
<field name="model">payment.acquirer</field>
<field name="inherit_id" ref="payment_acquirer.acquirer_form"/>
<field name="arch" type="xml">
<xpath expr='//group[@name="acquirer_base"]' position='after'>
<group string="Paypal Details"
attrs="{'invisible': [('name', '!=', 'paypal')]}">
<field name="paypal_email_id"/>
<field name="paypal_username"/>
<field name="paypal_password"/>
<field name="paypal_signature"/>
<field name="paypal_use_ipn"/>
</group>
</xpath>
</field>
</record>
<record id="transaction_form_paypal" model="ir.ui.view">
<field name="name">acquirer.transaction.form.paypal</field>
<field name="model">payment.transaction</field>
<field name="inherit_id" ref="payment_acquirer.transaction_form"/>
<field name="arch" type="xml">
<xpath expr='//notebook' position='inside'>
<page string="Paypal TX Details">
<group>
<field name="paypal_txn_id"/>
<field name="paypal_txn_type"/>
</group>
</page>
</xpath>
</field>
</record>
</data>
</openerp>