Allow attendees to change selected add-ons of same price (#3150)

src/tests/base/test_models.py

@@ -1703,20 +1703,29 @@ class OrderTestCase(BaseQuotaTestCase):
 
     @classscope(attr='o')
     def test_can_change_order(self):
+        self.event.settings.change_allow_attendee = True
         item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
                                     admission=True, allow_cancel=True)
         v = item1.variations.create(value="V")
-        OrderPosition.objects.create(order=self.order, item=item1,
-                                     variation=v, price=23)
+        op = OrderPosition.objects.create(order=self.order, item=item1,
+                                          variation=v, price=23)
         assert not self.order.user_change_allowed
+        assert not op.attendee_change_allowed
         self.event.settings.change_allow_user_variation = True
         assert self.order.user_change_allowed
+        assert op.attendee_change_allowed
+
+        self.event.settings.change_allow_attendee = False
+        assert not op.attendee_change_allowed
+        self.event.settings.change_allow_attendee = True
 
         self.event.settings.change_allow_user_variation = False
         self.order.require_approval = True
         assert not self.order.user_change_allowed
+        assert not op.attendee_change_allowed
         self.event.settings.change_allow_user_variation = True
         assert not self.order.user_change_allowed
+        assert not op.attendee_change_allowed
 
     @classscope(attr='o')
     def test_can_change_order_with_giftcard(self):
@@ -1726,10 +1735,12 @@ class OrderTestCase(BaseQuotaTestCase):
         p = OrderPosition.objects.create(order=self.order, item=item1,
                                          variation=v, price=23)
         self.event.settings.change_allow_user_variation = True
+        self.event.settings.change_allow_attendee = True
         self.event.organizer.issued_gift_cards.create(
             currency="EUR", issued_in=p
         )
         assert not self.order.user_change_allowed
+        assert not p.attendee_change_allowed
 
     @classscope(attr='o')
     def test_can_change_checked_in(self):
@@ -1738,12 +1749,14 @@ class OrderTestCase(BaseQuotaTestCase):
         self.order.status = Order.STATUS_PAID
         self.order.save()
         self.event.settings.change_allow_user_variation = True
+        self.event.settings.change_allow_attendee = True
         assert self.order.user_change_allowed
         Checkin.objects.create(
             position=self.order.positions.first(),
             list=CheckinList.objects.create(event=self.event, name='Default')
         )
         assert not self.order.user_change_allowed
+        assert not self.order.positions.first().attendee_change_allowed
 
     @classscope(attr='o')
     def test_can_change_order_multiple(self):
@@ -1758,7 +1771,9 @@ class OrderTestCase(BaseQuotaTestCase):
         OrderPosition.objects.create(order=self.order, item=item2,
                                      variation=v2, price=23)
         self.event.settings.change_allow_user_variation = True
+        self.event.settings.change_allow_attendee = True
         assert self.order.user_change_allowed
+        assert not self.order.positions.first().attendee_change_allowed
 
     @classscope(attr='o')
     def test_can_not_change_order(self):
@@ -1768,22 +1783,26 @@ class OrderTestCase(BaseQuotaTestCase):
         OrderPosition.objects.create(order=self.order, item=item1,
                                      variation=v, price=23)
         self.event.settings.change_allow_user_variation = True
+        self.event.settings.change_allow_attendee = True
         assert self.order.user_change_allowed is False
 
     @classscope(attr='o')
     def test_require_any_variation(self):
         item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
                                     admission=True, allow_cancel=True)
-        OrderPosition.objects.create(order=self.order, item=item1,
-                                     variation=None, price=23)
+        p = OrderPosition.objects.create(order=self.order, item=item1,
+                                         variation=None, price=23)
         self.event.settings.change_allow_user_variation = True
+        self.event.settings.change_allow_attendee = True
         assert self.order.user_change_allowed is False
         item2 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
                                     admission=True, allow_cancel=True)
         v2 = item2.variations.create(value="V")
-        OrderPosition.objects.create(order=self.order, item=item2,
-                                     variation=v2, price=23)
+        p2 = OrderPosition.objects.create(order=self.order, item=item2,
+                                          variation=v2, price=23)
         assert self.order.user_change_allowed is True
