+ {% blocktrans trimmed %} + By reactivating the order, you reverse its cancellation and transform this back into a pending or paid order. + This is only possible as long as all products in the order are still available. + If the order is pending payment, the expiry date will be reset. + {% endblocktrans %} +
+ + +{% endblock %} diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index f22c8348b3..c6743915cd 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -222,6 +222,8 @@ urlpatterns = [ name='event.order.checkvatid'), url(r'^orders/(?P[0-9A-Z]+)/extend$', orders.OrderExtend.as_view(),
name='event.order.extend'),
+ url(r'^orders/(?P[0-9A-Z]+)/reactivate$', orders.OrderReactivate.as_view(),
+ name='event.order.reactivate'),
url(r'^orders/(?P[0-9A-Z]+)/contact$', orders.OrderContactChange.as_view(),
name='event.order.contact'),
url(r'^orders/(?P[0-9A-Z]+)/locale', orders.OrderLocaleChange.as_view(),
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index c0d1d9c2dc..bcc2a84e0b 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -57,7 +57,7 @@ from pretix.base.services.mail import SendMailException, render_mail
from pretix.base.services.orders import (
OrderChangeManager, OrderError, approve_order, cancel_order, deny_order,
extend_order, mark_order_expired, mark_order_refunded,
- notify_user_changed_order,
+ notify_user_changed_order, reactivate_order,
)
from pretix.base.services.stats import order_overview
from pretix.base.services.tickets import generate
@@ -1261,6 +1261,42 @@ class OrderExtend(OrderView):
data=self.request.POST if self.request.method == "POST" else None)
+class OrderReactivate(OrderView):
+ permission = 'can_change_orders'
+
+ def post(self, *args, **kwargs):
+ try:
+ reactivate_order(
+ self.order,
+ user=self.request.user
+ )
+ messages.success(self.request, _('The order has been reactivated.'))
+ except OrderError as e:
+ messages.error(self.request, str(e))
+ return self._redirect_here()
+ except LockTimeoutException:
+ messages.error(self.request, _('We were not able to process the request completely as the '
+ 'server was too busy.'))
+ return self._redirect_back()
+
+ def dispatch(self, request, *args, **kwargs):
+ if self.order.status != Order.STATUS_CANCELED:
+ messages.error(self.request, _('This action is only allowed for canceled orders.'))
+ return self._redirect_back()
+ return super().dispatch(request, *kwargs, **kwargs)
+
+ def _redirect_here(self):
+ return redirect('control:event.order.reactivate',
+ event=self.request.event.slug,
+ organizer=self.request.event.organizer.slug,
+ code=self.order.code)
+
+ def get(self, *args, **kwargs):
+ return render(self.request, 'pretixcontrol/order/reactivate.html', {
+ 'order': self.order,
+ })
+
+
class OrderChange(OrderView):
permission = 'can_change_orders'
template_name = 'pretixcontrol/order/change.html'
diff --git a/src/tests/api/test_orders.py b/src/tests/api/test_orders.py
index cf39b65322..9b8d5ac04a 100644
--- a/src/tests/api/test_orders.py
+++ b/src/tests/api/test_orders.py
@@ -1097,6 +1097,29 @@ def test_order_mark_paid_locked(token_client, organizer, event, order):
assert order.status == Order.STATUS_EXPIRED
+@pytest.mark.django_db
+def test_order_reactivate(token_client, organizer, event, order, quota):
+ order.status = Order.STATUS_CANCELED
+ order.save()
+ resp = token_client.post(
+ '/api/v1/organizers/{}/events/{}/orders/{}/reactivate/'.format(
+ organizer.slug, event.slug, order.code
+ )
+ )
+ assert resp.status_code == 200
+ assert resp.data['status'] == Order.STATUS_PENDING
+
+
+@pytest.mark.django_db
+def test_order_reactivate_invalid(token_client, organizer, event, order):
+ resp = token_client.post(
+ '/api/v1/organizers/{}/events/{}/orders/{}/reactivate/'.format(
+ organizer.slug, event.slug, order.code
+ )
+ )
+ assert resp.status_code == 400
+
+
@pytest.mark.django_db
def test_order_mark_canceled_pending(token_client, organizer, event, order):
djmail.outbox = []
diff --git a/src/tests/base/test_orders.py b/src/tests/base/test_orders.py
index 59e0e70406..b2897a3189 100644
--- a/src/tests/base/test_orders.py
+++ b/src/tests/base/test_orders.py
@@ -23,7 +23,8 @@ from pretix.base.reldate import RelativeDate, RelativeDateWrapper
from pretix.base.services.invoices import generate_invoice
from pretix.base.services.orders import (
OrderChangeManager, OrderError, _create_order, approve_order, cancel_order,
- deny_order, expire_orders, send_download_reminders, send_expiry_warnings,
+ deny_order, expire_orders, reactivate_order, send_download_reminders,
+ send_expiry_warnings,
)
from pretix.base.signals import register_sales_channels
from pretix.plugins.banktransfer.payment import BankTransfer
@@ -1457,7 +1458,7 @@ class OrderChangeManagerTests(TestCase):
self.ocm.commit()
ops = list(self.order.positions.all())
for op in ops:
- assert op.price == Decimal('23.01') # sic. we can't really avoid it.
+ assert op.price == Decimal('23.01') # sic. we can't really avoid it.
assert op.tax_value == Decimal('1.51')
assert op.tax_rate == Decimal('7.00')
@@ -2169,7 +2170,8 @@ class OrderChangeManagerTests(TestCase):
def test_clear_out_order(self):
self.order.status = Order.STATUS_PAID
self.order.save()
- self.order.payments.create(amount=self.order.total, state=OrderPayment.PAYMENT_STATE_CONFIRMED, provider='manual')
+ self.order.payments.create(amount=self.order.total, state=OrderPayment.PAYMENT_STATE_CONFIRMED,
+ provider='manual')
cancel_order(self.order, cancellation_fee=Decimal('5.00'))
self.order.refresh_from_db()
assert self.order.total == Decimal('5.00')
@@ -2187,7 +2189,8 @@ class OrderChangeManagerTests(TestCase):
self.order.total = Decimal('51.1')
self.order.save()
- self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee, provider="banktransfer")
+ self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee,
+ provider="banktransfer")
prov = self.ocm._get_payment_provider()
prov.settings.set('_fee_percent', Decimal('10.00'))
prov.settings.set('_fee_reverse_calc', False)
@@ -2205,7 +2208,8 @@ class OrderChangeManagerTests(TestCase):
self.order.total = Decimal('50.60')
self.order.save()
- self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee, provider="banktransfer")
+ self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee,
+ provider="banktransfer")
prov = self.ocm._get_payment_provider()
prov.settings.set('_fee_percent', Decimal('10.00'))
prov.settings.set('_fee_reverse_calc', False)
@@ -2224,7 +2228,8 @@ class OrderChangeManagerTests(TestCase):
self.order.total = Decimal('50.60')
self.order.save()
- self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee, provider="banktransfer")
+ self.order.payments.create(state=OrderPayment.PAYMENT_STATE_PENDING, amount=Decimal('48.5'), fee=fee,
+ provider="banktransfer")
prov = self.ocm._get_payment_provider()
prov.settings.set('_fee_percent', Decimal('10.00'))
prov.settings.set('_fee_reverse_calc', False)
@@ -2463,3 +2468,118 @@ def test_issue_when_paid_and_changed(event):
op2 = order.positions.last()
gc2 = op2.issued_gift_cards.get()
assert gc2.value == op2.price
+
+
+class OrderReactivateTest(TestCase):
+ def setUp(self):
+ super().setUp()
+ self.o = Organizer.objects.create(name='Dummy', slug='dummy')
+ with scope(organizer=self.o):
+ self.event = Event.objects.create(organizer=self.o, name='Dummy', slug='dummy', date_from=now(),
+ plugins='tests.testdummy')
+ self.order = Order.objects.create(
+ code='FOO', event=self.event, email='dummy@dummy.test',
+ status=Order.STATUS_CANCELED, locale='en',
+ datetime=now(), expires=now() + timedelta(days=1),
+ total=Decimal('46.00'),
+ )
+ self.ticket = Item.objects.create(event=self.event, name='Early-bird ticket',
+ default_price=Decimal('23.00'), admission=True)
+ self.op1 = OrderPosition.objects.create(
+ order=self.order, item=self.ticket, variation=None,
+ price=Decimal("23.00"), attendee_name_parts={'full_name': "Peter"}, positionid=1
+ )
+ self.op2 = OrderPosition.objects.create(
+ order=self.order, item=self.ticket, variation=None,
+ price=Decimal("23.00"), attendee_name_parts={'full_name': "Dieter"}, positionid=2
+ )
+ self.stalls = Item.objects.create(event=self.event, name='Stalls',
+ default_price=Decimal('23.00'), admission=True)
+ self.plan = SeatingPlan.objects.create(
+ name="Plan", organizer=self.o, layout="{}"
+ )
+ self.event.seat_category_mappings.create(
+ layout_category='Stalls', product=self.stalls
+ )
+ self.quota = self.event.quotas.create(name='Test', size=None)
+ self.quota.items.add(self.stalls)
+ self.quota.items.add(self.ticket)
+ self.seat_a1 = self.event.seats.create(name="A1", product=self.stalls, seat_guid="A1")
+ generate_invoice(self.order)
+ djmail.outbox = []
+
+ @classscope(attr='o')
+ def test_paid(self):
+ self.order.status = Order.STATUS_PAID
+ self.order.save()
+ with pytest.raises(OrderError):
+ reactivate_order(self.order)
+
+ @classscope(attr='o')
+ def test_reactivate_unpaid(self):
+ e = self.order.expires
+ reactivate_order(self.order)
+ self.order.refresh_from_db()
+ assert self.order.status == Order.STATUS_PENDING
+ assert self.order.all_logentries().last().action_type == 'pretix.event.order.reactivated'
+ assert self.order.invoices.count() == 3
+ assert self.order.expires > e > now()
+
+ @classscope(attr='o')
+ def test_reactivate_paid(self):
+ self.order.payments.create(state=OrderPayment.PAYMENT_STATE_CONFIRMED, amount=48.5)
+ reactivate_order(self.order)
+ self.order.refresh_from_db()
+ assert self.order.status == Order.STATUS_PAID
+ assert self.order.all_logentries().last().action_type == 'pretix.event.order.reactivated'
+ assert self.order.invoices.count() == 3
+
+ @classscope(attr='o')
+ def test_reactivate_sold_out(self):
+ self.quota.size = 0
+ self.quota.save()
+ with pytest.raises(OrderError):
+ reactivate_order(self.order)
+
+ @classscope(attr='o')
+ def test_reactivate_seat_taken(self):
+ self.op1.item = self.stalls
+ self.op1.seat = self.seat_a1
+ self.op1.save()
+ self.seat_a1.blocked = True
+ self.seat_a1.save()
+ with pytest.raises(OrderError):
+ reactivate_order(self.order)
+
+ @classscope(attr='o')
+ def test_reactivate_voucher_ok(self):
+ self.op1.voucher = self.event.vouchers.create(code="FOO", item=self.ticket, redeemed=0, max_usages=1)
+ self.op1.save()
+ reactivate_order(self.order)
+ v = self.op1.voucher
+ v.refresh_from_db()
+ assert v.redeemed == 1
+
+ @classscope(attr='o')
+ def test_reactivate_voucher_budget(self):
+ self.op1.voucher = self.event.vouchers.create(code="FOO", item=self.ticket, budget=Decimal('0.00'))
+ self.op1.price_before_voucher = self.op1.price * 2
+ self.op1.save()
+ with pytest.raises(OrderError):
+ reactivate_order(self.order)
+
+ @classscope(attr='o')
+ def test_reactivate_voucher_used(self):
+ self.op1.voucher = self.event.vouchers.create(code="FOO", item=self.ticket, redeemed=1, max_usages=1)
+ self.op1.save()
+ with pytest.raises(OrderError):
+ reactivate_order(self.order)
+ v = self.op1.voucher
+ v.refresh_from_db()
+ assert v.redeemed == 1
+
+ @classscope(attr='o')
+ def test_reactivate_gift_card(self):
+ gc = self.o.issued_gift_cards.create(currency="EUR", issued_in=self.op1)
+ reactivate_order(self.order)
+ assert gc.value == 23
diff --git a/src/tests/control/test_orders.py b/src/tests/control/test_orders.py
index 83569ce348..0f276e799d 100644
--- a/src/tests/control/test_orders.py
+++ b/src/tests/control/test_orders.py
@@ -574,6 +574,37 @@ def test_order_resend_link(client, env):
assert 'FOO' in mail.outbox[0].body
+@pytest.mark.django_db
+def test_order_reactivate_not_canceled(client, env):
+ with scopes_disabled():
+ o = Order.objects.get(id=env[2].id)
+ o.status = Order.STATUS_PAID
+ o.save()
+ client.login(email='dummy@dummy.dummy', password='dummy')
+ response = client.get('/control/event/dummy/dummy/orders/FOO/reactivate', follow=True)
+ assert 'alert-danger' in response.content.decode()
+ response = client.post('/control/event/dummy/dummy/orders/FOO/reactivate', follow=True)
+ assert 'alert-danger' in response.content.decode()
+
+
+@pytest.mark.django_db
+def test_order_reactivate(client, env):
+ with scopes_disabled():
+ q = Quota.objects.create(event=env[0], size=3)
+ q.items.add(env[3])
+ o = Order.objects.get(id=env[2].id)
+ o.status = Order.STATUS_CANCELED
+ o.save()
+ client.login(email='dummy@dummy.dummy', password='dummy')
+ response = client.post('/control/event/dummy/dummy/orders/FOO/reactivate', {
+ }, follow=True)
+ print(response.content.decode())
+ assert 'alert-success' in response.content.decode()
+ with scopes_disabled():
+ o = Order.objects.get(id=env[2].id)
+ assert o.status == Order.STATUS_PENDING
+
+
@pytest.mark.django_db
def test_order_extend_not_pending(client, env):
with scopes_disabled():
diff --git a/src/tests/control/test_permissions.py b/src/tests/control/test_permissions.py
index 655d46adaa..2b8c357824 100644
--- a/src/tests/control/test_permissions.py
+++ b/src/tests/control/test_permissions.py
@@ -102,6 +102,7 @@ event_urls = [
"orders/ABC/resend",
"orders/ABC/invoice",
"orders/ABC/extend",
+ "orders/ABC/reactivate",
"orders/ABC/change",
"orders/ABC/contact",
"orders/ABC/comment",
@@ -274,6 +275,7 @@ event_permission_urls = [
("can_view_orders", "orders/", 200),
("can_view_orders", "orders/FOO/", 200),
("can_change_orders", "orders/FOO/extend", 200),
+ ("can_change_orders", "orders/FOO/reactivate", 302),
("can_change_orders", "orders/FOO/contact", 200),
("can_change_orders", "orders/FOO/transition", 405),
("can_change_orders", "orders/FOO/checkvatid", 405),