Fix double shown email address in confirm view

src/pretix/presale/checkoutflow.py

@@ -523,9 +523,11 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
         ctx['confirm_messages'] = self.confirm_messages
         ctx['cart_session'] = self.cart_session
 
-        ctx['contact_info'] = [
-            (_('E-mail'), self.cart_session.get('contact_form_data', {}).get('email')),
-        ]
+        email = self.cart_session.get('contact_form_data', {}).get('email')
+        if email != settings.PRETIX_EMAIL_NONE_VALUE:
+            ctx['contact_info'] = [
+                (_('E-mail'), email),
+            ]
         responses = contact_form_fields.send(self.event, request=self.request)
         for r, response in sorted(responses, key=lambda r: str(r[0])):
             for key, value in response.items():

src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html

@@ -120,12 +120,6 @@
                         </h3>
                     </div>
                     <div class="panel-body">
-                        {% if "email" not in contact_info.keys %}
-                            <dl class="dl-horizontal">
-                                <dt>{% trans "E-mail address" %}</dt>
-                                <dd>{{ cart_session.email }}</dd>
-                            </dl>
-                        {% endif %}
                         {% for l, v in contact_info %}
                             <dl class="dl-horizontal">
                                 <dt>{{ l }}</dt>