Refs #145 -- Multi-use vouchers

src/tests/base/test_models.py

@@ -234,6 +234,37 @@ class QuotaTestCase(BaseQuotaTestCase):
         v.save()
         self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_ORDERED, 0))
 
+    def test_voucher_quota_multiuse(self):
+        self.quota.size = 5
+        self.quota.variations.add(self.var1)
+        self.quota.save()
+        Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, max_usages=5, redeemed=2)
+        self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_OK, 2))
+        Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, max_usages=2)
+        self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_ORDERED, 0))
+
+    def test_voucher_multiuse_count_overredeemed(self):
+        Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, max_usages=2, redeemed=4)
+        self.assertEqual(self.quota.count_blocking_vouchers(), 0)
+
+    def test_voucher_quota_multiuse_multiproduct(self):
+        q2 = Quota.objects.create(event=self.event, name="foo", size=10)
+        q2.items.add(self.item1)
+        self.quota.size = 5
+        self.quota.items.add(self.item1)
+        self.quota.items.add(self.item2)
+        self.quota.items.add(self.item3)
+        self.quota.variations.add(self.var1)
+        self.quota.variations.add(self.var2)
+        self.quota.variations.add(self.var3)
+        self.quota.save()
+        Voucher.objects.create(item=self.item1, event=self.event, block_quota=True, max_usages=5, redeemed=2)
+        Voucher.objects.create(item=self.item2, variation=self.var2, event=self.event, block_quota=True, max_usages=5,
+                               redeemed=2)
+        Voucher.objects.create(item=self.item2, variation=self.var2, event=self.event, block_quota=True, max_usages=5,
+                               redeemed=2)
+        self.assertEqual(self.quota.count_blocking_vouchers(), 9)
+
     def test_voucher_quota_expiring_soon(self):
         self.quota.variations.add(self.var1)
         self.quota.size = 1

src/tests/control/test_vouchers.py

@@ -81,23 +81,23 @@ class VoucherFormTest(SoupTest):
         self.event.vouchers.create(item=self.ticket, code='ABCDEFG')
         doc = self.client.get('/control/event/%s/%s/vouchers/?download=yes' % (self.orga.slug, self.event.slug))
         assert doc.content.strip() == '"Voucher code","Valid until","Product","Reserve quota","Bypass quota","Price",' \
-                                      '"Tag","Redeemed"\r\n"ABCDEFG","","Early-bird ticket","No","No","","",' \
-                                      '"No"'.encode('utf-8')
+                                      '"Tag","Redeemed","Maximum usages"\r\n"ABCDEFG","","Early-bird ticket","No",' \
+                                      '"No","","","0","1"'.encode('utf-8')
 
     def test_filter_status_valid(self):
         v = self.event.vouchers.create(item=self.ticket)
         doc = self.client.get('/control/event/%s/%s/vouchers/?status=v' % (self.orga.slug, self.event.slug))
         assert v.code in doc.rendered_content
-        v.redeemed = True
+        v.redeemed = 1
         v.save()
         doc = self.client.get('/control/event/%s/%s/vouchers/?status=v' % (self.orga.slug, self.event.slug))
         assert v.code not in doc.rendered_content
 
     def test_filter_status_redeemed(self):
-        v = self.event.vouchers.create(item=self.ticket, redeemed=True)
+        v = self.event.vouchers.create(item=self.ticket, redeemed=1)
         doc = self.client.get('/control/event/%s/%s/vouchers/?status=r' % (self.orga.slug, self.event.slug))
         assert v.code in doc.rendered_content
-        v.redeemed = False
+        v.redeemed = 0
         v.save()
         doc = self.client.get('/control/event/%s/%s/vouchers/?status=r' % (self.orga.slug, self.event.slug))
         assert v.code not in doc.rendered_content
@@ -406,7 +406,7 @@ class VoucherFormTest(SoupTest):
         assert not self.event.vouchers.filter(pk=v.id).exists()
 
     def test_delete_voucher_redeemed(self):
