From b1c2b0b827906125459ed2d1e7e6574b75b4b201 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Thu, 31 Oct 2024 10:47:07 +0100 Subject: [PATCH] rename prefix, update tests --- src/pretix/control/views/orders.py | 2 +- src/tests/control/test_orders.py | 126 +++++++++++++++++++---------- 2 files changed, 84 insertions(+), 44 deletions(-) diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 0814ce0873..9e98e29068 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -1881,7 +1881,7 @@ class OrderChange(OrderView): can_order=False, can_delete=True, extra=0 ) return ff( - prefix='add', + prefix='add_position', order=self.order, items=self.items, data=self.request.POST if self.request.method == "POST" else None diff --git a/src/tests/control/test_orders.py b/src/tests/control/test_orders.py index 59ca91f3d4..2f02bdabe0 100644 --- a/src/tests/control/test_orders.py +++ b/src/tests/control/test_orders.py @@ -1309,10 +1309,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-itemvar'.format(self.op1.pk): str(self.shirt.pk), 'op-{}-price'.format(self.op1.pk): str('12.00'), }) @@ -1341,10 +1345,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-subevent'.format(self.op1.pk): str(se2.pk), }) self.op1.refresh_from_db() @@ -1373,10 +1381,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-used_membership'.format(self.op1.pk): str(m_correct1.pk), 'op-{}-used_membership'.format(self.op2.pk): str(m_correct1.pk), 'op-{}-used_membership'.format(self.op3.pk): str(m_correct1.pk), @@ -1389,10 +1401,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-operation'.format(self.op1.pk): 'price', 'op-{}-itemvar'.format(self.op1.pk): str(self.ticket.pk), 'op-{}-price'.format(self.op1.pk): '24.00', @@ -1409,10 +1425,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-operation_cancel'.format(self.op1.pk): 'on', }) self.order.refresh_from_db() @@ -1424,13 +1444,17 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '1', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', - 'add-0-itemvar': str(self.shirt.pk), - 'add-0-do': 'on', - 'add-0-price': '14.00', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '1', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', + 'add_position-0-itemvar': str(self.shirt.pk), + 'add_position-0-do': 'on', + 'add_position-0-price': '14.00', }) with scopes_disabled(): assert self.order.positions.count() == 3 @@ -1453,10 +1477,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'other-recalculate_taxes': 'net', 'op-{}-operation'.format(self.op1.pk): '', 'op-{}-operation'.format(self.op2.pk): '', @@ -1489,10 +1517,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'other-recalculate_taxes': 'gross', 'op-{}-operation'.format(self.op1.pk): '', 'op-{}-operation'.format(self.op2.pk): '', @@ -1517,10 +1549,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-price'.format(self.op1.pk): '24.00', 'op-{}-operation'.format(self.op2.pk): '', 'op-{}-itemvar'.format(self.op2.pk): str(self.ticket.pk), @@ -1544,10 +1580,14 @@ class OrderChangeTests(SoupTest): self.client.post('/control/event/{}/{}/orders/{}/change'.format( self.event.organizer.slug, self.event.slug, self.order.code ), { - 'add-TOTAL_FORMS': '0', - 'add-INITIAL_FORMS': '0', - 'add-MIN_NUM_FORMS': '0', - 'add-MAX_NUM_FORMS': '100', + 'add_fee-TOTAL_FORMS': '0', + 'add_fee-INITIAL_FORMS': '0', + 'add_fee-MIN_NUM_FORMS': '0', + 'add_fee-MAX_NUM_FORMS': '100', + 'add_position-TOTAL_FORMS': '0', + 'add_position-INITIAL_FORMS': '0', + 'add_position-MIN_NUM_FORMS': '0', + 'add_position-MAX_NUM_FORMS': '100', 'op-{}-operation'.format(self.op1.pk): 'price', 'op-{}-itemvar'.format(self.op1.pk): str(self.ticket.pk), 'op-{}-price'.format(self.op1.pk): '24.00',