Prefetch program times, add test for query count

doc/api/resources/webhooks.rst

@@ -60,9 +60,6 @@ The following values for ``action_types`` are valid with pretix core:
     * ``pretix.event.added``
     * ``pretix.event.changed``
     * ``pretix.event.deleted``
-    * ``pretix.giftcards.created``
-    * ``pretix.giftcards.modified``
-    * ``pretix.giftcards.transaction.*``
     * ``pretix.voucher.added``
     * ``pretix.voucher.changed``
     * ``pretix.voucher.deleted``

src/pretix/api/views/item.py

@@ -106,7 +106,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
             'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
             'variations__meta_values', 'variations__meta_values__property',
             'require_membership_types', 'variations__require_membership_types',
-            'limit_sales_channels', 'variations__limit_sales_channels',
+            'limit_sales_channels', 'variations__limit_sales_channels', 'program_times'
         ).all()
 
     def perform_create(self, serializer):

src/pretix/api/views/organizer.py

@@ -249,17 +249,12 @@ class GiftCardViewSet(viewsets.ModelViewSet):
     def perform_create(self, serializer):
         value = serializer.validated_data.pop('value')
         inst = serializer.save(issuer=self.request.organizer)
-        inst.log_action(
-            action='pretix.giftcards.created',
-            user=self.request.user,
-            auth=self.request.auth,
-        )
         inst.transactions.create(value=value, acceptor=self.request.organizer)
         inst.log_action(
-            action='pretix.giftcards.transaction.manual',
+            'pretix.giftcards.transaction.manual',
             user=self.request.user,
             auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': inst.pk, 'acceptor_id': self.request.organizer.id})
+            data=merge_dicts(self.request.data, {'id': inst.pk})
         )
 
     @transaction.atomic()
@@ -274,7 +269,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
             inst = serializer.save(secret=serializer.instance.secret, currency=serializer.instance.currency,
                                    testmode=serializer.instance.testmode)
             inst.log_action(
-                action='pretix.giftcards.modified',
+                'pretix.giftcards.modified',
                 user=self.request.user,
                 auth=self.request.auth,
                 data=self.request.data,
@@ -287,10 +282,10 @@ class GiftCardViewSet(viewsets.ModelViewSet):
             diff = value - old_value
             inst.transactions.create(value=diff, acceptor=self.request.organizer)
             inst.log_action(
-                action='pretix.giftcards.transaction.manual',
+                'pretix.giftcards.transaction.manual',
                 user=self.request.user,
                 auth=self.request.auth,
-                data={'value': diff, 'acceptor_id': self.request.organizer.id}
+                data={'value': diff}
             )
 
         return inst
@@ -314,14 +309,10 @@ class GiftCardViewSet(viewsets.ModelViewSet):
             }, status=status.HTTP_409_CONFLICT)
         gc.transactions.create(value=value, text=text, info=info, acceptor=self.request.organizer)
         gc.log_action(
-            action='pretix.giftcards.transaction.manual',
+            'pretix.giftcards.transaction.manual',
             user=self.request.user,
             auth=self.request.auth,
-            data={
-                'value': value,
-                'text': text,
-                'acceptor_id': self.request.organizer.id
-            }
+            data={'value': value, 'text': text}
         )
         return Response(GiftCardSerializer(gc, context=self.get_serializer_context()).data, status=status.HTTP_200_OK)
 

src/pretix/api/webhooks.py

@@ -174,35 +174,6 @@ class ParametrizedEventWebhookEvent(ParametrizedWebhookEvent):
         }
 
 
-class ParametrizedGiftcardWebhookEvent(ParametrizedWebhookEvent):
-    def build_payload(self, logentry: LogEntry):
-        giftcard = logentry.content_object
-        if not giftcard:
-            return None
-
-        return {
-            'notification_id': logentry.pk,
-            'issuer_id': logentry.organizer_id,
-            'giftcard': giftcard.pk,
-            'action': logentry.action_type,
-        }
-
-
-class ParametrizedGiftcardTransactionWebhookEvent(ParametrizedWebhookEvent):
-    def build_payload(self, logentry: LogEntry):
-        giftcard = logentry.content_object
-        if not giftcard:
-            return None
-
-        return {
-            'notification_id': logentry.pk,
-            'issuer_id': logentry.organizer_id,
-            'acceptor_id': logentry.parsed_data.get('acceptor_id'),
-            'giftcard': giftcard.pk,
-            'action': logentry.action_type,
-        }
-
-
 class ParametrizedVoucherWebhookEvent(ParametrizedWebhookEvent):
 
     def build_payload(self, logentry: LogEntry):