-        v = self.event.vouchers.create(quota=self.quota_tickets, redeemed=True)
+        v = self.event.vouchers.create(quota=self.quota_tickets, redeemed=1)
         doc = self.get_doc('/control/event/%s/%s/vouchers/%s/delete' % (self.orga.slug, self.event.slug, v.pk),
                            follow=True)
         assert doc.select(".alert-danger")

src/tests/presale/test_cart.py

@@ -35,6 +35,12 @@ class CartTestMixin:
                                           category=self.category, default_price=23)
         self.quota_tickets.items.add(self.ticket)
 
+        self.quota_all = Quota.objects.create(event=self.event, name='All', size=None)
+        self.quota_all.items.add(self.ticket)
+        self.quota_all.items.add(self.shirt)
+        self.quota_all.variations.add(self.shirt_blue)
+        self.quota_all.variations.add(self.shirt_red)
+
         self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
         self.session_key = self.client.cookies.get(settings.SESSION_COOKIE_NAME).value
 
@@ -516,7 +522,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher(self):
         v = Voucher.objects.create(item=self.ticket, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -531,7 +538,8 @@ class CartTest(CartTestMixin, TestCase):
             price=23, expires=now() - timedelta(minutes=10), voucher=v
         )
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1'
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
         }, follow=True)
         obj = CartPosition.objects.get(id=cp1.id)
         self.assertGreater(obj.expires, now())
@@ -539,7 +547,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_variation(self):
         v = Voucher.objects.create(item=self.shirt, variation=self.shirt_red, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -549,7 +558,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_quota(self):
         v = Voucher.objects.create(quota=self.quota_shirts, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -559,7 +569,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_quota_invalid_item(self):
         v = Voucher.objects.create(quota=self.quota_tickets, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 0)
@@ -567,7 +578,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_item_invalid_item(self):
         v = Voucher.objects.create(item=self.shirt, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'itme_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 0)
@@ -575,7 +587,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_item_invalid_variation(self):
         v = Voucher.objects.create(item=self.shirt, variation=self.shirt_blue, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 0)
@@ -583,7 +596,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_price(self):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -592,9 +606,10 @@ class CartTest(CartTestMixin, TestCase):
         self.assertEqual(objs[0].price, Decimal('12.00'))
 
     def test_voucher_redemed(self):
-        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event, redeemed=True)
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event, redeemed=1)
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         doc = BeautifulSoup(response.rendered_content, "lxml")
         self.assertIn('already been used', doc.select('.alert-danger')[0].text)
@@ -604,7 +619,8 @@ class CartTest(CartTestMixin, TestCase):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
                                    valid_until=now() - timedelta(days=2))
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         doc = BeautifulSoup(response.rendered_content, "lxml")
         self.assertIn('expired', doc.select('.alert-danger')[0].text)
@@ -612,7 +628,8 @@ class CartTest(CartTestMixin, TestCase):
 
     def test_voucher_invalid(self):
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: 'ABC',
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': 'ASDFGH',
         }, follow=True)
         doc = BeautifulSoup(response.rendered_content, "lxml")
         self.assertIn('not known', doc.select('.alert-danger')[0].text)
@@ -623,7 +640,8 @@ class CartTest(CartTestMixin, TestCase):
         self.quota_tickets.save()
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event)
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         doc = BeautifulSoup(response.rendered_content, "lxml")
         self.assertIn('no longer available', doc.select('.alert-danger')[0].text)
@@ -635,7 +653,8 @@ class CartTest(CartTestMixin, TestCase):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
                                    allow_ignore_quota=True)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -655,7 +674,8 @@ class CartTest(CartTestMixin, TestCase):
         self.assertIn('no longer available', doc.select('.alert-danger')[0].text)
         self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists())
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -666,7 +686,8 @@ class CartTest(CartTestMixin, TestCase):
     def test_voucher_doubled(self):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event)
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -675,10 +696,11 @@ class CartTest(CartTestMixin, TestCase):
         self.assertEqual(objs[0].price, Decimal('12.00'))
 
         response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'item_%d_voucher' % self.ticket.id: v.code,
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
         }, follow=True)
         doc = BeautifulSoup(response.rendered_content, "lxml")
-        self.assertIn('already used', doc.select('.alert-danger')[0].text)
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
         self.assertEqual(1, CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count())
 
     def test_require_voucher(self):
