diff --git a/src/pretix/base/migrations/0004_auto_20151024_0848.py b/src/pretix/base/migrations/0004_auto_20151024_0848.py new file mode 100644 index 0000000000..5d12fd7501 --- /dev/null +++ b/src/pretix/base/migrations/0004_auto_20151024_0848.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0003_event_is_public'), + ] + + operations = [ + migrations.RenameField( + model_name='cartposition', + old_name='session', + new_name='cart_id' + ), + migrations.AlterField( + model_name='cartposition', + name='cart_id', + field=models.CharField(blank=True, verbose_name='Cart ID (e.g. session key)', max_length=255, null=True), + ), + ] diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index e24a09abeb..ccf24ef573 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -369,8 +369,8 @@ class CartPosition(ObjectWithAnswers, Versionable): :type event: Evnt :param item: The selected item :type item: Item - :param session: The user session that contains this cart position - :type session: str + :param cart_id: The user session that contains this cart position + :type cart_id: str :param variation: The selected ItemVariation or null, if the item has no properties :type variation: ItemVariation :param datetime: The datetime this item was put into the cart @@ -386,9 +386,9 @@ class CartPosition(ObjectWithAnswers, Versionable): Event, verbose_name=_("Event") ) - session = models.CharField( + cart_id = models.CharField( max_length=255, null=True, blank=True, - verbose_name=_("Session") + verbose_name=_("Cart ID (e.g. session key)") ) item = VersionedForeignKey( Item, diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index 582b026ce7..9ffcf5468b 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -403,7 +403,7 @@ class FreeOrderProvider(BasePaymentProvider): def payment_is_valid_session(self, request: HttpRequest) -> bool: return CartPosition.objects.current.filter( - Q(session=request.session.session_key) & Q(event=request.event) + Q(cart_id=request.session.session_key) & Q(event=request.event) ).aggregate(sum=Sum('price'))['sum'] == 0 @property @@ -446,7 +446,7 @@ class FreeOrderProvider(BasePaymentProvider): def is_allowed(self, request: HttpRequest) -> bool: return CartPosition.objects.current.filter( - session=request.session.session_key, event=request.event + cart_id=request.session.session_key, event=request.event ).aggregate(sum=Sum('price'))['sum'] == 0 diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index a8cae4f349..400a591851 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -29,21 +29,21 @@ error_messages = { } -def _extend_existing(event, session, expiry): +def _extend_existing(event, cart_id, expiry): # Extend this user's cart session to 30 minutes from now to ensure all items in the # cart expire at the same time # We can extend the reservation of items which are not yet expired without risk CartPosition.objects.current.filter( - Q(session=session) & Q(event=event) & Q(expires__gt=now()) + Q(cart_id=cart_id) & Q(event=event) & Q(expires__gt=now()) ).update(expires=expiry) -def _re_add_expired_positions(items, event, session): +def _re_add_expired_positions(items, event, cart_id): positions = set() # For items that are already expired, we have to delete and re-add them, as they might # be no longer available or prices might have changed. Sorry! expired = CartPosition.objects.current.filter( - Q(session=session) & Q(event=event) & Q(expires__lte=now()) + Q(cart_id=cart_id) & Q(event=event) & Q(expires__lte=now()) ) for cp in expired: items.insert(0, (cp.item_id, cp.variation_id, 1, cp)) @@ -64,7 +64,7 @@ def _check_date(event): raise CartError(error_messages['ended']) -def _add_items(event, items, session, expiry): +def _add_items(event, items, cart_id, expiry): err = None # Fetch items from the database @@ -124,33 +124,33 @@ def _add_items(event, items, session, expiry): else: CartPosition.objects.create( event=event, item=item, variation=variation, price=price, expires=expiry, - session=session + cart_id=cart_id ) return err -def _add_items_to_cart(event: Event, items: list, session: str=None): +def _add_items_to_cart(event: Event, items: list, cart_id: str=None): with event.lock(): _check_date(event) - existing = CartPosition.objects.current.filter(Q(session=session) & Q(event=event)).count() + existing = CartPosition.objects.current.filter(Q(cart_id=cart_id) & Q(event=event)).count() if sum(i[2] for i in items) + existing > int(event.settings.max_items_per_order): # TODO: i18n plurals raise CartError(error_messages['max_items'] % event.settings.max_items_per_order) expiry = now() + timedelta(minutes=event.settings.get('reservation_time', as_type=int)) - _extend_existing(event, session, expiry) + _extend_existing(event, cart_id, expiry) - expired = _re_add_expired_positions(items, event, session) + expired = _re_add_expired_positions(items, event, cart_id) if not items: raise CartError(error_messages['empty']) - err = _add_items(event, items, session, expiry) + err = _add_items(event, items, cart_id, expiry) _delete_expired(expired) if err: raise CartError(err) -def add_items_to_cart(event: str, items: list, session: str=None): +def add_items_to_cart(event: str, items: list, cart_id: str=None): """ Adds a list of items to a user's cart. :param event: The event ID in question @@ -160,12 +160,12 @@ def add_items_to_cart(event: str, items: list, session: str=None): """ event = Event.objects.current.get(identity=event) try: - return _add_items_to_cart(event, items, session) + return _add_items_to_cart(event, items, cart_id) except EventLock.LockTimeoutException: raise CartError(error_messages['busy']) -def remove_items_from_cart(event: str, items: list, session: str=None): +def remove_items_from_cart(event: str, items: list, cart_id: str=None): """ Removes a list of items from a user's cart. :param event: The event ID in question @@ -175,7 +175,7 @@ def remove_items_from_cart(event: str, items: list, session: str=None): event = Event.objects.current.get(identity=event) for item, variation, cnt in items: - cw = Q(session=session) & Q(item_id=item) & Q(event=event) + cw = Q(cart_id=cart_id) & Q(item_id=item) & Q(event=event) if variation: cw &= Q(variation_id=variation) else: @@ -188,10 +188,10 @@ if settings.HAS_CELERY: from pretix.celery import app @app.task(bind=True, max_retries=5, default_retry_delay=2) - def add_items_to_cart_task(self, event: str, items: list, session: str): + def add_items_to_cart_task(self, event: str, items: list, cart_id: str): event = Event.objects.current.get(identity=event) try: - return _add_items_to_cart(event, items, session) + return _add_items_to_cart(event, items, cart_id) except EventLock.LockTimeoutException: self.retry(exc=CartError(error_messages['busy'])) diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index e07186533a..5515595e4d 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -194,7 +194,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): @cached_property def _total_order_value(self): return CartPosition.objects.current.filter( - Q(session=self.request.session.session_key) & Q(event=self.request.event) + Q(cart_id=self.request.session.session_key) & Q(event=self.request.event) ).aggregate(sum=Sum('price'))['sum'] @cached_property diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 2a872f772e..67d9cddda7 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -15,7 +15,7 @@ class CartMixin: A list of this users cart position """ return list(CartPosition.objects.current.filter( - session=self.request.session.session_key, event=self.request.event + cart_id=self.request.session.session_key, event=self.request.event ).order_by( 'item', 'variation' ).select_related( @@ -27,7 +27,7 @@ class CartMixin: def get_cart(self, answers=False, queryset=None, payment_fee=None): queryset = queryset or CartPosition.objects.current.filter( - session=self.request.session.session_key, event=self.request.event + cart_id=self.request.session.session_key, event=self.request.event ) prefetch = ['variation__values', 'variation__values__prop'] diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index f8be4fffd8..51477e7184 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -56,7 +56,7 @@ class CartTest(CartTestMixin, TestCase): self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[1].text) - objs = list(CartPosition.objects.filter(session=self.session_key, event=self.event)) + 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) @@ -74,7 +74,7 @@ class CartTest(CartTestMixin, TestCase): self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('14', doc.select('.cart .cart-row')[0].select('.price')[0].text) self.assertIn('14', doc.select('.cart .cart-row')[0].select('.price')[1].text) - objs = list(CartPosition.objects.filter(session=self.session_key, event=self.event)) + 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) @@ -91,7 +91,7 @@ class CartTest(CartTestMixin, TestCase): self.assertIn('2', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) self.assertIn('46', doc.select('.cart .cart-row')[0].select('.price')[1].text) - objs = list(CartPosition.objects.filter(session=self.session_key, event=self.event)) + objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event)) self.assertEqual(len(objs), 2) for obj in objs: self.assertEqual(obj.item, self.ticket) @@ -108,7 +108,7 @@ class CartTest(CartTestMixin, TestCase): doc = BeautifulSoup(response.rendered_content) self.assertIn('Early-bird', doc.select('.cart')[0].text) self.assertIn('Shirt', doc.select('.cart')[0].text) - objs = list(CartPosition.objects.filter(session=self.session_key, event=self.event)) + objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event)) self.assertEqual(len(objs), 3) self.assertIn(self.shirt, [obj.item for obj in objs]) self.assertIn(self.shirt_red, [obj.variation for obj in objs]) @@ -122,7 +122,7 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('numbers only', doc.select('.alert-danger')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { }, follow=True) @@ -130,7 +130,7 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('did not select any products', doc.select('.alert-warning')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) def test_wrong_event(self): event2 = Event.objects.create( @@ -145,7 +145,7 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('not available', doc.select('.alert-danger')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) def test_no_quota(self): shirt2 = Item.objects.create(event=self.event, name='T-Shirt', default_price=12) @@ -156,11 +156,11 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('no longer available', doc.select('.alert-danger')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) def test_max_items(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) self.event.settings.max_items_per_order = 5 @@ -171,7 +171,7 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('more than', doc.select('.alert-danger')[0].text) - self.assertEqual(CartPosition.objects.filter(session=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_quota_full(self): self.quota_tickets.size = 0 @@ -183,7 +183,7 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('no longer available', doc.select('.alert-danger')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) def test_quota_partly(self): self.quota_tickets.size = 1 @@ -199,7 +199,7 @@ class CartTest(CartTestMixin, TestCase): self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[1].text) - objs = list(CartPosition.objects.filter(session=self.session_key, event=self.event)) + 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) @@ -207,7 +207,7 @@ class CartTest(CartTestMixin, TestCase): def test_renew_in_time(self): cp = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -217,7 +217,7 @@ class CartTest(CartTestMixin, TestCase): def test_renew_expired_successfully(self): cp1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -231,7 +231,7 @@ class CartTest(CartTestMixin, TestCase): def test_renew_questions(self): cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) q1 = Question.objects.create( @@ -252,7 +252,7 @@ class CartTest(CartTestMixin, TestCase): self.quota_tickets.size = 0 self.quota_tickets.save() cp1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -271,7 +271,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - objs = list(CartPosition.objects.current.filter(session=self.session_key, event=self.event)) + objs = list(CartPosition.objects.current.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) @@ -288,11 +288,11 @@ class CartTest(CartTestMixin, TestCase): target_status_code=200) doc = BeautifulSoup(response.rendered_content) self.assertIn('no longer available', doc.select('.alert-danger')[0].text) - self.assertFalse(CartPosition.objects.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) def test_remove_simple(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { @@ -300,11 +300,11 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) doc = BeautifulSoup(response.rendered_content) self.assertIn('updated', doc.select('.alert-success')[0].text) - self.assertFalse(CartPosition.objects.current.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.current.filter(cart_id=self.session_key, event=self.event).exists()) def test_remove_variation(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.shirt, variation=self.shirt_red, + event=self.event, cart_id=self.session_key, item=self.shirt, variation=self.shirt_red, price=14, expires=now() + timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { @@ -312,15 +312,15 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) doc = BeautifulSoup(response.rendered_content) self.assertIn('updated', doc.select('.alert-success')[0].text) - self.assertFalse(CartPosition.objects.current.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.current.filter(cart_id=self.session_key, event=self.event).exists()) def test_remove_one_of_multiple(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { @@ -328,15 +328,15 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) doc = BeautifulSoup(response.rendered_content) self.assertIn('updated', doc.select('.alert-success')[0].text) - self.assertEqual(CartPosition.objects.current.filter(session=self.session_key, event=self.event).count(), 1) + self.assertEqual(CartPosition.objects.current.filter(cart_id=self.session_key, event=self.event).count(), 1) def test_remove_multiple(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { @@ -344,15 +344,15 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) doc = BeautifulSoup(response.rendered_content) self.assertIn('updated', doc.select('.alert-success')[0].text) - self.assertFalse(CartPosition.objects.current.filter(session=self.session_key, event=self.event).exists()) + self.assertFalse(CartPosition.objects.current.filter(cart_id=self.session_key, event=self.event).exists()) def test_remove_most_expensive(self): CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=20, expires=now() + timedelta(minutes=10) ) response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { @@ -360,7 +360,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) doc = BeautifulSoup(response.rendered_content) self.assertIn('updated', doc.select('.alert-success')[0].text) - objs = list(CartPosition.objects.current.filter(session=self.session_key, event=self.event)) + objs = list(CartPosition.objects.current.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) diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py index 4ef632cd0d..a64a27d53d 100644 --- a/src/tests/presale/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -50,11 +50,11 @@ class CheckoutTestCase(TestCase): self.ticket.questions.add(q1) self.ticket.questions.add(q2) cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) cr2 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=20, expires=now() + timedelta(minutes=10) ) response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True) @@ -98,7 +98,7 @@ class CheckoutTestCase(TestCase): self.event.settings.set('attendee_names_asked', True) self.event.settings.set('attendee_names_required', True) cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + 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) @@ -128,7 +128,7 @@ class CheckoutTestCase(TestCase): self.event.settings.set('attendee_names_asked', True) self.event.settings.set('attendee_names_required', False) cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + 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) @@ -151,7 +151,7 @@ class CheckoutTestCase(TestCase): self.event.settings.set('payment_stripe__enabled', True) self.event.settings.set('payment_banktransfer__enabled', True) CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + 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/payment/' % (self.orga.slug, self.event.slug), follow=True) @@ -171,7 +171,7 @@ class CheckoutTestCase(TestCase): self.event.settings.set('payment_stripe__enabled', True) self.event.settings.set('payment_banktransfer__enabled', True) cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) @@ -219,7 +219,7 @@ class CheckoutTestCase(TestCase): def test_confirm_in_time(self): cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() + timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -233,7 +233,7 @@ class CheckoutTestCase(TestCase): def test_confirm_expired_available(self): cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -250,7 +250,7 @@ class CheckoutTestCase(TestCase): self.ticket.default_price = 24 self.ticket.save() cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -265,11 +265,11 @@ class CheckoutTestCase(TestCase): self.quota_tickets.size = 1 self.quota_tickets.save() CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -277,14 +277,14 @@ class CheckoutTestCase(TestCase): response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) doc = BeautifulSoup(response.rendered_content) self.assertEqual(len(doc.select(".alert-danger")), 1) - self.assertEqual(CartPosition.objects.current.filter(session=self.session_key).count(), 1) + self.assertEqual(CartPosition.objects.current.filter(cart_id=self.session_key).count(), 1) def test_confirm_inactive(self): self.ticket = self.ticket.clone() self.ticket.active = False self.ticket.save() cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -298,7 +298,7 @@ class CheckoutTestCase(TestCase): self.quota_tickets.size = 0 self.quota_tickets.save() cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer') @@ -311,7 +311,7 @@ class CheckoutTestCase(TestCase): def test_confirm_completely_unavailable(self): self.quota_tickets.items.remove(self.ticket) cr1 = CartPosition.objects.create( - event=self.event, session=self.session_key, item=self.ticket, + event=self.event, cart_id=self.session_key, item=self.ticket, price=23, expires=now() - timedelta(minutes=10) ) self._set_session('payment', 'banktransfer')