Refs #85 -- Do not sell tickets that are marked as inactive

This commit is contained in:
Raphael Michel
2015-08-13 11:44:18 +02:00
parent 4277e689b8
commit 56961337ae
4 changed files with 15 additions and 3 deletions

View File

@@ -80,6 +80,9 @@ def check_positions(event, dt, positions, quotas_locked):
err = None err = None
for i, cp in enumerate(positions): for i, cp in enumerate(positions):
if not cp.item.active:
err = err or error_messages['unavailable']
continue
quotas = list(cp.item.quotas.all()) if cp.variation is None else list(cp.variation.quotas.all()) quotas = list(cp.item.quotas.all()) if cp.variation is None else list(cp.variation.quotas.all())
if cp.expires >= dt: if cp.expires >= dt:
# Other checks are not necessary # Other checks are not necessary

View File

@@ -208,7 +208,7 @@ class CartAdd(EventViewMixin, CartActionMixin, View):
# Fetch all quotas. If there are no quotas, this item is not allowed to be sold. # Fetch all quotas. If there are no quotas, this item is not allowed to be sold.
quotas = list(item.quotas.all()) if variation is None else list(variation.quotas.all()) quotas = list(item.quotas.all()) if variation is None else list(variation.quotas.all())
if price is False or len(quotas) == 0: if price is False or len(quotas) == 0 or not item.active:
self.error_message(self.error_messages['unavailable']) self.error_message(self.error_messages['unavailable'])
continue continue

View File

@@ -34,7 +34,9 @@ class EventIndex(EventViewMixin, CartDisplayMixin, TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
# Fetch all items # Fetch all items
items = self.request.event.items.all().select_related( items = self.request.event.items.all().filter(
active=True
).select_related(
'category', # for re-grouping 'category', # for re-grouping
).prefetch_related( ).prefetch_related(
'properties', # for .get_all_available_variations() 'properties', # for .get_all_available_variations()

View File

@@ -43,9 +43,16 @@ class ItemDisplayTest(EventTestMixin, BrowserTest):
super().setUp() super().setUp()
self.driver.implicitly_wait(10) self.driver.implicitly_wait(10)
def test_not_active(self):
q = Quota.objects.create(event=self.event, name='Quota', size=2)
item = Item.objects.create(event=self.event, name='Early-bird ticket', default_price=0, active=False)
q.items.add(item)
self.driver.get('%s/%s/%s/' % (self.live_server_url, self.orga.slug, self.event.slug))
self.assertNotIn("Early-bird", self.driver.find_element_by_css_selector("body").text)
def test_without_category(self): def test_without_category(self):
q = Quota.objects.create(event=self.event, name='Quota', size=2) q = Quota.objects.create(event=self.event, name='Quota', size=2)
item = Item.objects.create(event=self.event, name='Early-bird ticket', default_price=0) item = Item.objects.create(event=self.event, name='Early-bird ticket', default_price=0, active=True)
q.items.add(item) q.items.add(item)
self.driver.get('%s/%s/%s/' % (self.live_server_url, self.orga.slug, self.event.slug)) self.driver.get('%s/%s/%s/' % (self.live_server_url, self.orga.slug, self.event.slug))
self.assertIn("Early-bird", self.driver.find_element_by_css_selector("section .product-row:first-child").text) self.assertIn("Early-bird", self.driver.find_element_by_css_selector("section .product-row:first-child").text)