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

Allow to restrict availability of variations by date, sales channel, and voucher (#2202)

Browse Source
This commit is contained in:
Raphael Michel
2021-09-15 12:04:17 +02:00
committed by GitHub
parent 4789d82c4e
commit 17adde99fa
20 changed files with 583 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/api/test_items.py
View File

@@ -44,6 +44,7 @@ from django_countries.fields import Country
from django_scopes import scopes_disabled
from pytz import UTC
from pretix.base.channels import get_all_sales_channels
from pretix.base.models import (
CartPosition, InvoiceAddress, Item, ItemAddOn, ItemBundle, ItemCategory,
ItemVariation, Order, OrderPosition, Question, QuestionOption, Quota,
@@ -376,6 +377,10 @@ def test_item_detail_variations(token_client, organizer, event, team, item):
"position": 0,
"require_membership": False,
"require_membership_types": [],
"sales_channels": list(get_all_sales_channels().keys()),
"available_from": None,
"available_until": None,
"hide_without_voucher": False,
"original_price": None
}]
res["has_variations"] = True
@@ -517,6 +522,7 @@ def test_item_create_with_variation(token_client, organizer, event, item, catego
new_item = Item.objects.get(pk=resp.data['id'])
assert new_item.variations.first().value.localize('de') == "Kommentar"
assert new_item.variations.first().value.localize('en') == "Comment"
assert set(new_item.variations.first().sales_channels) == set(get_all_sales_channels().keys())
@pytest.mark.django_db
@@ -1205,6 +1211,10 @@ TEST_VARIATIONS_RES = {
"price": "23.00",
"require_membership": False,
"require_membership_types": [],
"sales_channels": list(get_all_sales_channels().keys()),
"available_from": None,
"available_until": None,
"hide_without_voucher": False,
"original_price": None
}
@@ -1218,6 +1228,10 @@ TEST_VARIATIONS_UPDATE = {
"default_price": "20.0",
"require_membership": False,
"require_membership_types": [],
"sales_channels": ["web"],
"available_from": None,
"available_until": None,
"hide_without_voucher": False,
"original_price": None
}
@@ -1264,6 +1278,7 @@ def test_variations_create(token_client, organizer, event, item, variation):
var = ItemVariation.objects.get(pk=resp.data['id'])
assert var.position == 1
assert var.price == 23.0
assert set(var.sales_channels) == set(get_all_sales_channels().keys())
@pytest.mark.django_db
@@ -1302,6 +1317,7 @@ def test_variations_update(token_client, organizer, event, item, item3, variatio
"en": "ChildC2"
},
"position": 1,
"sales_channels": ["web"],
"default_price": "20.00",
"original_price": "50.00"
},

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

