CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Order email history: Record more information about attachments (Z#23185463) (#4914)

Browse Source
This commit is contained in:
Raphael Michel
2025-03-18 08:58:54 +01:00
committed by GitHub
parent fcd8c82092
commit f475781a89
6 changed files with 92 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pretix/plugins/sendmail/tasks.py
View File

@@ -38,7 +38,9 @@ from i18nfield.strings import LazyI18nString
from pretix.base.email import get_email_context
from pretix.base.i18n import language
from pretix.base.models import Checkin, Event, InvoiceAddress, Order, User
from pretix.base.models import (
CachedFile, Checkin, Event, InvoiceAddress, Order, User,
)
from pretix.base.services.mail import SendMailException, mail
from pretix.base.services.tasks import ProfiledEventTask
from pretix.celery_app import app
@@ -56,6 +58,7 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
orders = Order.objects.filter(pk__in=objects, event=event)
subject = LazyI18nString(subject)
message = LazyI18nString(message)
attachments_for_log = [cf.filename for cf in CachedFile.objects.filter(pk__in=attachments)] if attachments else []
for o in orders:
send_to_order = recipients in ('both', 'orders')
@@ -134,7 +137,11 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
'position': p.positionid,
'subject': format_map(subject.localize(o.locale), email_context),
'message': format_map(message.localize(o.locale), email_context),
'recipient': p.attendee_email
'recipient': p.attendee_email,
'attach_tickets': attach_tickets,
'attach_ical': attach_ical,
'attach_other_files': [],
'attach_cached_files': attachments_for_log,
}
)
except SendMailException:
@@ -162,7 +169,11 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
data={
'subject': format_map(subject.localize(o.locale), email_context),
'message': format_map(message.localize(o.locale), email_context),
'recipient': o.email
'recipient': o.email,
'attach_tickets': attach_tickets,
'attach_ical': attach_ical,
'attach_other_files': [],
'attach_cached_files': attachments_for_log,
}
)
except SendMailException:

43
src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html
View File

@@ -45,27 +45,28 @@
<div lang="{{ locale }}" class="mail-preview">
<strong>{{ out.subject|safe }}</strong><br><br>
{{ out.html|safe }}
{% if out.attachment %}
<p>
<a href="{% url 'cachedfile.download' id=out.attachment.id %}" class="btn btn-default"
target="_blank">
<span class="fa fa-file" aria-hidden="true"></span>
{{ out.attachment.filename }}
</a>
</p>
{% endif %}
{% if form.cleaned_data.attach_tickets %}
<p>
<span class="fa fa-file" aria-hidden="true"></span>
{% trans "Tickets" %}
</p>
{% endif %}
{% if form.cleaned_data.attach_ical %}
<p>
<span class="fa fa-file" aria-hidden="true"></span>
{% trans "Attach calendar files" %}
</p>
{% endif %}
<ul class="list-unstyled">
{% if out.attachment %}
<li>
<span class="fa fa-file-o fa-fw" aria-hidden="true"></span>
<a href="{% url 'cachedfile.download' id=out.attachment.id %}" target="_blank">
{{ out.attachment.filename }}
</a>
</li>
{% endif %}
{% if form.cleaned_data.attach_tickets %}
<li>
<span class="fa fa-file-o fa-fw" aria-hidden="true"></span>
{% trans "Tickets" %}
</li>
{% endif %}
{% if form.cleaned_data.attach_ical %}
<li>
<span class="fa fa-calendar-o fa-fw" aria-hidden="true"></span>
{% trans "Attach calendar files" %}
</li>
{% endif %}
</ul>
</div>
{% endfor %}
</div>