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

Fix #1524 -- Bug in CartManager's max_per_item validation

Browse Source
This commit is contained in:
Raphael Michel
2019-12-16 09:44:42 +01:00
parent e1a4dd6e43
commit c1fa0d1559
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/base/services/cart.py
View File

@@ -233,7 +233,7 @@ class CartManager:
# TODO: i18n plurals # TODO: i18n plurals
raise CartError(_(error_messages['max_items']) % (self.event.settings.max_items_per_order,)) raise CartError(_(error_messages['max_items']) % (self.event.settings.max_items_per_order,))
def _check_item_constraints(self, op): def _check_item_constraints(self, op, current_ops=[]):
if isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation): if isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation):
if not ( if not (
(isinstance(op, self.AddOperation) and op.addon_to == 'FAKE') or (isinstance(op, self.AddOperation) and op.addon_to == 'FAKE') or
@@ -305,10 +305,10 @@ class CartManager:
if op.item.max_per_order or op.item.min_per_order: if op.item.max_per_order or op.item.min_per_order:
new_total = ( new_total = (
len([1 for p in self.positions if p.item_id == op.item.pk]) + len([1 for p in self.positions if p.item_id == op.item.pk]) +
sum([_op.count for _op in self._operations sum([_op.count for _op in self._operations + current_ops
if isinstance(_op, self.AddOperation) and _op.item == op.item]) + if isinstance(_op, self.AddOperation) and _op.item == op.item]) +
op.count - op.count -
len([1 for _op in self._operations len([1 for _op in self._operations + current_ops
if isinstance(_op, self.RemoveOperation) and _op.position.item_id == op.item.pk]) if isinstance(_op, self.RemoveOperation) and _op.position.item_id == op.item.pk])
) )
@@ -571,7 +571,7 @@ class CartManager:
voucher=None, quotas=bundle_quotas, addon_to='FAKE', subevent=subevent, voucher=None, quotas=bundle_quotas, addon_to='FAKE', subevent=subevent,
includes_tax=bool(bprice.rate), bundled=[], seat=None includes_tax=bool(bprice.rate), bundled=[], seat=None
) )
self._check_item_constraints(bop) self._check_item_constraints(bop, operations)
bundled.append(bop) bundled.append(bop)
price = self._get_price(item, variation, voucher, i.get('price'), subevent, bundled_sum=bundled_sum) price = self._get_price(item, variation, voucher, i.get('price'), subevent, bundled_sum=bundled_sum)
@@ -580,7 +580,7 @@ class CartManager:
count=i['count'], item=item, variation=variation, price=price, voucher=voucher, quotas=quotas, count=i['count'], item=item, variation=variation, price=price, voucher=voucher, quotas=quotas,
addon_to=False, subevent=subevent, includes_tax=bool(price.rate), bundled=bundled, seat=seat addon_to=False, subevent=subevent, includes_tax=bool(price.rate), bundled=bundled, seat=seat
) )
self._check_item_constraints(op) self._check_item_constraints(op, operations)
operations.append(op) operations.append(op)
self._quota_diff.update(quota_diff) self._quota_diff.update(quota_diff)
@@ -686,7 +686,7 @@ class CartManager:
count=1, item=item, variation=variation, price=price, voucher=None, quotas=quotas, count=1, item=item, variation=variation, price=price, voucher=None, quotas=quotas,
addon_to=cp, subevent=cp.subevent, includes_tax=bool(price.rate), bundled=[], seat=None addon_to=cp, subevent=cp.subevent, includes_tax=bool(price.rate), bundled=[], seat=None
) )
self._check_item_constraints(op) self._check_item_constraints(op, operations)
operations.append(op) operations.append(op)
# Check constraints on the add-on combinations # Check constraints on the add-on combinations

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

@@ -843,6 +843,20 @@ class CartTest(CartTestMixin, TestCase):
with scopes_disabled(): with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 1) self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 1)
def test_max_per_item_variations_failed(self):
self.shirt.max_per_order = 1
self.shirt.save()
response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
}, follow=True)
self.assertRedirects(response, '/%s/%s/?require_cookie=true' % (self.orga.slug, self.event.slug),
target_status_code=200)
doc = BeautifulSoup(response.rendered_content, "lxml")
self.assertIn('more than', doc.select('.alert-danger')[0].text)
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
def test_max_per_item_failed(self): def test_max_per_item_failed(self):
self.ticket.max_per_order = 2 self.ticket.max_per_order = 2
self.ticket.save() self.ticket.save()