diff --git a/src/pretix/presale/templates/pretixpresale/event/position_modify.html b/src/pretix/presale/templates/pretixpresale/event/position_modify.html
new file mode 100644
index 000000000..d49a321c7
--- /dev/null
+++ b/src/pretix/presale/templates/pretixpresale/event/position_modify.html
@@ -0,0 +1,55 @@
+{% extends "pretixpresale/event/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load rich_text %}
+{% block title %}{% trans "Modify ticket" %}{% endblock %}
+{% block content %}
+
+ {% blocktrans trimmed %}
+ Modify ticket
+ {% endblocktrans %}
+
+
+{% endblock %}
diff --git a/src/pretix/presale/urls.py b/src/pretix/presale/urls.py
index 1afd9dcb1..83006cd19 100644
--- a/src/pretix/presale/urls.py
+++ b/src/pretix/presale/urls.py
@@ -158,6 +158,9 @@ event_patterns = [
re_path(r'^ticket/(?P
[^/]+)/(?P\d+)/(?P[A-Za-z0-9]+)/change$',
pretix.presale.views.order.OrderPositionChange.as_view(),
name='event.order.position.change'),
+ re_path(r'^ticket/(?P[^/]+)/(?P\d+)/(?P[A-Za-z0-9]+)/modify$',
+ pretix.presale.views.order.OrderPositionModify.as_view(),
+ name='event.order.position.modify'),
re_path(r'^ical/?$',
pretix.presale.views.event.EventIcalDownload.as_view(),
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index e9bc3646f..03c6710aa 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -858,6 +858,78 @@ class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, Tem
return super().dispatch(request, *args, **kwargs)
+@method_decorator(xframe_options_exempt, 'dispatch')
+class OrderPositionModify(EventViewMixin, OrderPositionDetailMixin, OrderQuestionsViewMixin, TemplateView):
+ form_class = QuestionsForm
+ invoice_form_class = None
+ template_name = "pretixpresale/event/position_modify.html"
+
+ @cached_property
+ def invoice_form(self):
+ return None
+
+ @cached_property
+ def positions(self):
+ return [p for p in super().positions if p.pk == self.position.pk or p.addon_to_id == self.position.pk]
+
+ def get_question_override_sets(self, order_position, index):
+ override_sets = [
+ resp for recv, resp in question_form_fields_overrides.send(
+ self.request.event,
+ position=order_position,
+ request=self.request
+ )
+ ]
+ for override in override_sets:
+ for k in override:
+ # We don't want initial values to be modified, they should come from the order directly
+ override[k].pop('initial', None)
+
+ if order_position.used_membership and not order_position.used_membership.membership_type.transferable:
+ override_sets.append({
+ 'attendee_name_parts': {
+ 'disabled': True
+ }
+ })
+
+ return override_sets
+
+ def post(self, request, *args, **kwargs):
+ failed = not self.save()
+ if failed:
+ messages.error(self.request,
+ _("We had difficulties processing your input. Please review the errors below."))
+ return self.get(request, *args, **kwargs)
+ self.order.log_action('pretix.event.order.modified', {
+ 'by_ticket_holder': True,
+ 'data': [{
+ k: (f.cleaned_data.get(k).name
+ if isinstance(f.cleaned_data.get(k), File)
+ else f.cleaned_data.get(k))
+ for k in f.changed_data
+ } for f in self.forms]
+ })
+ order_modified.send(sender=self.request.event, order=self.order)
+
+ invalidate_cache.apply_async(kwargs={'event': self.request.event.pk, 'order': self.order.pk})
+ CachedTicket.objects.filter(order_position__order=self.order).delete()
+ CachedCombinedTicket.objects.filter(order=self.order).delete()
+ return redirect(self.get_position_url())
+
+ def get(self, request, *args, **kwargs):
+ return super().get(request, *args, **kwargs)
+
+ def dispatch(self, request, *args, **kwargs):
+ self.request = request
+ self.kwargs = kwargs
+ if not self.position:
+ raise Http404(_('Unknown order code or not authorized to access this order.'))
+ if not self.position.can_modify_answers:
+ messages.error(request, _('You cannot modify this order'))
+ return redirect(self.get_position_url())
+ return super().dispatch(request, *args, **kwargs)
+
+
@method_decorator(xframe_options_exempt, 'dispatch')
class OrderCancel(EventViewMixin, OrderDetailMixin, TemplateView):
template_name = "pretixpresale/event/order_cancel.html"
diff --git a/src/tests/base/test_models.py b/src/tests/base/test_models.py
index 8ee9d6c6a..4e20ddb3c 100644
--- a/src/tests/base/test_models.py
+++ b/src/tests/base/test_models.py
@@ -1263,22 +1263,34 @@ class OrderTestCase(BaseQuotaTestCase):
self.event.settings.set('invoice_address_asked', False)
self.event.settings.set('attendee_names_asked', True)
assert self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
+
+ self.event.settings.set('allow_modifications', 'attendee')
+ assert self.op1.can_modify_answers
+
self.event.settings.set('attendee_names_asked', False)
assert not self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
self.event.settings.set('invoice_address_asked', True)
assert self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
self.event.settings.set('invoice_address_asked', False)
self.event.settings.set('invoice_name_required', True)
assert self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
q = Question.objects.create(question='Foo', type=Question.TYPE_BOOLEAN, event=self.event)
self.item1.questions.add(q)
assert self.order.can_modify_answers
+ assert self.op1.can_modify_answers
self.order.status = Order.STATUS_CANCELED
assert not self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
self.order.status = Order.STATUS_PAID
assert self.order.can_modify_answers
+ assert self.op1.can_modify_answers
self.event.settings.set('last_order_modification_date', now() - timedelta(days=1))
assert not self.order.can_modify_answers
+ assert not self.op1.can_modify_answers
@classscope(attr='o')
def test_can_modify_answers_subevent(self):
diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py
index bc3f47a50..198f77a22 100644
--- a/src/tests/presale/test_orders.py
+++ b/src/tests/presale/test_orders.py
@@ -191,6 +191,24 @@ class OrdersTest(BaseOrdersTest):
self.deleted_pos.positionid, self.deleted_pos.web_secret)
)
assert response.status_code == 404
+ response = self.client.get(
+ '/%s/%s/ticket/%s/1/123/modify' % (self.orga.slug, self.event.slug, self.not_my_order.code)
+ )
+ assert response.status_code == 404
+ response = self.client.get(
+ '/%s/%s/ticket/%s/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code,
+ self.deleted_pos.positionid, self.deleted_pos.web_secret)
+ )
+ assert response.status_code == 404
+ response = self.client.get(
+ '/%s/%s/ticket/%s/1/123/change' % (self.orga.slug, self.event.slug, self.not_my_order.code)
+ )
+ assert response.status_code == 404
+ response = self.client.get(
+ '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code,
+ self.deleted_pos.positionid, self.deleted_pos.web_secret)
+ )
+ assert response.status_code == 404
def test_orders_confirm_email(self):
response = self.client.get(
@@ -424,6 +442,49 @@ class OrdersTest(BaseOrdersTest):
with scopes_disabled():
assert self.order.invoices.count() == 3
+ def test_orders_attendee_modify_invalid(self):
+ self.order.status = Order.STATUS_CANCELED
+ self.order.save()
+ self.event.settings.set('allow_modifications', 'attendee')
+ r = self.client.get(
+ '/%s/%s/ticket/%s/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code,
+ self.ticket_pos.positionid, self.ticket_pos.web_secret)
+ )
+ assert r.status_code == 302
+
+ def test_orders_attendee_modify_forbidden(self):
+ self.event.settings.set('allow_modifications', 'order')
+ r = self.client.get(
+ '/%s/%s/ticket/%s/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code,
+ self.ticket_pos.positionid, self.ticket_pos.web_secret)
+ )
+ assert r.status_code == 302
+
+ def test_orders_attendee_modify_attendee_optional(self):
+ self.event.settings.set('allow_modifications', 'attendee')
+ self.event.settings.set('attendee_names_asked', True)
+ self.event.settings.set('attendee_names_required', False)
+
+ response = self.client.get(
+ '/%s/%s/ticket/%s/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code,
+ self.ticket_pos.positionid, self.ticket_pos.web_secret)
+ )
+ doc = BeautifulSoup(response.content.decode(), "lxml")
+ self.assertEqual(len(doc.select('input[name="%s-attendee_name_parts_0"]' % self.ticket_pos.id)), 1)
+
+ # Not all fields filled out, expect success
+ response = self.client.post(
+ '/%s/%s/ticket/%s/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code,
+ self.ticket_pos.positionid, self.ticket_pos.web_secret)
+ )
+ self.assertRedirects(response,
+ '/%s/%s/ticket/%s/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
+ self.ticket_pos.positionid, self.ticket_pos.web_secret),
+ target_status_code=200)
+ with scopes_disabled():
+ self.ticket_pos = OrderPosition.objects.get(id=self.ticket_pos.id)
+ assert self.ticket_pos.attendee_name in (None, '')
+
def test_orders_cancel_invalid(self):
self.order.status = Order.STATUS_PAID
self.order.save()