@@ -462,18 +433,6 @@ def register_default_webhook_events(sender, **kwargs):
             'pretix.customer.anonymized',
             _('Customer account anonymized'),
         ),
-        ParametrizedGiftcardWebhookEvent(
-            'pretix.giftcards.created',
-            _('Gift card added'),
-        ),
-        ParametrizedGiftcardWebhookEvent(
-            'pretix.giftcards.modified',
-            _('Gift card modified'),
-        ),
-        ParametrizedGiftcardTransactionWebhookEvent(
-            'pretix.giftcards.transaction.*',
-            _('Gift card used in transcation'),
-        )
     )
 
 

src/pretix/base/exporters/orderlist.py

@@ -364,7 +364,7 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.city,
                     order.invoice_address.country if order.invoice_address.country else
                     order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                     order.invoice_address.custom_field,
                     order.invoice_address.vat_id,
                 ]
@@ -515,7 +515,7 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.city,
                     order.invoice_address.country if order.invoice_address.country else
                     order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                     order.invoice_address.vat_id,
                 ]
             except InvoiceAddress.DoesNotExist:
@@ -732,7 +732,7 @@ class OrderListExporter(MultiSheetListExporter):
                     op.zipcode or '',
                     op.city or '',
                     op.country if op.country else '',
-                    op.state_for_address or '',
+                    op.state or '',
                     op.voucher.code if op.voucher else '',
                     op.pseudonymization_id,
                     op.secret,
@@ -797,7 +797,7 @@ class OrderListExporter(MultiSheetListExporter):
                         order.invoice_address.city,
                         order.invoice_address.country if order.invoice_address.country else
                         order.invoice_address.country_old,
-                        order.invoice_address.state_for_address,
+                        order.invoice_address.state,
                         order.invoice_address.vat_id,
                     ]
                 except InvoiceAddress.DoesNotExist:

src/pretix/base/models/base.py

@@ -130,8 +130,6 @@ class LoggingMixin:
             organizer_id = self.event.organizer_id
         elif hasattr(self, 'organizer_id'):
             organizer_id = self.organizer_id
-        elif hasattr(self, 'issuer_id'):
-            organizer_id = self.issuer_id
 
         if user and not user.is_authenticated:
             user = None

src/pretix/base/models/customers.py

@@ -349,7 +349,7 @@ class AttendeeProfile(models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property

src/pretix/base/models/items.py

@@ -594,11 +594,10 @@ class Item(LoggedModel):
         on_delete=models.SET_NULL,
         verbose_name=_("Only show after sellout of"),
         help_text=_("If you select a product here, this product will only be shown when that product is "
-                    "no longer available. This will happen either because the other product has sold out or because "
-                    "the time is outside of the sales window for the other product. If combined with the option "
-                    "to hide sold-out products, this allows you to swap out products for more expensive ones once "
-                    "the cheaper option is sold out. There might be a short period in which both products are visible "
-                    "while all tickets of the referenced product are reserved, but not yet sold.")
+                    "sold out. If combined with the option to hide sold-out products, this allows you to "
+                    "swap out products for more expensive ones once the cheaper option is sold out. There might "
+                    "be a short period in which both products are visible while all tickets of the referenced "
+                    "product are reserved, but not yet sold.")
     )
     hidden_if_item_available_mode = models.CharField(
         choices=UNAVAIL_MODES,

src/pretix/base/models/orders.py

@@ -1675,7 +1675,7 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property
@@ -3480,7 +3480,7 @@ class InvoiceAddress(models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property

src/pretix/base/models/waitinglist.py

@@ -159,7 +159,6 @@ class WaitingListEntry(LoggedModel):
         if availability[1] is None or availability[1] < 1:
             raise WaitingListException(_('This product is currently not available.'))
 
-        event = self.event
         ev = self.subevent or self.event
         if ev.seat_category_mappings.filter(product=self.item).exists():
             # Generally, we advertise the waiting list to be based on quotas only. This makes it dangerous
@@ -192,7 +191,6 @@ class WaitingListEntry(LoggedModel):
 
         with transaction.atomic():
             locked_wle = WaitingListEntry.objects.select_for_update(of=OF_SELF).get(pk=self.pk)
-            locked_wle.event = event
             if locked_wle.voucher:
                 raise WaitingListException(_('A voucher has already been sent to this person.'))
             e = locked_wle.email
@@ -229,7 +227,6 @@ class WaitingListEntry(LoggedModel):
             locked_wle.save()
 
         self.refresh_from_db()
-        self.event = event
 
         with language(self.locale, self.event.settings.region):
             self.send_mail(

src/pretix/base/payment.py

@@ -1646,13 +1646,6 @@ class GiftCardPayment(BasePaymentProvider):
                     'transaction_id': trans.pk,
                 }
                 payment.confirm(send_mail=not is_early_special_case, generate_invoice=not is_early_special_case)
-                gc.log_action(
-                    action='pretix.giftcards.transaction.payment',
-                    data={
-                        'value': trans.value,
-                        'acceptor_id': self.event.organizer.id
-                    }
-                )
         except PaymentException as e:
             payment.fail(info={'error': str(e)})
             raise e
@@ -1677,14 +1670,6 @@ class GiftCardPayment(BasePaymentProvider):
             'transaction_id': trans.pk,
         }
         refund.done()
-        gc.log_action(
-            action='pretix.giftcards.transaction.refund',
-            data={
-                'value': refund.amount,
-                'acceptor_id': self.event.organizer.id,
-                'text': refund.comment,
-            }
-        )
 
 
 @receiver(register_payment_providers, dispatch_uid="payment_free")

src/pretix/base/services/orders.py

@@ -248,15 +248,6 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
                 for gc in position.issued_gift_cards.all():
                     gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gc.pk)
                     gc.transactions.create(value=position.price, order=order, acceptor=order.event.organizer)
-                    gc.log_action(
-                        action='pretix.giftcards.transaction.manual',
-                        user=user,
-                        auth=auth,
-                        data={
-                            'value': position.price,
-                            'acceptor_id': order.event.organizer.id
-                        }
-                    )
                     break
 
                 for m in position.granted_memberships.all():
@@ -567,14 +558,6 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                     )
                 else:
                     gc.transactions.create(value=-position.price, order=order, acceptor=order.event.organizer)
-                    gc.log_action(
-                        action='pretix.giftcards.transaction.manual',
-                        user=user,
-                        data={
-                            'value': -position.price,
-                            'acceptor_id': order.event.organizer.id,
-                        }
-                    )
 
             for m in position.granted_memberships.all():
                 m.canceled = True
@@ -2478,15 +2461,6 @@ class OrderChangeManager:
                         ))
                     else:
                         gc.transactions.create(value=-position.price, order=self.order, acceptor=self.order.event.organizer)
-                        gc.log_action(
-                            action='pretix.giftcards.transaction.manual',
-                            user=self.user,
-                            auth=self.auth,
-                            data={
-                                'value': -position.price,
-                                'acceptor_id': self.order.event.organizer.id
-                            }
-                        )
 
                 for m in position.granted_memberships.with_usages().all():
                     m.canceled = True
@@ -2504,15 +2478,6 @@ class OrderChangeManager:
                             ))
                         else:
                             gc.transactions.create(value=-opa.position.price, order=self.order, acceptor=self.order.event.organizer)
-                            gc.log_action(
-                                action='pretix.giftcards.transaction.manual',
-                                user=self.user,
-                                auth=self.auth,
-                                data={
-                                    'value': -opa.position.price,
-                                    'acceptor_id': self.order.event.organizer.id
-                                }
-                            )
 
                     for m in opa.granted_memberships.with_usages().all():
                         m.canceled = True
@@ -3166,10 +3131,7 @@ def _try_auto_refund(order, auto_refund=True, manual_refund=False, allow_partial
                 customer=order.customer,
                 testmode=order.testmode
             )