@@ -686,7 +708,8 @@ class CartTest(CartTestMixin, TestCase):
         self.shirt.require_voucher = True
         self.shirt.save()
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -707,7 +730,8 @@ class CartTest(CartTestMixin, TestCase):
         quota2.variations.add(self.shirt_red)
         v = Voucher.objects.create(quota=self.quota_shirts, event=self.event)
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code
         }, follow=True)
         self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
 
@@ -716,7 +740,8 @@ class CartTest(CartTestMixin, TestCase):
         self.shirt.hide_without_voucher = True
         self.shirt.save()
         self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
-            'variation_%d_%d_voucher' % (self.shirt.id, self.shirt_red.id): v.code,
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 1)
@@ -731,3 +756,123 @@ class CartTest(CartTestMixin, TestCase):
         }, follow=True)
         objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
         self.assertEqual(len(objs), 0)
+
+    def test_voucher_multiuse_ok(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=0)
+        self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '2',
+            '_voucher_code': v.code,
+        }, follow=True)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert positions.exists()
+        assert all(cp.voucher == v for cp in positions)
+
+    def test_voucher_multiuse_multiprod_ok(self):
+        v = Voucher.objects.create(quota=self.quota_all, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=0)
+        self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert positions.exists()
+        assert all(cp.voucher == v for cp in positions)
+
+    def test_voucher_multiuse_partially(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=1)
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '2',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('only be redeemed 1 more time', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert not positions.exists()
+
+    def test_voucher_multiuse_multiprod_partially(self):
+        v = Voucher.objects.create(quota=self.quota_all, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=1)
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert positions.count() == 1
+        assert all(cp.voucher == v for cp in positions)
+
+    def test_voucher_multiuse_redeemed(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=2)
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '2',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert not positions.exists()
+
+    def test_voucher_multiuse_multiprod_redeemed(self):
+        v = Voucher.objects.create(quota=self.quota_all, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=2)
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert not positions.exists()
+
+    def test_voucher_multiuse_redeemed_in_my_cart(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=1)
+        CartPosition.objects.create(
+            expires=now() - timedelta(minutes=10), item=self.ticket, voucher=v, price=Decimal('12.00'),
+            event=self.event, cart_id=self.session_key
+        )
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert positions.count() == 1
+
+    def test_voucher_multiuse_redeemed_in_other_cart(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=1)
+        CartPosition.objects.create(
+            expires=now() + timedelta(minutes=10), item=self.ticket, voucher=v, price=Decimal('12.00'),
+            event=self.event, cart_id='other'
+        )
+        response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertIn('already been used', doc.select('.alert-danger')[0].text)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert not positions.exists()
+
+    def test_voucher_multiuse_redeemed_in_other_expired_cart(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   max_usages=2, redeemed=1)
+        CartPosition.objects.create(
+            expires=now() - timedelta(minutes=10), item=self.ticket, voucher=v, price=Decimal('12.00'),
+            event=self.event, cart_id='other'
+        )
+        self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+            'item_%d' % self.ticket.id: '1',
+            '_voucher_code': v.code,
+        }, follow=True)
+        positions = CartPosition.objects.filter(cart_id=self.session_key, event=self.event)
+        assert positions.count() == 1

src/tests/presale/test_checkout.py

@@ -309,7 +309,7 @@ class CheckoutTestCase(TestCase):
         self.assertEqual(Order.objects.count(), 1)
         self.assertEqual(OrderPosition.objects.count(), 1)
         self.assertEqual(OrderPosition.objects.first().voucher, v)
-        self.assertTrue(Voucher.objects.get(pk=v.pk).redeemed)
+        self.assertEqual(Voucher.objects.get(pk=v.pk).redeemed, 1)
 
     def test_voucher_required(self):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
@@ -325,7 +325,7 @@ class CheckoutTestCase(TestCase):
         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(".thank-you")), 1)
-        self.assertTrue(Voucher.objects.get(pk=v.pk).redeemed)
+        self.assertEqual(Voucher.objects.get(pk=v.pk).redeemed, 1)
 
     def test_voucher_required_but_missing(self):
         self.ticket.require_voucher = True
