Add phone number to customer profile (Z#178346) (#2414)

src/pretix/presale/forms/checkout.py

@@ -42,15 +42,11 @@ from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.formfields import PhoneNumberField
-from phonenumber_field.phonenumber import PhoneNumber
-from phonenumbers import NumberParseException
-from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 
 from pretix.base.forms.questions import (
     BaseInvoiceAddressForm, BaseQuestionsForm, WrappedPhoneNumberPrefixWidget,
-    guess_country,
+    guess_phone_prefix,
 )
-from pretix.base.i18n import get_babel_locale, language
 from pretix.base.validators import EmailBanlistValidator
 from pretix.presale.signals import contact_form_fields
 
@@ -75,27 +71,20 @@ class ContactForm(forms.Form):
             )
 
         if self.event.settings.order_phone_asked:
-            with language(get_babel_locale()):
-                default_country = guess_country(self.event)
-                default_prefix = None
-                for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
-                    if str(default_country) in values:
-                        default_prefix = prefix
-                try:
-                    initial = self.initial.pop('phone', None)
-                    initial = PhoneNumber().from_string(initial) if initial else "+{}.".format(default_prefix)
-                except NumberParseException:
-                    initial = None
-                self.fields['phone'] = PhoneNumberField(
-                    label=_('Phone number'),
-                    required=self.event.settings.order_phone_required,
-                    help_text=self.event.settings.checkout_phone_helptext,
+            if not self.initial.get('phone'):
+                phone_prefix = guess_phone_prefix(self.event)
+                if phone_prefix:
                     # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
                     # a country code but no number as an initial value. It's a bit hacky, but should be stable for
                     # the future.
-                    initial=initial,
-                    widget=WrappedPhoneNumberPrefixWidget()
-                )
+                    self.initial['phone'] = "+{}.".format(phone_prefix)
+
+            self.fields['phone'] = PhoneNumberField(
+                label=_('Phone number'),
+                required=self.event.settings.order_phone_required,
+                help_text=self.event.settings.checkout_phone_helptext,
+                widget=WrappedPhoneNumberPrefixWidget()
+            )
 
         if not self.request.session.get('iframe_session', False):
             # There is a browser quirk in Chrome that leads to incorrect initial scrolling in iframes if there

src/pretix/presale/forms/customer.py

@@ -31,8 +31,12 @@ from django.contrib.auth.password_validation import (
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
+from phonenumber_field.formfields import PhoneNumberField
 
-from pretix.base.forms.questions import NamePartsFormField
+from pretix.base.forms.questions import (
+    NamePartsFormField, WrappedPhoneNumberPrefixWidget, get_country_by_locale,
+    get_phone_prefix,
+)
 from pretix.base.i18n import get_language_without_region
 from pretix.base.models import Customer
 from pretix.base.services.mail import mail
@@ -137,6 +141,19 @@ class RegistrationForm(forms.Form):
         self.request = request
         super().__init__(*args, **kwargs)
 
+        event = getattr(request, "event", None)
+        if event and event.settings.order_phone_asked:
+            if event.settings.region or event.organizer.settings.region:
+                country_code = event.settings.region or event.organizer.settings.region
+                phone_prefix = get_phone_prefix(country_code)
+                if phone_prefix:
+                    self.initial['phone'] = "+{}.".format(phone_prefix)
+            self.fields['phone'] = PhoneNumberField(
+                label=_('Phone'),
+                required=event.settings.order_phone_required,
+                widget=WrappedPhoneNumberPrefixWidget()
+            )
+
         self.fields['name_parts'] = NamePartsFormField(
             max_length=255,
             required=True,
@@ -394,7 +411,7 @@ class ChangeInfoForm(forms.ModelForm):
 
     class Meta:
         model = Customer
-        fields = ('name_parts', 'email')
+        fields = ('name_parts', 'email', 'phone')
 
     def __init__(self, request=None, *args, **kwargs):
         self.request = request
@@ -408,6 +425,18 @@ class ChangeInfoForm(forms.ModelForm):
             label=_('Name'),
         )
 
+        if not self.initial.get('phone') and (request.organizer.settings.region or self.instance.locale):
+            country_code = self.instance.organizer.settings.region or get_country_by_locale(self.instance.locale)
+            phone_prefix = get_phone_prefix(country_code)
+            if phone_prefix:
+                self.initial['phone'] = "+{}.".format(phone_prefix)
+
+        self.fields['phone'] = PhoneNumberField(
+            label=_('Phone'),
+            required=False,
+            widget=WrappedPhoneNumberPrefixWidget()
+        )
+
     def clean_password_current(self):
         old_pw = self.cleaned_data.get('password_current')
 

src/pretix/presale/forms/waitinglist.py

@@ -23,12 +23,10 @@ from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.formfields import PhoneNumberField
-from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 
 from pretix.base.forms.questions import (
-    NamePartsFormField, WrappedPhoneNumberPrefixWidget, guess_country,
+    NamePartsFormField, WrappedPhoneNumberPrefixWidget, guess_phone_prefix,
 )
-from pretix.base.i18n import get_babel_locale, language
 from pretix.base.models import Quota, WaitingListEntry
 from pretix.presale.views.event import get_grouped_items
 
@@ -93,21 +91,17 @@ class WaitingListForm(forms.ModelForm):
             del self.fields['name_parts']
 
         if event.settings.waiting_list_phones_asked:
-            with language(get_babel_locale()):
-                default_country = guess_country(self.event)
-                for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
-                    if str(default_country) in values and not self.initial.get('phone'):
-                        # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
-                        # a country code but no number as an initial value. It's a bit hacky, but should be stable for
-                        # the future.
-                        self.initial['phone'] = "+{}.".format(prefix)
+            if not self.initial.get('phone'):
+                phone_prefix = guess_phone_prefix(event)
+                if phone_prefix:
+                    self.initial['phone'] = "+{}.".format(phone_prefix)
 
-                self.fields['phone'] = PhoneNumberField(
-                    label=_("Phone number"),
-                    required=event.settings.waiting_list_phones_required,
-                    help_text=event.settings.waiting_list_phones_explanation_text,
-                    widget=WrappedPhoneNumberPrefixWidget()
-                )
+            self.fields['phone'] = PhoneNumberField(
+                label=_("Phone number"),
+                required=event.settings.waiting_list_phones_required,
+                help_text=event.settings.waiting_list_phones_explanation_text,
+                widget=WrappedPhoneNumberPrefixWidget()
+            )
         else:
             del self.fields['phone']