pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] payment_acquirer_paypal: misc improvements

Browse Source 
- paypal_email_id -> paypal_email_Account, to avoid confusion with a m2o field
- paypal_seller_id -> paypal_seller_account, to avoid confusion with a m2o field
- api-related fields now hidden, because WIP for saas-4

bzr revid: tde@openerp.com-20140123100509-z8wgrj8fswk4wjq2
This commit is contained in:
Thibault Delavallée
2014-01-23 11:05:09 +01:00
parent bd586d8848
commit 4ae6b9010f
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/payment_paypal/data/paypal.xml
+2 -2
View File
@@ -8,8 +8,8 @@
<field name="env">test</field>
<field name="message"><![CDATA[
<p>You will be redirected to the Paypal website after cliking on the payment button.</p>]]></field>
<field name="paypal_email_id">dummy</field>
<field name="paypal_seller_id">dummy</field>
<field name="paypal_email_account">dummy</field>
<field name="paypal_seller_account">dummy</field>
<field name="paypal_api_username">dummy</field>
<field name="paypal_api_password">dummy</field>
</record>
addons/payment_paypal/models/paypal.py
+7 -7
View File
@@ -35,8 +35,8 @@ class AcquirerPaypal(osv.Model):
}
_columns = {
'paypal_email_id': fields.char('Email ID', required_if_provider='paypal'),
'paypal_seller_id': fields.char('Seller ID', required_if_provider='paypal'),
'paypal_email_account': fields.char('Paypal Email ID', required_if_provider='paypal'),
'paypal_seller_account': fields.char('Paypal Seller ID', required_if_provider='paypal'),
'paypal_use_ipn': fields.boolean('Use IPN'),
# Server 2 server
'paypal_api_enabled': fields.boolean('Use Rest API'),
@@ -82,7 +82,7 @@ class AcquirerPaypal(osv.Model):
paypal_tx_values = dict(tx_values)
paypal_tx_values.update({
'cmd': '_xclick',
'business': acquirer.paypal_email_id,
'business': acquirer.paypal_email_account,
'item_name': tx_values['reference'],
'item_number': tx_values['reference'],
'amount': tx_values['amount'],
@@ -193,10 +193,10 @@ class TxPaypal(osv.Model):
if tx.partner_reference and data.get('payer_id') != tx.partner_reference:
invalid_parameters.append(('payer_id', data.get('payer_id'), tx.partner_reference))
# check seller
if data.get('receiver_email') != tx.acquirer_id.paypal_email_id:
invalid_parameters.append(('receiver_email', data.get('receiver_email'), tx.acquirer_id.paypal_email_id))
if data.get('receiver_id') != tx.acquirer_id.paypal_seller_id:
invalid_parameters.append(('receiver_id', data.get('receiver_id'), tx.acquirer_id.paypal_seller_id))
if data.get('receiver_email') != tx.acquirer_id.paypal_email_account:
invalid_parameters.append(('receiver_email', data.get('receiver_email'), tx.acquirer_id.paypal_email_account))
if data.get('receiver_id') != tx.acquirer_id.paypal_seller_account:
invalid_parameters.append(('receiver_id', data.get('receiver_id'), tx.acquirer_id.paypal_seller_account))
return invalid_parameters
addons/payment_paypal/views/payment_acquirer.xml
+6 -5
View File
@@ -11,14 +11,15 @@
<group attrs="{'invisible': [('name', '!=', 'paypal')]}">
<group>
<group>
<field name="paypal_email_id"/>
<field name="paypal_seller_id"/>
<field name="paypal_email_account"/>
<field name="paypal_seller_account"/>
<field name="paypal_use_ipn"/>
<field name="paypal_api_enabled"/>
<field name="paypal_api_enabled"
invisible="1"/> <!-- WIP in saas-3 -->
<field name="paypal_api_username"
attrs="{'invisible': [('paypal_api_enabled', '=', False)]}"/>
invisible="1"/> <!-- WIP in saas-3 -->
<field name="paypal_api_password"
attrs="{'invisible': [('paypal_api_enabled', '=', False)]}"/>
invisible="1"/> <!-- WIP in saas-3 -->
</group>
</group>
</group>
addons/payment_paypal/views/paypal.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<data noupdate="0">
<template id="paypal_acquirer_button">
<form t-if="acquirer.paypal_email_id" t-att-action="tx_url" method="post" target="_self">
<form t-if="acquirer.paypal_email_account" t-att-action="tx_url" method="post" target="_self">
<input type="hidden" name="cmd" t-att-value="tx_values['cmd']"/>
<input type="hidden" name="business" t-att-value="tx_values['business']"/>
<input type="hidden" name="item_name" t-att-value="tx_values['item_name']"/>