@@ -369,7 +369,7 @@ class CheckoutTestCase(TestCase):
 
     def test_voucher_redeemed(self):
         v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
-                                   valid_until=now() + timedelta(days=2), redeemed=True)
+                                   valid_until=now() + timedelta(days=2), redeemed=1)
         CartPosition.objects.create(
             event=self.event, cart_id=self.session_key, item=self.ticket,
             price=12, expires=now() - timedelta(minutes=10), voucher=v
@@ -379,6 +379,102 @@ class CheckoutTestCase(TestCase):
         doc = BeautifulSoup(response.rendered_content, "lxml")
         self.assertIn("has already been", doc.select(".alert-danger")[0].text)
 
+    def test_voucher_multiuse_redeemed(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   valid_until=now() + timedelta(days=2), max_usages=3, redeemed=3)
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        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.assertIn("has already been", doc.select(".alert-danger")[0].text)
+
+    def test_voucher_multiuse_partially(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   valid_until=now() + timedelta(days=2), max_usages=3, redeemed=2)
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        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.assertIn("has already been", doc.select(".alert-danger")[0].text)
+        assert CartPosition.objects.filter(cart_id=self.session_key).count() == 1
+
+    def test_voucher_multiuse_ok(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   valid_until=now() + timedelta(days=2), max_usages=3, redeemed=1)
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        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(".thank-you")), 1)
+        self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key).exists())
+        self.assertEqual(Order.objects.count(), 1)
+        self.assertEqual(OrderPosition.objects.count(), 2)
+        v.refresh_from_db()
+        assert v.redeemed == 3
+
+    def test_voucher_multiuse_in_other_cart_expired(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   valid_until=now() + timedelta(days=2), max_usages=3, redeemed=1)
+        CartPosition.objects.create(
+            event=self.event, cart_id='other', item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        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(".thank-you")), 1)
+        self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key).exists())
+        self.assertEqual(Order.objects.count(), 1)
+        self.assertEqual(OrderPosition.objects.count(), 2)
+        v.refresh_from_db()
+        assert v.redeemed == 3
+
+    def test_voucher_multiuse_in_other_cart(self):
+        v = Voucher.objects.create(item=self.ticket, price=Decimal('12.00'), event=self.event,
+                                   valid_until=now() + timedelta(days=2), max_usages=3, redeemed=1)
+        CartPosition.objects.create(
+            event=self.event, cart_id='other', item=self.ticket,
+            price=12, expires=now() + timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
+        )
+        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.assertIn("has already been", doc.select(".alert-danger")[0].text)
+        assert CartPosition.objects.filter(cart_id=self.session_key).count() == 1
+
     def test_voucher_ignore_quota(self):
         self.quota_tickets.size = 0
         self.quota_tickets.save()
@@ -428,16 +524,16 @@ class CheckoutTestCase(TestCase):
         q2 = self.event.quotas.create(name='Testquota', size=0)
         q2.items.add(self.ticket)
         v = Voucher.objects.create(quota=self.quota_tickets, price=Decimal('12.00'), event=self.event,
-                                   valid_until=now() - timedelta(days=2), block_quota=True)
+                                   valid_until=now() + timedelta(days=2), block_quota=True)
         CartPosition.objects.create(
             event=self.event, cart_id=self.session_key, item=self.ticket,
-            price=12, expires=now() + timedelta(minutes=10), voucher=v
+            price=12, expires=now() - timedelta(minutes=10), voucher=v
         )
         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)
+        self.assertTrue(doc.select(".alert-danger"))
         self.assertFalse(Order.objects.exists())
 
     def test_voucher_double(self):

src/tests/presale/test_event.py

@@ -305,7 +305,7 @@ class VoucherRedeemItemDisplayTest(EventTestMixin, SoupTest):
         assert "14.00" not in html.rendered_content
 
     def test_fail_redeemed(self):
-        self.v.redeemed = True
+        self.v.redeemed = 1
         self.v.save()
         html = self.client.get('/%s/%s/redeem?voucher=%s' % (self.orga.slug, self.event.slug, self.v.code), follow=True)
         assert "alert-danger" in html.rendered_content