+        assert p.attendee_change_allowed is False
+        assert p2.attendee_change_allowed is True
 
     @classscope(attr='o')
     def test_can_not_change_order_multiple(self):

src/tests/presale/test_order_change.py

@@ -117,6 +117,11 @@ class OrderChangeVariationTest(BaseOrdersTest):
         )
         assert response.status_code == 302
 
+        response = self.client.get(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret)
+        )
+        assert response.status_code == 302
+
     def test_change_variation_paid(self):
         self.event.settings.change_allow_user_variation = True
         self.event.settings.change_allow_user_price = 'any'
@@ -154,6 +159,13 @@ class OrderChangeVariationTest(BaseOrdersTest):
         assert self.order.status == Order.STATUS_PENDING
         assert self.order.total == Decimal('35.00')
 
+        # Attendee is not allowed
+        response = self.client.get(
+            '/%s/%s/ticket/%s/%s/%s/change' % (
+                self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret)
+        )
+        assert response.status_code == 302
+
     def test_change_variation_require_higher_price(self):
         self.event.settings.change_allow_user_variation = True
         self.event.settings.change_allow_user_price = 'gt'
@@ -1464,3 +1476,83 @@ class OrderChangeAddonsTest(BaseOrdersTest):
             assert self.order.total == Decimal('23.00')
             r = self.order.refunds.get()
             assert r.provider == 'giftcard'
+
+    def test_attendee(self):
+        self.workshop2a.default_price = Decimal('0.00')
+        self.workshop2a.save()
+        self.event.settings.change_allow_attendee = True
+        response = self.client.post(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            {
+                f'cp_{self.ticket_pos.pk}_variation_{self.workshop2.pk}_{self.workshop2a.pk}': '1'
+            },
+            follow=True
+        )
+        doc = BeautifulSoup(response.content.decode(), "lxml")
+        form_data = extract_form_fields(doc.select('.main-box form')[0])
+        form_data['confirm'] = 'true'
+        self.client.post(
+            '/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), form_data, follow=True
+        )
+
+        with scopes_disabled():
+            a = self.ticket_pos.addons.get()
+            assert a.variation == self.workshop2a
+
+    def test_attendee_limited_to_own_ticket(self):
+        with scopes_disabled():
+            ticket_pos2 = OrderPosition.objects.create(
+                order=self.order,
+                item=self.ticket,
+                variation=None,
+                price=Decimal("23"),
+                attendee_name_parts={'full_name': "Peter"}
+            )
+        self.event.settings.change_allow_attendee = True
+        response = self.client.post(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            {
+                f'cp_{ticket_pos2.pk}_variation_{self.workshop2.pk}_{self.workshop2a.pk}': '1'
+            },
+            follow=False
+        )
+        assert response.status_code == 302  # nothing changed
+
+    def test_attendee_needs_to_keep_price(self):
+        self.event.settings.change_allow_user_price = 'any'  # ignored, for attendees its always "eq"
+        self.event.settings.change_allow_attendee = True
+        response = self.client.post(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            {
+                f'cp_{self.ticket_pos.pk}_variation_{self.workshop2.pk}_{self.workshop2a.pk}': '1'
+            },
+            follow=True
+        )
+        assert 'alert-danger' in response.content.decode()
+        assert 'changes' in response.content.decode()
+
+        self.workshop2a.default_price = Decimal('0.00')
+        self.workshop2a.save()
+
+        response = self.client.post(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            {
+                f'cp_{self.ticket_pos.pk}_variation_{self.workshop2.pk}_{self.workshop2a.pk}': '1'
+            },
+            follow=True
+        )
+        assert 'alert-danger' not in response.content.decode()
+
+    def test_attendee_price_hidden(self):
+        self.event.settings.change_allow_attendee = True
+        response = self.client.get(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            follow=True
+        )
+        assert '€' not in response.content.decode()
+        self.event.settings.hide_prices_from_attendees = False
+        response = self.client.get(
+            '/%s/%s/ticket/%s/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.ticket_pos.positionid, self.ticket_pos.web_secret),
+            follow=True
+        )
+        assert '€' in response.content.decode()