diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index a13a2c54c0..266108675e 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -200,12 +200,14 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio if cp.item.require_voucher and cp.voucher is None: cp.delete() - return error_messages['voucher_required'] + err = error_messages['voucher_required'] + break if cp.item.hide_without_voucher and (cp.voucher is None or cp.voucher.item is None or cp.voucher.item.pk != cp.item.pk): cp.delete() - return error_messages['voucher_required'] + err = error_messages['voucher_required'] + break if cp.expires >= now_dt and not cp.voucher: # Other checks are not necessary diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py index 8cae4fc703..e5f5def373 100644 --- a/src/tests/presale/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -327,6 +327,19 @@ class CheckoutTestCase(TestCase): self.assertEqual(len(doc.select(".thank-you")), 1) self.assertTrue(Voucher.objects.get(pk=v.pk).redeemed) + def test_voucher_required_but_missing(self): + self.ticket.require_voucher = True + self.ticket.save() + CartPosition.objects.create( + event=self.event, cart_id=self.session_key, item=self.ticket, + price=12, expires=now() + timedelta(minutes=10) + ) + self._set_session('payment', 'banktransfer') + + response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) + doc = BeautifulSoup(response.rendered_content, "lxml") + self.assertEqual(len(doc.select(".alert-danger")), 1) + def test_voucher_price_changed(self): v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event, valid_until=now() + timedelta(days=2))