@@ -880,6 +880,24 @@ class CartTest(CartTestMixin, TestCase):
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
def test_variation_wrong_sales_channel(self):
self.shirt_blue.sales_channels = ['bar']
self.shirt_blue.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
}, follow=True)
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
self.shirt_blue.sales_channels = ['bar', 'web']
self.shirt_blue.save()
self.shirt.sales_channels = ['bar']
self.shirt.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
}, follow=True)
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
def test_other_sales_channel(self):
self.ticket.sales_channels = ['bar']
self.ticket.save()
@@ -965,6 +983,34 @@ class CartTest(CartTestMixin, TestCase):
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
def test_variation_in_time_available(self):
self.shirt_blue.available_until = now() + timedelta(days=2)
self.shirt_blue.available_from = now() - timedelta(days=2)
self.shirt_blue.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
}, follow=True)
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 1)
def test_variation_no_longer_available(self):
self.shirt_blue.available_until = now() - timedelta(days=2)
self.shirt_blue.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
}, follow=True)
with scopes_disabled():
self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 0)
def test_variation_not_yet_available(self):
self.shirt_blue.available_from = now() + timedelta(days=2)
self.shirt_blue.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_blue.id): '1',
}, follow=True)
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):
self.ticket.max_per_order = 2
self.ticket.save()
@@ -1751,6 +1797,44 @@ class CartTest(CartTestMixin, TestCase):
objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
self.assertEqual(len(objs), 0)
def test_variation_hide_without_voucher(self):
with scopes_disabled():
v = Voucher.objects.create(item=self.shirt, event=self.event)
self.shirt_red.hide_without_voucher = True
self.shirt_red.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
'_voucher_code': v.code
}, follow=True)
with scopes_disabled():
objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
self.assertEqual(len(objs), 1)
self.assertEqual(objs[0].item, self.shirt)
self.assertEqual(objs[0].variation, self.shirt_red)
def test_variation_hide_without_voucher_failed_because_of_voucher(self):
with scopes_disabled():
v = Voucher.objects.create(item=self.shirt, event=self.event, show_hidden_items=False)
self.shirt_red.hide_without_voucher = True
self.shirt_red.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
'_voucher_code': v.code
}, follow=True)
with scopes_disabled():
objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
self.assertEqual(len(objs), 0)
def test_variation_hide_without_voucher_failed(self):
self.shirt_red.hide_without_voucher = True
self.shirt_red.save()
self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1',
}, follow=True)
with scopes_disabled():
objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
self.assertEqual(len(objs), 0)
def test_voucher_multiuse_ok(self):
with scopes_disabled():
v = Voucher.objects.create(item=self.ticket, value=Decimal('12.00'), event=self.event,

48
src/tests/presale/test_event.py
View File

@@ -455,6 +455,54 @@ class ItemDisplayTest(EventTestMixin, SoupTest):
q.variations.add(var1)
self._assert_variation_found()
def test_variation_available_from(self):
with scopes_disabled():
c = ItemCategory.objects.create(event=self.event, name="Entry tickets", position=0)
q = Quota.objects.create(event=self.event, name='Quota', size=None)
item = Item.objects.create(event=self.event, name='Early-bird ticket', category=c, default_price=0)
var1 = ItemVariation.objects.create(item=item, value='Red', available_from=now() - datetime.timedelta(days=1))
var2 = ItemVariation.objects.create(item=item, value='Blue', available_from=now() + datetime.timedelta(days=1))
q.items.add(item)
q.variations.add(var1)
q.variations.add(var2)
self._assert_variation_found()
def test_variation_available_until(self):
with scopes_disabled():
c = ItemCategory.objects.create(event=self.event, name="Entry tickets", position=0)
q = Quota.objects.create(event=self.event, name='Quota', size=None)
item = Item.objects.create(event=self.event, name='Early-bird ticket', category=c, default_price=0)
var1 = ItemVariation.objects.create(item=item, value='Red', available_until=now() + datetime.timedelta(days=1))
var2 = ItemVariation.objects.create(item=item, value='Blue', available_until=now() - datetime.timedelta(days=1))
q.items.add(item)
q.variations.add(var1)
q.variations.add(var2)
self._assert_variation_found()
def test_variation_hide_without_voucher(self):
with scopes_disabled():
c = ItemCategory.objects.create(event=self.event, name="Entry tickets", position=0)
q = Quota.objects.create(event=self.event, name='Quota', size=None)
item = Item.objects.create(event=self.event, name='Early-bird ticket', category=c, default_price=0)
var1 = ItemVariation.objects.create(item=item, value='Red')
var2 = ItemVariation.objects.create(item=item, value='Blue', hide_without_voucher=True)
q.items.add(item)
q.variations.add(var1)
q.variations.add(var2)
self._assert_variation_found()
def test_variation_sales_channel(self):
with scopes_disabled():
c = ItemCategory.objects.create(event=self.event, name="Entry tickets", position=0)
q = Quota.objects.create(event=self.event, name='Quota', size=None)
item = Item.objects.create(event=self.event, name='Early-bird ticket', category=c, default_price=0)
var1 = ItemVariation.objects.create(item=item, value='Red')
var2 = ItemVariation.objects.create(item=item, value='Blue', sales_channels=['foobar'])
q.items.add(item)
q.variations.add(var1)
q.variations.add(var2)
self._assert_variation_found()
def _assert_variation_found(self):
doc = self.get_doc('/%s/%s/' % (self.orga.slug, self.event.slug))
self.assertIn("Early-bird", doc.select("section:nth-of-type(1) div:nth-of-type(1)")[0].text)