CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to mark add-ons as "included" in price

Browse Source
This commit is contained in:
Raphael Michel
2017-07-12 18:42:09 +02:00
parent 79562e7ad9
commit c1158c3175
11 changed files with 163 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1306,6 +1306,26 @@ class CartAddonTest(CartTestMixin, TestCase):
self.addon1 = ItemAddOn.objects.create(base_item=self.ticket, addon_category=self.workshopcat)
self.cm = CartManager(event=self.event, cart_id=self.session_key)
def test_cart_set_simple_addon_included(self):
self.addon1.price_included = True
self.addon1.save()
cp1 = CartPosition.objects.create(
expires=now() + timedelta(minutes=10), item=self.ticket, price=Decimal('23.00'),
event=self.event, cart_id=self.session_key
)
self.cm.set_addons([
{
'addon_to': cp1.pk,
'item': self.workshop1.pk,
'variation': None
}
])
self.cm.commit()
cp2 = cp1.addons.first()
assert cp2.item == self.workshop1
assert cp2.price == 0
def test_cart_set_simple_addon(self):
cp1 = CartPosition.objects.create(
expires=now() + timedelta(minutes=10), item=self.ticket, price=Decimal('23.00'),
@@ -1322,6 +1342,7 @@ class CartAddonTest(CartTestMixin, TestCase):
self.cm.commit()
cp2 = cp1.addons.first()
assert cp2.item == self.workshop1
assert cp2.price == 12
def test_cart_subevent_set_simple_addon(self):
self.event.has_subevents = True
@@ -1345,6 +1366,7 @@ class CartAddonTest(CartTestMixin, TestCase):
cp2 = cp1.addons.first()
assert cp2.item == self.workshop1
assert cp2.subevent == se
assert cp2.value == 12
def test_cart_subevent_set_addon_for_wrong_subevent(self):
self.event.has_subevents = True

36
src/tests/presale/test_checkout.py
View File

@@ -407,6 +407,25 @@ class CheckoutTestCase(TestCase):
cr1 = CartPosition.objects.get(id=cr1.id)
self.assertEqual(cr1.price, 24)
def test_addon_price_included(self):
ItemAddOn.objects.create(base_item=self.ticket, addon_category=self.workshopcat, min_count=1,
price_included=True)
cp1 = CartPosition.objects.create(
event=self.event, cart_id=self.session_key, item=self.ticket,
price=23, expires=now() - timedelta(minutes=10)
)
CartPosition.objects.create(
event=self.event, cart_id=self.session_key, item=self.workshop1,
price=0, expires=now() - timedelta(minutes=10),
addon_to=cp1
)
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.assertEqual(OrderPosition.objects.filter(item=self.workshop1).last().price, 0)
def test_confirm_price_changed(self):
self.ticket.default_price = 24
self.ticket.save()
@@ -953,6 +972,23 @@ class CheckoutTestCase(TestCase):
response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug))
self.assertRedirects(response, '/%s/%s/checkout/addons/' % (self.orga.slug, self.event.slug),
target_status_code=200)
response = self.client.get('/%s/%s/checkout/addons/' % (self.orga.slug, self.event.slug))
assert 'Workshop 1' in response.rendered_content
assert 'EUR 12.00' in response.rendered_content
def test_set_addons_included(self):
ItemAddOn.objects.create(base_item=self.ticket, addon_category=self.workshopcat, min_count=1,
price_included=True)
CartPosition.objects.create(
event=self.event, cart_id=self.session_key, item=self.ticket,
price=23, expires=now() - timedelta(minutes=10)
)
response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True)
self.assertRedirects(response, '/%s/%s/checkout/addons/' % (self.orga.slug, self.event.slug),
target_status_code=200)
assert 'Workshop 1' in response.rendered_content
assert 'EUR 12.00' not in response.rendered_content
def test_set_addons_subevent(self):
self.event.has_subevents = True