-            giftcard.log_action(
-                action='pretix.giftcards.created',
-                data={}
-            )
+            giftcard.log_action('pretix.giftcards.created', data={})
             r = order.refunds.create(
                 order=order,
                 payment=None,
@@ -3452,17 +3414,7 @@ def signal_listener_issue_giftcards(sender: Event, order: Order, **kwargs):
                     currency=sender.currency, issued_in=p, testmode=order.testmode,
                     expires=sender.organizer.default_gift_card_expiry,
                 )
-                gc.log_action(
-                    action='pretix.giftcards.created',
-                )
-                trans = gc.transactions.create(value=p.price - issued, order=order, acceptor=sender.organizer)
-                gc.log_action(
-                    action='pretix.giftcards.transaction.manual',
-                    data={
-                        'value': trans.value,
-                        'acceptor_id': order.event.organizer.id,
-                    }
-                )
+                gc.transactions.create(value=p.price - issued, order=order, acceptor=sender.organizer)
                 any_giftcards = True
                 p.secret = gc.secret
                 p.save(update_fields=['secret'])

src/pretix/base/views/js_helpers.py

@@ -82,7 +82,7 @@ def _info(cc):
     statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
     return {
         'data': [
-            {'name': gettext(s.name), 'code': s.code[3:]}
+            {'name': s.name, 'code': s.code[3:]}
             for s in sorted(statelist, key=lambda s: s.name)
         ],
         **info,

src/pretix/control/logdisplay.py

@@ -793,8 +793,6 @@ class CoreUserImpersonatedLogEntryType(UserImpersonatedLogEntryType):
     'pretix.giftcards.created': _('The gift card has been created.'),
     'pretix.giftcards.modified': _('The gift card has been changed.'),
     'pretix.giftcards.transaction.manual': _('A manual transaction has been performed.'),
-    'pretix.giftcards.transaction.payment': _('A payment has been performed.'),
-    'pretix.giftcards.transaction.refund': _('A refund has been performed. '),
     'pretix.team.token.created': _('The token "{name}" has been created.'),
     'pretix.team.token.deleted': _('The token "{name}" has been revoked.'),
     'pretix.event.checkin.reset': _('The check-in and print log state has been reset.')

src/pretix/control/views/auth.py

@@ -363,7 +363,7 @@ class Forgot(TemplateView):
                 else:
                     messages.info(request, _('If the address is registered to valid account, then we have sent you an email containing further instructions.'))
 
-            return redirect('control:auth.forgot')
+                return redirect('control:auth.forgot')
         else:
             return self.get(request, *args, **kwargs)
 

src/pretix/control/views/orders.py

@@ -1230,11 +1230,7 @@ class OrderRefundView(OrderView):
                     customer=order.customer,
                     testmode=order.testmode
                 )
