Drop typeahead for seats

src/pretix/control/views/orders.py

@@ -1303,6 +1303,7 @@ class OrderChange(OrderView):
         positions = list(self.order.positions.all())
         for p in positions:
             p.form = OrderPositionChangeForm(prefix='op-{}'.format(p.pk), instance=p,
+                                             initial={'seat': p.seat.seat_guid if p.seat else None},
                                              data=self.request.POST if self.request.method == "POST" else None)
             try:
                 ia = self.order.invoice_address
@@ -1398,12 +1399,12 @@ class OrderChange(OrderView):
                     if item != p.item or variation != p.variation:
                         ocm.change_item(p, item, variation)
 
-                if p.seat and p.form.cleaned_data['seat'] and p.form.cleaned_data['seat'] != p.seat:
-                    ocm.change_seat(p, p.form.cleaned_data['seat'])
-
                 if self.request.event.has_subevents and p.form.cleaned_data['subevent'] and p.form.cleaned_data['subevent'] != p.subevent:
                     ocm.change_subevent(p, p.form.cleaned_data['subevent'])
 
+                if p.seat and p.form.cleaned_data['seat'] and p.form.cleaned_data['seat'] != p.seat.seat_guid:
+                    ocm.change_seat(p, p.form.cleaned_data['seat'])
+
                 if p.form.cleaned_data['price'] != p.price:
                     ocm.change_price(p, p.form.cleaned_data['price'])
 

src/pretix/control/views/typeahead.py

@@ -13,8 +13,7 @@ from django.utils.timezone import make_aware
 from django.utils.translation import pgettext, ugettext as _
 
 from pretix.base.models import (
-    EventMetaProperty, EventMetaValue, Order, Organizer, SubEvent, User,
-    Voucher,
+    EventMetaProperty, EventMetaValue, Order, Organizer, User, Voucher,
 )
 from pretix.control.forms.event import EventWizardCopyForm
 from pretix.control.permissions import event_permission_required
@@ -225,46 +224,6 @@ def nav_context_list(request):
     return JsonResponse(doc)
 
 
-@event_permission_required("can_view_orders")
-def seat_select2(request, **kwargs):
-    query = request.GET.get('query', '')
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-
-    if request.event.has_subevents:
-        try:
-            qs = request.event.subevents.get(active=True, pk=request.GET.get('subevent', 0)).free_seats()
-        except SubEvent.DoesNotExist:
-            qs = request.event.seats.none()
-    else:
-        qs = request.event.free_seats()
-    qs = qs.filter(
-        Q(name__icontains=query) | Q(seat_guid__icontains=query)
-    ).order_by('name').select_related('product', 'subevent')
-
-    total = qs.count()
-    pagesize = 20
-    offset = (page - 1) * pagesize
-    doc = {
-        'results': [
-            {
-                'id': e.pk,
-                'text': '{} ({})'.format(str(e), str(e.product)),
-                'product': e.product_id,
-                'event': str(e.subevent) if e.subevent else ''
-
-            }
-            for e in qs[offset:offset + pagesize]
-        ],
-        'pagination': {
-            "more": total >= (offset + pagesize)
-        }
-    }
-    return JsonResponse(doc)
-
-
 @event_permission_required(None)
 def subevent_select2(request, **kwargs):
     query = request.GET.get('query', '')