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

[IMP] payment: improve labelling and description of various acquirers

Browse Source 
Be less ecommerce centric and try to explain a bit better the various
payment options. Purpose is to ease user understanding.
This commit is contained in:
Jitendra Prajapati
2017-05-17 13:14:54 +02:00
committed by Thibault Delavallée
parent 6ea3b8de38
commit 327be89d0b
2 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/payment/data/payment_acquirer_data.xml
+28 -25
View File
@@ -27,8 +27,9 @@
<p>
A payment gateway to accept online payments via credit cards.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
<ul class="list-inline">
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
</record>
@@ -43,9 +44,10 @@
Ingenico Payment Services (formerly Ogone) supports credit cards, debit cards and bank transfers.
</p>
<ul class="list-inline">
<li><i class="fa fa-check"/>eCommerce</li>
<li><i class="fa fa-check"/>Cards storage</li>
<li><i class="fa fa-check"/>Pay button in emails</li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
<li><i class="fa fa-check"/>Subscriptions</li>
<li><i class="fa fa-check"/>Save Cards</li>
</ul>
</field>
</record>
@@ -59,8 +61,9 @@
<p>
A payment gateway to accept online payments via credit cards, debit cards and bank transfers.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
<ul class="list-inline">
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
</record>
@@ -75,9 +78,11 @@
A payment gateway to accept online payments via credit cards and e-checks.
</p>
<ul class="list-inline">
<li><i class="fa fa-check"/>eCommerce</li>
<li><i class="fa fa-check"/>Cards storage</li>
<li><i class="fa fa-check"/>Authorize &amp; Capture</li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
<li><i class="fa fa-check"/>Subscriptions</li>
<li><i class="fa fa-check"/>Save Cards</li>
<li><i class="fa fa-check"/>Manual Capture</li>
</ul>
</field>
</record>
@@ -92,9 +97,6 @@
<p>
Provide instructions to customers so that they can pay their orders manually.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
</ul>
</field>
</record>
@@ -107,8 +109,9 @@
<p>
A payment gateway from Atos Worldline to accept online payments via credit cards.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
<ul class="list-inline">
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
</record>
@@ -123,8 +126,8 @@
PayPal is the easiest way to accept payments via Paypal or credit cards.
</p>
<ul class="list-inline">
<li><i class="fa fa-check"/>eCommerce</li>
<li><i class="fa fa-check"/>Pay button in emails</li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
</record>
@@ -138,8 +141,9 @@
<p>
A payment gateway to accept online payments via credit cards.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
<ul class="list-inline">
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
@@ -153,10 +157,10 @@
<field name="module_id" ref="base.module_payment_transfer"/>
<field name="description" type="html">
<p>
A generic acquirer payment acquirer.
A generic payment method to send payment instructions to any payment acquirer.
</p>
<ul>
<li><i class="fa fa-check"/>eCommerce</li>
<ul class="list-inline">
<li><i class="fa fa-check"/>Online Payment</li>
</ul>
</field>
</record>
@@ -171,9 +175,8 @@
PayU India is an online payments solutions company serving the Indian market.
</p>
<ul class="list-inline">
<li><i class="fa fa-check"/>eCommerce</li>
<li><i class="fa fa-check"/>Subscription</li>
<li><i class="fa fa-check"/>Pay button in emails</li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
</record>
addons/payment/models/payment_acquirer.py
+11 -12
View File
@@ -73,9 +73,9 @@ class PaymentAcquirer(models.Model):
help="Make this payment acquirer available (Customer invoices, etc.)")
auto_confirm = fields.Selection([
('none', 'No automatic confirmation'),
('authorize', 'Authorize the amount and confirm the SO on acquirer confirmation (capture manually)'),
('confirm_so', 'Authorize & capture the amount and confirm the SO on acquirer confirmation'),
('generate_and_pay_invoice', 'Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation')],
('authorize', 'Authorize the amount and confirm the order on acquirer confirmation (capture manually)'),
('confirm_so', 'Authorize & capture the amount and confirm the order on acquirer confirmation'),
('generate_and_pay_invoice', 'Authorize & capture the amount, confirm the order and auto-validate the invoice on acquirer confirmation')],
string='Order Confirmation', default='confirm_so', required=True)
journal_id = fields.Many2one(
'account.journal', 'Payment Journal',
@@ -109,13 +109,12 @@ class PaymentAcquirer(models.Model):
help='Message displayed, if error is occur during the payment process.')
save_token = fields.Selection([
('none', 'Never'),
('ask', 'Let the customer decide'),
('always', 'Always')],
string='Store Card Data', default='none',
help="Determine if card data is saved as a token automatically or not. "
"Payment tokens allow your customer to reuse their cards in the e-commerce "
"or allow you to charge an invoice directly on a credit card. If set to "
"'let the customer decide', ecommerce customers will have a checkbox displayed on the payment page.")
('ask', 'Let the customer decide (recommended for eCommerce)'),
('always', 'Always (recommended for Subscriptions)')],
string='Save Cards', default='none',
help="This option allows customers to save their credit card as a payment token and to reuse it for a later purchase."
"If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you "
"issue an invoice.")
token_implemented = fields.Boolean('Saving Card Data supported', compute='_compute_feature_support')
fees_implemented = fields.Boolean('Fees Computation Supported', compute='_compute_feature_support')
@@ -163,7 +162,7 @@ class PaymentAcquirer(models.Model):
def _check_authorization_support(self):
for acquirer in self:
if acquirer.auto_confirm == 'authorize' and acquirer.provider not in self._get_feature_support()['authorize']:
raise ValidationError('Transaction Authorization is not supported by this payment provider.')
raise ValidationError('You cannot capture payments manually with this payment method. Please choose another Order Confirmation mode (in Configuration tab).')
return True
_constraints = [
@@ -433,7 +432,7 @@ class PaymentTransaction(models.Model):
required=True, help='Internal reference of the TX')
acquirer_reference = fields.Char('Acquirer Reference', help='Reference of the TX as stored in the acquirer database')
# duplicate partner / transaction data to store the values at transaction time
partner_id = fields.Many2one('res.partner', 'Partner', track_visibility='onchange')
partner_id = fields.Many2one('res.partner', 'Customer', track_visibility='onchange')
partner_name = fields.Char('Partner Name')
partner_lang = fields.Selection(_lang_get, 'Language', default=lambda self: self.env.lang)
partner_email = fields.Char('Email')