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

New check-in features (#3022)

Browse Source
This commit is contained in:
Raphael Michel
2023-02-09 09:46:46 +01:00
committed by GitHub
parent 7b0d07065f
commit 6902725f3c
69 changed files with 1606 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/base/exporters/json.py
View File

@@ -109,6 +109,8 @@ class JSONExporter(BaseExporter):
'name': str(variation),
'description': str(variation.description),
'position': variation.position,
'checkin_attention': variation.checkin_attention,
'require_approval': variation.require_approval,
'require_membership': variation.require_membership,
'sales_channels': variation.sales_channels,
'available_from': variation.available_from,
@@ -193,6 +195,9 @@ class JSONExporter(BaseExporter):
'state': position.state,
'secret': position.secret,
'addon_to': position.addon_to_id,
'valid_from': position.valid_from,
'valid_until': position.valid_until,
'blocked': position.blocked,
'answers': [
{
'question': answer.question_id,

9
src/pretix/base/exporters/orderlist.py
View File

@@ -43,6 +43,7 @@ from django.db.models import (
)
from django.db.models.functions import Coalesce
from django.dispatch import receiver
from django.utils.formats import date_format
from django.utils.functional import cached_property
from django.utils.timezone import get_current_timezone, now
from django.utils.translation import (
@@ -569,6 +570,9 @@ class OrderListExporter(MultiSheetListExporter):
_('Seat zone'),
_('Seat row'),
_('Seat number'),
_('Blocked'),
_('Valid from'),
_('Valid until'),
_('Order comment'),
_('Follow-up date'),
]
@@ -682,6 +686,11 @@ class OrderListExporter(MultiSheetListExporter):
else:
row += ['', '', '', '', '']
row += [
_('Yes') if op.blocked else '',
date_format(op.valid_from, 'SHORT_DATETIME_FORMAT') if op.valid_from else '',
date_format(op.valid_until, 'SHORT_DATETIME_FORMAT') if op.valid_until else '',
]
row.append(order.comment)
row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
acache = {}