mirror of
https://github.com/pretix/pretix.git
synced 2026-05-05 15:14:04 +00:00
Add Order.custom_followup_at (#2124)
This commit is contained in:
@@ -288,6 +288,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
headers.append(_('Sales channel'))
|
||||
headers.append(_('Requires special attention'))
|
||||
headers.append(_('Comment'))
|
||||
headers.append(_('Follow-up date'))
|
||||
headers.append(_('Positions'))
|
||||
headers.append(_('E-mail address verified'))
|
||||
headers.append(_('Payment providers'))
|
||||
@@ -393,6 +394,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
row.append(order.sales_channel)
|
||||
row.append(_('Yes') if order.checkin_attention else _('No'))
|
||||
row.append(order.comment or "")
|
||||
row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
|
||||
row.append(order.pcnt)
|
||||
row.append(_('Yes') if order.email_known_to_work else _('No'))
|
||||
row.append(', '.join([
|
||||
@@ -574,6 +576,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
_('Seat row'),
|
||||
_('Seat number'),
|
||||
_('Order comment'),
|
||||
_('Follow-up date'),
|
||||
]
|
||||
|
||||
questions = list(Question.objects.filter(event__in=self.events))
|
||||
@@ -677,6 +680,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
row += ['', '', '', '', '']
|
||||
|
||||
row.append(order.comment)
|
||||
row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
|
||||
acache = {}
|
||||
for a in op.answers.all():
|
||||
# We do not want to localize Date, Time and Datetime question answers, as those can lead
|
||||
@@ -780,7 +784,7 @@ class PaymentListExporter(ListExporter):
|
||||
|
||||
headers = [
|
||||
_('Event slug'), _('Order'), _('Payment ID'), _('Creation date'), _('Completion date'), _('Status'),
|
||||
_('Status code'), _('Amount'), _('Payment method'), _('Comment')
|
||||
_('Status code'), _('Amount'), _('Payment method'), _('Comment'),
|
||||
]
|
||||
yield headers
|
||||
|
||||
|
||||
25
src/pretix/base/migrations/0193_auto_20210611_1355.py
Normal file
25
src/pretix/base/migrations/0193_auto_20210611_1355.py
Normal file
@@ -0,0 +1,25 @@
|
||||
# Generated by Django 3.2.3 on 2021-06-11 13:55
|
||||
|
||||
import django.db.models.manager
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('pretixbase', '0192_checkin_more_fields'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelManagers(
|
||||
name='checkin',
|
||||
managers=[
|
||||
('all', django.db.models.manager.Manager()),
|
||||
],
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='order',
|
||||
name='custom_followup_at',
|
||||
field=models.DateField(blank=True, null=True),
|
||||
),
|
||||
]
|
||||
@@ -60,7 +60,7 @@ from django.utils.crypto import get_random_string
|
||||
from django.utils.encoding import escape_uri_path
|
||||
from django.utils.formats import date_format
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.timezone import make_aware, now
|
||||
from django.utils.timezone import get_current_timezone, make_aware, now
|
||||
from django.utils.translation import gettext_lazy as _, pgettext_lazy
|
||||
from django_countries.fields import Country
|
||||
from django_scopes import ScopedManager, scopes_disabled
|
||||
@@ -217,6 +217,11 @@ class Order(LockModel, LoggedModel):
|
||||
help_text=_("The text entered in this field will not be visible to the user and is available for your "
|
||||
"convenience.")
|
||||
)
|
||||
custom_followup_at = models.DateField(
|
||||
verbose_name=_("Follow-up date"),
|
||||
help_text=_('We\'ll show you this order to be due for a follow-up on this day.'),
|
||||
null=True, blank=True
|
||||
)
|
||||
checkin_attention = models.BooleanField(
|
||||
verbose_name=_('Requires special attention'),
|
||||
default=False,
|
||||
@@ -300,6 +305,10 @@ class Order(LockModel, LoggedModel):
|
||||
"""
|
||||
return self.all_fees(manager='objects')
|
||||
|
||||
@property
|
||||
def custom_followup_due(self):
|
||||
return self.custom_followup_at and self.custom_followup_at <= now().astimezone(get_current_timezone()).date()
|
||||
|
||||
@cached_property
|
||||
@scopes_disabled()
|
||||
def count_positions(self):
|
||||
|
||||
Reference in New Issue
Block a user