Waiting list: Add name and phone number (#1987)

* add name and phone to waitinglist * add options whether to ask for name/phone in waitinglist * changed rendermode to checkout and added required-css-class * changed default to original behaviour to not ask name or phone at all * add name and phone to list-view and export * add name and phone to Meta-class so they automagically get saved * update shredder * fixed isort * Translated on translate.pretix.eu (Slovenian) Currently translated at 19.9% (799 of 3996 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sl/ powered by weblate * Translated on translate.pretix.eu (Slovenian) Currently translated at 21.6% (865 of 3996 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sl/ powered by weblate * Translated on translate.pretix.eu (Slovenian) Currently translated at 23.8% (955 of 3996 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sl/ powered by weblate * Translated on translate.pretix.eu (Slovenian) Currently translated at 26.3% (1051 of 3996 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sl/ powered by weblate * add validation to WaitingListSerializer * update API-description * fixed test_waitinglist.py * Revert more of de597ba86 * Paginate list of gift cards * Change texts on order confirmation page if no attachments are sent * Update locales * Added translation on translate.pretix.eu (Sinhala) * Added translation on translate.pretix.eu (Sinhala) * Translated on translate.pretix.eu (Sinhala) Currently translated at 0.4% (18 of 4002 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/si/ powered by weblate * Fix initial value of phone number * add colon to enumeration in description Co-authored-by: Raphael Michel <michel@rami.io> * update API-description with null-fields * add name and phone to waitinglist * add options whether to ask for name/phone in waitinglist * changed rendermode to checkout and added required-css-class * changed default to original behaviour to not ask name or phone at all * add name and phone to list-view and export * add name and phone to Meta-class so they automagically get saved * update shredder * fixed isort * add validation to WaitingListSerializer * update API-description * fixed test_waitinglist.py * Fix initial value of phone number * update API-description with null-fields * add colon to enumeration in description Co-authored-by: Raphael Michel <michel@rami.io> * fixed isort on migration Co-authored-by: lapor-kris <kristijan.tkalec@posteo.si> Co-authored-by: Raphael Michel <mail@raphaelmichel.de> Co-authored-by: helabasa <R45XvezA@pm.me> Co-authored-by: Raphael Michel <michel@rami.io>
2026-05-06 15:24:02 +00:00 · 2021-03-05 10:02:37 +01:00
parent 8ca2fe7707
commit 8e00970f04
16 changed files with 227 additions and 9 deletions
--- a/src/pretix/base/exporters/waitinglist.py
+++ b/src/pretix/base/exporters/waitinglist.py
@@ -82,7 +82,9 @@ class WaitingListExporter(ListExporter):

        headers = [
            _('Date'),
+            _('Name'),
            _('Email'),
+            _('Phone number'),
            _('Product name'),
            _('Variation'),
            _('Event slug'),
@@ -117,7 +119,9 @@ class WaitingListExporter(ListExporter):

            row = [
                entry.created.astimezone(tz).strftime(datetime_format),  # alternative: .isoformat(),
+                entry.name,
                entry.email,
+                entry.phone,
                str(entry.item) if entry.item else "",
                str(entry.variation) if entry.variation else "",
                entry.event.slug,
--- a/src/pretix/base/migrations/0177_auto_20210301_1510.py
+++ b/src/pretix/base/migrations/0177_auto_20210301_1510.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.10 on 2021-03-01 15:10
+
+import jsonfallback.fields
+import phonenumber_field.modelfields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0176_auto_20210205_1512'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='name_cached',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='name_parts',
+            field=jsonfallback.fields.FallbackJSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='phone',
+            field=phonenumber_field.modelfields.PhoneNumberField(max_length=128, null=True, region=None),
+        ),
+    ]
--- a/src/pretix/base/models/waitinglist.py
+++ b/src/pretix/base/models/waitinglist.py
@@ -5,11 +5,14 @@ from django.db import models, transaction
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
+from jsonfallback.fields import FallbackJSONField
+from phonenumber_field.modelfields import PhoneNumberField

 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
 from pretix.base.models import Voucher
 from pretix.base.services.mail import mail
+from pretix.base.settings import PERSON_NAME_SCHEMES

 from .base import LoggedModel
 from .event import Event, SubEvent
@@ -37,9 +40,21 @@ class WaitingListEntry(LoggedModel):
        verbose_name=_("On waiting list since"),
        auto_now_add=True
    )
+    name_cached = models.CharField(
+        max_length=255,
+        verbose_name=_("Name"),
+        blank=True, null=True,
+    )
+    name_parts = FallbackJSONField(
+        blank=True, default=dict
+    )
    email = models.EmailField(
        verbose_name=_("E-mail address")
    )
+    phone = PhoneNumberField(
+        null=True, blank=True,
+        verbose_name=_("Phone number")
+    )
    voucher = models.ForeignKey(
        'Voucher',
        verbose_name=_("Assigned voucher"),
@@ -83,6 +98,27 @@ class WaitingListEntry(LoggedModel):
        WaitingListEntry.clean_itemvar(self.event, self.item, self.variation)
        WaitingListEntry.clean_subevent(self.event, self.subevent)

+    def save(self, *args, **kwargs):
+        update_fields = kwargs.get('update_fields', [])
+        if 'name_parts' in update_fields:
+            update_fields.append('name_cached')
+        self.name_cached = self.name
+        if self.name_parts is None:
+            self.name_parts = {}
+        super().save(*args, **kwargs)
+
+    @property
+    def name(self):
+        if not self.name_parts:
+            return None
+        if '_legacy' in self.name_parts:
+            return self.name_parts['_legacy']
+        if '_scheme' in self.name_parts:
+            scheme = PERSON_NAME_SCHEMES[self.name_parts['_scheme']]
+        else:
+            scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme]
+        return scheme['concatenation'](self.name_parts).strip()
+
    def send_voucher(self, quota_cache=None, user=None, auth=None):
        availability = (
            self.variation.check_quotas(count_waitinglist=False, subevent=self.subevent, _cache=quota_cache)
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -975,6 +975,61 @@ DEFAULTS = {
            widget=forms.NumberInput(),
        )
    },
+    'waiting_list_names_asked': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Ask for a name"),
+            help_text=_("Ask for a name when signing up to the waiting list."),
+        )
+    },
+    'waiting_list_names_required': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Require name"),
+            help_text=_("Require a name when signing up to the waiting list.."),
+            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-waiting_list_names_asked'}),
+        )
+    },
+    'waiting_list_phones_asked': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Ask for a phone number"),
+            help_text=_("Ask for a phone number when signing up to the waiting list."),
+        )
+    },
+    'waiting_list_phones_required': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Require phone number"),
+            help_text=_("Require a phone number when signing up to the waiting list.."),
+            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-waiting_list_phones_asked'}),
+        )
+    },
+    'waiting_list_phones_explanation_text': {
+        'default': '',
+        'type': LazyI18nString,
+        'form_class': I18nFormField,
+        'serializer_class': I18nField,
+        'form_kwargs': dict(
+            label=_("Phone number explanation"),
+            widget=I18nTextarea,
+            widget_kwargs={'attrs': {'rows': '2'}},
+            help_text=_("If you ask for a phone number, explain why you do so and what you will use the phone number for.")
+        )
+    },
+
    'ticket_download': {
        'default': 'False',
        'type': bool,
--- a/src/pretix/base/shredder.py
+++ b/src/pretix/base/shredder.py
@@ -203,7 +203,7 @@ class EmailAddressShredder(BaseDataShredder):
 class WaitingListShredder(BaseDataShredder):
    verbose_name = _('Waiting list')
    identifier = 'waiting_list'
-    description = _('This will remove all email addresses from the waiting list.')
+    description = _('This will remove all names, email addresses, and phone numbers from the waiting list.')

    def generate_files(self) -> List[Tuple[str, str, str]]:
        yield 'waiting-list.json', 'application/json', json.dumps([
@@ -213,7 +213,7 @@ class WaitingListShredder(BaseDataShredder):

    @transaction.atomic
    def shred_data(self):
-        self.event.waitinglistentries.update(email='█')
+        self.event.waitinglistentries.update(name_cached=None, name_parts={'_shredded': True}, email='█', phone='█')

        for wle in self.event.waitinglistentries.select_related('voucher').filter(voucher__isnull=False):
            if '@' in wle.voucher.comment:
@@ -222,7 +222,14 @@ class WaitingListShredder(BaseDataShredder):

        for le in self.event.logentry_set.filter(action_type="pretix.voucher.added.waitinglist").exclude(data=""):
            d = le.parsed_data
+            if 'name' in d:
+                d['name'] = '█'
+            if 'name_parts' in d:
+                d['name_parts'] = {
+                    '_legacy': '█'
+                }
            d['email'] = '█'
+            d['phone'] = '█'
            le.data = json.dumps(d)
            le.shredded = True
            le.save(update_fields=['data', 'shredded'])