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

Respect Order.valid_if_pending for mail_attach_ical_paid_only (#4065)

Browse Source
This commit is contained in:
Raphael Michel
2024-04-12 15:00:00 +02:00
committed by GitHub
parent c01855270b
commit 009e3a6d36
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/base/services/orders.py
View File

@@ -413,7 +413,9 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False
'pretix.event.order.email.order_approved', user, 'pretix.event.order.email.order_approved', user,
attach_tickets=True, attach_tickets=True,
attach_ical=order.event.settings.mail_attach_ical and ( attach_ical=order.event.settings.mail_attach_ical and (
not order.event.settings.mail_attach_ical_paid_only or order.total == Decimal('0.00') not order.event.settings.mail_attach_ical_paid_only or
order.total == Decimal('0.00') or
order.valid_if_pending
), ),
invoices=[invoice] if invoice and order.event.settings.invoice_email_attachment else [] invoices=[invoice] if invoice and order.event.settings.invoice_email_attachment else []
) )
@@ -1055,7 +1057,11 @@ def _order_placed_email(event: Event, order: Order, email_template, subject_temp
log_entry, log_entry,
invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [], invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [],
attach_tickets=True, attach_tickets=True,
attach_ical=event.settings.mail_attach_ical and (not event.settings.mail_attach_ical_paid_only or is_free), attach_ical=event.settings.mail_attach_ical and (
not event.settings.mail_attach_ical_paid_only or
is_free or
order.valid_if_pending
),
attach_other_files=[a for a in [ attach_other_files=[a for a in [
event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):] event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
] if a], ] if a],
@@ -1074,7 +1080,11 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
log_entry, log_entry,
invoices=[], invoices=[],
attach_tickets=True, attach_tickets=True,
attach_ical=event.settings.mail_attach_ical and (not event.settings.mail_attach_ical_paid_only or is_free), attach_ical=event.settings.mail_attach_ical and (
not event.settings.mail_attach_ical_paid_only or
is_free or
order.valid_if_pending
),
attach_other_files=[a for a in [ attach_other_files=[a for a in [
event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):] event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
] if a], ] if a],