-                giftcard.log_action(
-                    action='pretix.giftcards.created',
-                    user=self.request.user,
-                    data={}
-                )
+                giftcard.log_action('pretix.giftcards.created', user=self.request.user, data={})
                 refunds.append(OrderRefund(
                     order=order,
                     payment=None,

src/pretix/control/views/organizer.py

@@ -1669,12 +1669,9 @@ class GiftCardAcceptanceInviteView(OrganizerDetailViewMixin, OrganizerPermission
             active=False,
         )
         self.request.organizer.log_action(
-            action='pretix.giftcards.acceptance.acceptor.invited',
-            data={
-                'acceptor': form.cleaned_data['acceptor'].slug,
-                'issuer': self.request.organizer.slug,
-                'reusable_media': form.cleaned_data['reusable_media']
-            },
+            'pretix.giftcards.acceptance.acceptor.invited',
+            data={'acceptor': form.cleaned_data['acceptor'].slug,
+                  'reusable_media': form.cleaned_data['reusable_media']},
             user=self.request.user
         )
         messages.success(self.request, _('The selected organizer has been invited.'))
@@ -1710,11 +1707,8 @@ class GiftCardAcceptanceListView(OrganizerDetailViewMixin, OrganizerPermissionRe
             ).delete()
             if done:
                 self.request.organizer.log_action(
-                    action='pretix.giftcards.acceptance.acceptor.removed',
-                    data={
-                        'acceptor': request.POST.get("delete_acceptor"),
-                        'issuer': self.request.organizer.slug
-                    },
+                    'pretix.giftcards.acceptance.acceptor.removed',
+                    data={'acceptor': request.POST.get("delete_acceptor")},
                     user=request.user
                 )
             messages.success(self.request, _('The selected connection has been removed.'))
@@ -1724,11 +1718,8 @@ class GiftCardAcceptanceListView(OrganizerDetailViewMixin, OrganizerPermissionRe
             ).delete()
             if done:
                 self.request.organizer.log_action(
-                    action='pretix.giftcards.acceptance.issuer.removed',
-                    data={
-                        'issuer': request.POST.get("delete_acceptor"),
-                        'acceptor': self.request.organizer.slug
-                    },
+                    'pretix.giftcards.acceptance.issuer.removed',
+                    data={'issuer': request.POST.get("delete_acceptor")},
                     user=request.user
                 )
             messages.success(self.request, _('The selected connection has been removed.'))
@@ -1738,11 +1729,8 @@ class GiftCardAcceptanceListView(OrganizerDetailViewMixin, OrganizerPermissionRe
             ).update(active=True)
             if done:
                 self.request.organizer.log_action(
-                    action='pretix.giftcards.acceptance.issuer.accepted',
-                    data={
-                        'issuer': request.POST.get("accept_issuer"),
-                        'acceptor': self.request.organizer.slug
-                    },
+                    'pretix.giftcards.acceptance.issuer.accepted',
+                    data={'issuer': request.POST.get("accept_issuer")},
                     user=request.user
                 )
             messages.success(self.request, _('The selected connection has been accepted.'))
@@ -1848,11 +1836,10 @@ class GiftCardDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
                         acceptor=request.organizer,
                     )
                     self.object.log_action(
-                        action='pretix.giftcards.transaction.manual',
+                        'pretix.giftcards.transaction.manual',
                         data={
                             'value': value,
-                            'text': request.POST.get('text'),
-                            'acceptor_id': self.request.organizer.id
+                            'text': request.POST.get('text')
                         },
                         user=self.request.user,
                     )
@@ -1901,23 +1888,15 @@ class GiftCardCreateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
         messages.success(self.request, _('The gift card has been created and can now be used.'))
         form.instance.issuer = self.request.organizer
         super().form_valid(form)
-        form.instance.log_action(
-            action='pretix.giftcards.created',
-            user=self.request.user,
+        form.instance.transactions.create(
+            acceptor=self.request.organizer,
+            value=form.cleaned_data['value']
         )
+        form.instance.log_action('pretix.giftcards.created', user=self.request.user, data={})
         if form.cleaned_data['value']:
-            form.instance.transactions.create(
-                acceptor=self.request.organizer,
-                value=form.cleaned_data['value']
-            )
-            form.instance.log_action(
-                action='pretix.giftcards.transaction.manual',
-                user=self.request.user,
-                data={
-                    'value': form.cleaned_data['value'],
-                    'acceptor_id': self.request.organizer.id
-                }
-            )
+            form.instance.log_action('pretix.giftcards.transaction.manual', user=self.request.user, data={
+                'value': form.cleaned_data['value']
+            })
         return redirect(reverse(
             'control:organizer.giftcard',
             kwargs={
@@ -1945,11 +1924,7 @@ class GiftCardUpdateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
     def form_valid(self, form):
         messages.success(self.request, _('The gift card has been changed.'))
         super().form_valid(form)
-        form.instance.log_action(
-            action='pretix.giftcards.modified',
-            user=self.request.user,
-            data=dict(form.cleaned_data)
-        )
+        form.instance.log_action('pretix.giftcards.modified', user=self.request.user, data=dict(form.cleaned_data))
         return redirect(reverse(
             'control:organizer.giftcard',
             kwargs={

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

@@ -519,7 +519,7 @@
         <dialog role="alertdialog" id="cart-extend-confirmation-dialog" class="inline-dialog" aria-labelledby="cart-deadline">
             <form method="dialog">
                 <p>
-                    <button class="btn btn-success" value="OK">
+                    <button class="btn btn-success" autofocus value="OK">
                         <span role="img" aria-label="{% trans "OK" %}.">
                             {% icon "check" %}
                         </span>

src/pretix/presale/views/event.py

@@ -311,8 +311,7 @@ def get_grouped_items(event, *, channel: SalesChannel, subevent=None, voucher=No
                 )
             else:
                 q = item.hidden_if_item_available.check_quotas(subevent=subevent, _cache=quota_cache, include_bundled=True)
-                time_available = item.hidden_if_item_available.is_available()
-                item._dependency_available = (q[0] == Quota.AVAILABILITY_OK) and time_available
+                item._dependency_available = q[0] == Quota.AVAILABILITY_OK
             if item._dependency_available and item.hidden_if_item_available_mode == Item.UNAVAIL_MODE_HIDDEN:
                 item._remove = True
                 continue

src/tests/api/test_items.py

@@ -50,6 +50,7 @@ from pretix.base.models import (
     QuestionOption, Quota,
 )
 from pretix.base.models.orders import OrderFee
+from pretix.testutils.queries import assert_num_queries
 
 
 @pytest.fixture
@@ -422,6 +423,13 @@ def test_item_list(token_client, organizer, event, team, item):
     assert [] == resp.data['results']
 
 
+@pytest.mark.django_db
+def test_item_list_queries(token_client, organizer, event, team, item, item3):
+    with assert_num_queries(18):
+        resp = token_client.get('/api/v1/organizers/{}/events/{}/items/'.format(organizer.slug, event.slug))
+        assert resp.status_code == 200
+
+
 @pytest.mark.django_db
 def test_item_detail(token_client, organizer, event, team, item):
     res = dict(TEST_ITEM_RES)

src/tests/presale/test_event.py

@@ -46,7 +46,6 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.utils.timezone import now
 from django_scopes import scopes_disabled
-from freezegun import freeze_time
 from tests.base import SoupTest
 from tests.testdummy.signals import FoobarSalesChannel
 
@@ -273,48 +272,6 @@ class ItemDisplayTest(EventTestMixin, SoupTest):
         resp = self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
         self.assertNotIn("Early-bird", resp.rendered_content)
 
-    def tiered_availability_by_date_and_quota(self, q1_size, q2_size, time_offset, expected_phase):
-        current_time = now()
-
-        with scopes_disabled():
-            q1 = Quota.objects.create(event=self.event, name='Phase 1', size=q1_size)
-            item1 = Item.objects.create(
-                event=self.event,
-                name='Phase 1',
-                default_price=0,
-                available_from=current_time,
-                available_until=current_time + datetime.timedelta(days=1),
-                available_from_mode=Item.UNAVAIL_MODE_HIDDEN,
-                available_until_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available_mode=Item.UNAVAIL_MODE_HIDDEN,
-            )
-            q1.items.add(item1)
-            q2 = Quota.objects.create(event=self.event, name='Phase 2', size=q2_size)
-            item2 = Item.objects.create(
-                event=self.event,
-                name='Phase 2',
-                default_price=0,
-                available_from=current_time + datetime.timedelta(days=0),
-                available_until=current_time + datetime.timedelta(days=2),
-                available_from_mode=Item.UNAVAIL_MODE_HIDDEN,
-                available_until_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available=item1
-            )
-            q2.items.add(item2)
-            with freeze_time(current_time + time_offset):
-                resp = self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
-                self.assertIn(expected_phase, resp.rendered_content)
-
-    def test_tiered_availability_by_date_and_quota_phase1_available(self):
-        self.tiered_availability_by_date_and_quota(1, 1, datetime.timedelta(seconds=1), "Phase 1")
-
-    def test_tiered_availability_by_date_and_quota_phase1_sold_out(self):
-        self.tiered_availability_by_date_and_quota(0, 1, datetime.timedelta(seconds=1), "Phase 2")
-
-    def test_tiered_availability_by_date_and_quota_phase1_timed_out(self):
-        self.tiered_availability_by_date_and_quota(1, 1, datetime.timedelta(days=1, hours=1), "Phase 2")
-
     def test_subevents_inactive_unknown(self):
         self.event.has_subevents = True
         self.event.save()