diff options
| author | Victor Feyens <vfe@odoo.com> | 2019-07-19 13:52:05 +0000 |
|---|---|---|
| committer | Victor Feyens <vfe@odoo.com> | 2019-08-12 08:45:50 +0000 |
| commit | 9940bdb32aba0ac5c88ce56489be34322f5c066a (patch) | |
| tree | 7d229d856f6ba7393f6f88c8f40d341b59aa379e /addons/payment_transfer | |
| parent | f0e059e6010605b5cce2a3055ed3aaf7730534fa (diff) | |
[REF] payment : messaging and payment display
Co-Authored-By: William Andre <wan@odoo.com>
Diffstat (limited to 'addons/payment_transfer')
| -rw-r--r-- | addons/payment_transfer/data/payment_acquirer_data.xml | 9 | ||||
| -rw-r--r-- | addons/payment_transfer/models/payment.py | 16 | ||||
| -rw-r--r-- | addons/payment_transfer/views/payment_views.xml | 8 |
3 files changed, 21 insertions, 12 deletions
diff --git a/addons/payment_transfer/data/payment_acquirer_data.xml b/addons/payment_transfer/data/payment_acquirer_data.xml index 47f4986778b..46801109433 100644 --- a/addons/payment_transfer/data/payment_acquirer_data.xml +++ b/addons/payment_transfer/data/payment_acquirer_data.xml @@ -12,6 +12,15 @@ <field name="pre_msg"><![CDATA[ <p>Transfer information will be provided when clicking 'Pay Now'.</p>]]> </field> + <field name="pending_msg"> + <![CDATA[ + <h3>Please make a payment to: </h3> + <ul> + <li>Bank: </li> + <li>Account Number:</li> + <li>Account Holder: </li> + </ul>]]> + </field> </record> </data> </odoo> diff --git a/addons/payment_transfer/models/payment.py b/addons/payment_transfer/models/payment.py index c363f551253..96a6167d919 100644 --- a/addons/payment_transfer/models/payment.py +++ b/addons/payment_transfer/models/payment.py @@ -52,17 +52,17 @@ class TransferPaymentAcquirer(models.Model): @api.model def create(self, values): - """ Hook in create to create a default post_msg. This is done in create - to have access to the name and other creation values. If no post_msg - or a void post_msg is given at creation, generate a default one. """ - if values.get('provider') == 'transfer' and not values.get('post_msg'): - values['post_msg'] = self._format_transfer_data() + """ Hook in create to create a default pending_msg. This is done in create + to have access to the name and other creation values. If no pending_msg + or a void pending_msg is given at creation, generate a default one. """ + if values.get('provider') == 'transfer' and not values.get('pending_msg'): + values['pending_msg'] = self._format_transfer_data() return super(TransferPaymentAcquirer, self).create(values) def write(self, values): - """ Hook in write to create a default post_msg. See create(). """ - if all(not acquirer.post_msg and acquirer.provider != 'transfer' for acquirer in self) and values.get('provider') == 'transfer': - values['post_msg'] = self._format_transfer_data() + """ Hook in write to create a default pending_msg. See create(). """ + if not values.get('pending_msg', False) and all(not acquirer.pending_msg and acquirer.provider != 'transfer' for acquirer in self) and values.get('provider') == 'transfer': + values['pending_msg'] = self._format_transfer_data() return super(TransferPaymentAcquirer, self).write(values) diff --git a/addons/payment_transfer/views/payment_views.xml b/addons/payment_transfer/views/payment_views.xml index a126bb67626..659c1cbfe52 100644 --- a/addons/payment_transfer/views/payment_views.xml +++ b/addons/payment_transfer/views/payment_views.xml @@ -6,15 +6,15 @@ <field name="inherit_id" ref="payment.acquirer_form"/> <field name="arch" type="xml"> <page name="acquirer_credentials" position="attributes"> - <attribute name="attrs">{'invisible': [('provider', '=', 'transfer')]}</attribute> + <attribute name="attrs">{'invisible': [('provider', 'in', ['manual', 'transfer'])]}</attribute> </page> - <field name="done_msg" position="attributes"> + <field name="pre_msg" position="attributes"> <attribute name="attrs">{'invisible': [('provider', '=', 'transfer')]}</attribute> </field> - <field name="cancel_msg" position="attributes"> + <field name="done_msg" position="attributes"> <attribute name="attrs">{'invisible': [('provider', '=', 'transfer')]}</attribute> </field> - <field name="error_msg" position="attributes"> + <field name="cancel_msg" position="attributes"> <attribute name="attrs">{'invisible': [('provider', '=', 'transfer')]}</attribute> </field> </field> |