CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Do not allow vouchers to create negative prices

Browse Source
This commit is contained in:
Raphael Michel
2017-08-07 10:31:25 +02:00
parent e4ab27a292
commit e858edd85c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/models/vouchers.py
View File

@@ -251,7 +251,7 @@ class Voucher(LoggedModel):
if self.price_mode == 'set': if self.price_mode == 'set':
return self.value return self.value
elif self.price_mode == 'subtract': elif self.price_mode == 'subtract':
return original_price - self.value return max(original_price - self.value, Decimal('0.00'))
elif self.price_mode == 'percent': elif self.price_mode == 'percent':
return round_decimal(original_price * (Decimal('100.00') - self.value) / Decimal('100.00')) return round_decimal(original_price * (Decimal('100.00') - self.value) / Decimal('100.00'))
return original_price return original_price

12
src/tests/presale/test_cart.py
View File

@@ -944,6 +944,18 @@ class CartTest(CartTestMixin, TestCase):
self.assertIsNone(objs[0].variation) self.assertIsNone(objs[0].variation)
self.assertEqual(objs[0].price, Decimal('12.00')) self.assertEqual(objs[0].price, Decimal('12.00'))
def test_voucher_price_negative(self):
v = Voucher.objects.create(item=self.ticket, value=Decimal('1337.00'), event=self.event, price_mode='subtract')
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)
objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
self.assertEqual(len(objs), 1)
self.assertEqual(objs[0].item, self.ticket)
self.assertIsNone(objs[0].variation)
self.assertEqual(objs[0].price, Decimal('0.00'))
def test_voucher_price_percent(self): def test_voucher_price_percent(self):
v = Voucher.objects.create(item=self.ticket, value=Decimal('10.00'), price_mode='percent', event=self.event) v = Voucher.objects.create(item=self.ticket, value=Decimal('10.00'), price_mode='percent', event=self.event)
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {