Martin Trigaux
69f911d994
When using message_post, the body format must be explicitly specified. If html is expected, a Markup object should be used. If text is given, the content will be escaped. Before this PR: message_post was unaware if the content of a message was HTML or text. This lead to multiple situation where the content was incorrectly considered as HTML and led to display errors. In self.message_post(body="Hello %s!" % self.name) if the name contained HTML, it would be evaluated. In self.message_post(body="Contact Raoul <raoul@caramail.be>") the email would not be displayed as considered as unknown HTML and discarded by the sanitizer Now each call must explict the type of content. Use the escape() helper to properly combine Markup and translations. It would also be acceptable to use Markup() to wrap a static translation but escape is better as one can not guarantee the content of a translation. closes odoo/odoo#111850 Related: odoo/documentation#3612 Related: odoo/enterprise#36728 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
48 lines
2.1 KiB
Python
48 lines
2.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from markupsafe import Markup
|
|
from odoo import _, fields, models
|
|
|
|
|
|
class PaymentTransaction(models.Model):
|
|
_inherit = "payment.transaction"
|
|
|
|
is_donation = fields.Boolean(string="Is donation")
|
|
|
|
def _finalize_post_processing(self):
|
|
super()._finalize_post_processing()
|
|
for tx in self.filtered('is_donation'):
|
|
tx._send_donation_email()
|
|
msg = [_('Payment received from donation with following details:')]
|
|
for field in ['company_id', 'partner_id', 'partner_name', 'partner_country_id', 'partner_email']:
|
|
field_name = tx._fields[field].string
|
|
value = tx[field]
|
|
if value:
|
|
if hasattr(value, 'name'):
|
|
value = value.name
|
|
msg.append(Markup('<br/>- %s: %s') % (field_name, value))
|
|
tx.payment_id._message_log(body=Markup().join(msg))
|
|
|
|
def _send_donation_email(self, is_internal_notification=False, comment=None, recipient_email=None):
|
|
self.ensure_one()
|
|
if is_internal_notification or self.state == 'done':
|
|
subject = _('A donation has been made on your website') if is_internal_notification else _('Donation confirmation')
|
|
body = self.env['ir.qweb']._render('website_payment.donation_mail_body', {
|
|
'is_internal_notification': is_internal_notification,
|
|
'tx': self,
|
|
'comment': comment,
|
|
}, minimal_qcontext=True)
|
|
self.env.ref('website_payment.mail_template_donation').send_mail(
|
|
self.id,
|
|
email_layout_xmlid="mail.mail_notification_light",
|
|
email_values={
|
|
'email_to': recipient_email if is_internal_notification else self.partner_email,
|
|
'email_from': self.company_id.email_formatted,
|
|
'author_id': self.partner_id.id,
|
|
'subject': subject,
|
|
'body_html': body,
|
|
},
|
|
force_send=True,
|
|
)
|