diff --git a/src/pretix/base/migrations/0005_auto_20160211_1459.py b/src/pretix/base/migrations/0005_auto_20160211_1459.py new file mode 100644 index 0000000000..74382e7274 --- /dev/null +++ b/src/pretix/base/migrations/0005_auto_20160211_1459.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-02-11 14:59 +from __future__ import unicode_literals + +from django.db import migrations, models + +import pretix.base.models.vouchers + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0004_auto_20160209_1023'), + ] + + operations = [ + migrations.AddField( + model_name='voucher', + name='redeemed', + field=models.BooleanField(default=False, verbose_name='Redeemed'), + ), + migrations.AlterField( + model_name='voucher', + name='code', + field=models.CharField(default=pretix.base.models.vouchers.generate_code, max_length=255, verbose_name='Voucher code'), + ), + ] diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index ed6928f644..f9f75a1301 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -475,12 +475,24 @@ class Quota(LoggedModel): if size_left <= 0: return Quota.AVAILABILITY_ORDERED, 0 + size_left -= self.count_blocking_vouchers() + if size_left <= 0: + return Quota.AVAILABILITY_ORDERED, 0 + size_left -= self.count_in_cart() if size_left <= 0: return Quota.AVAILABILITY_RESERVED, 0 return Quota.AVAILABILITY_OK, size_left + def count_blocking_vouchers(self) -> int: + from pretix.base.models import Voucher + return Voucher.objects.filter( + item__quotas__in=[self], + block_quota=True, + redeemed=False + ).count() + def count_in_cart(self) -> int: from pretix.base.models import CartPosition diff --git a/src/pretix/base/models/vouchers.py b/src/pretix/base/models/vouchers.py index e9909eb9f9..2b4cba1215 100644 --- a/src/pretix/base/models/vouchers.py +++ b/src/pretix/base/models/vouchers.py @@ -28,6 +28,10 @@ class Voucher(LoggedModel): verbose_name=_("Voucher code"), max_length=255, default=generate_code ) + redeemed = models.BooleanField( + verbose_name=_("Redeemed"), + default=False + ) valid_until = models.DateTimeField( blank=True, null=True, verbose_name=_("Valid until") @@ -71,6 +75,11 @@ class Voucher(LoggedModel): def save(self, *args, **kwargs): self.code = self.code.upper() super().save(*args, **kwargs) + self.event.get_cache().set('vouchers_exist', True) + + def delete(self, using=None, keep_parents=False): + super().delete(using, keep_parents) + self.event.get_cache().delete('vouchers_exist') def is_ordered(self) -> int: return OrderPosition.objects.filter( diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 9c7498508d..5bb207282c 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _ from typing import List, Optional, Tuple from pretix.base.models import ( - CartPosition, Event, EventLock, Item, ItemVariation, Quota, + CartPosition, Event, EventLock, Item, ItemVariation, Quota, Voucher, ) @@ -27,7 +27,10 @@ error_messages = { 'the quantity you selected. Please see below for details.'), 'max_items': _("You cannot select more than %s items per order"), 'not_started': _('The presale period for this event has not yet started.'), - 'ended': _('The presale period has ended.') + 'ended': _('The presale period has ended.'), + 'voucher_invalid': _('This voucher code is not known in our database.'), + 'voucher_redeemed': _('This voucher code has already been used an can only be used once.'), + 'voucher_expired': _('This voucher is expired'), } @@ -98,7 +101,7 @@ def _add_new_items(event: Event, items: List[Tuple[int, Optional[int], int]], err = err or error_messages['unavailable'] continue - # Assume that all quotas allow us to buy i[2] instances of the object + # Check that all quotas allow us to buy i[2] instances of the object quota_ok = i[2] for quota in quotas: avail = quota.availability() @@ -131,7 +134,35 @@ def _add_new_items(event: Event, items: List[Tuple[int, Optional[int], int]], return err -def _add_items_to_cart(event: Event, items: List[Tuple[int, Optional[int], int]], cart_id: str=None) -> None: +def _add_voucher(event: Event, voucher: str, expiry: datetime, cart_id: str): + try: + v = Voucher.objects.get(code=voucher, event=event) + if v.redeemed: + raise CartError(error_messages['voucher_redeemed']) + if v.valid_until is not None and v.valid_until < now(): + raise CartError(error_messages['voucher_expired']) + + quotas = list(v.item.quotas.all()) + if len(quotas) == 0 or not v.item.is_available(): + raise CartError(error_messages['unavailable']) + + if not v.allow_ignore_quota and not v.block_quota: + for quota in quotas: + avail = quota.availability() + if avail[1] is not None and avail[1] < 1: + raise CartError(error_messages['unavailable']) + + CartPosition.objects.create( + event=event, item=v.item, variation=None, + price=v.price if v.price is not None else v.item.default_price, + expires=expiry, cart_id=cart_id, voucher=v + ) + except Voucher.DoesNotExist: + raise CartError(error_messages['voucher_invalid']) + + +def _add_items_to_cart(event: Event, items: List[Tuple[int, Optional[int], int]], cart_id: str=None, + voucher: str=None) -> None: with event.lock(): _check_date(event) existing = CartPosition.objects.filter(Q(cart_id=cart_id) & Q(event=event)).count() @@ -143,31 +174,36 @@ def _add_items_to_cart(event: Event, items: List[Tuple[int, Optional[int], int]] _extend_existing(event, cart_id, expiry) expired = _re_add_expired_positions(items, event, cart_id) - if not items: + if items: + err = _add_new_items(event, items, cart_id, expiry) + _delete_expired(expired) + if err: + raise CartError(err) + elif not voucher: raise CartError(error_messages['empty']) - err = _add_new_items(event, items, cart_id, expiry) - _delete_expired(expired) - if err: - raise CartError(err) + if voucher: + _add_voucher(event, voucher, expiry, cart_id) -def add_items_to_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: str=None) -> None: +def add_items_to_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: str=None, + voucher: str=None) -> None: """ Adds a list of items to a user's cart. :param event: The event ID in question :param items: A list of tuple of the form (item id, variation id or None, number) :param session: Session ID of a guest + :param coupon: A coupon that should also be reeemed :raises CartError: On any error that occured """ event = Event.objects.get(id=event) try: - _add_items_to_cart(event, items, cart_id) + _add_items_to_cart(event, items, cart_id, voucher) except EventLock.LockTimeoutException: raise CartError(error_messages['busy']) -def _remove_items_from_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: int) -> None: +def _remove_items_from_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: str) -> None: with event.lock(): for item, variation, cnt in items: cw = Q(cart_id=cart_id) & Q(item_id=item) & Q(event=event) @@ -179,7 +215,7 @@ def _remove_items_from_cart(event: int, items: List[Tuple[int, Optional[int], in cp.delete() -def remove_items_from_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: int=None) -> None: +def remove_items_from_cart(event: int, items: List[Tuple[int, Optional[int], int]], cart_id: str=None) -> None: """ Removes a list of items from a user's cart. :param event: The event ID in question @@ -197,10 +233,11 @@ 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: int, items: List[Tuple[int, Optional[int], int]], cart_id: str): + def add_items_to_cart_task(self, event: int, items: List[Tuple[int, Optional[int], int]], cart_id: str, + voucher: str=None): event = Event.objects.get(id=event) try: - _add_items_to_cart(event, items, cart_id) + _add_items_to_cart(event, items, cart_id, voucher) except EventLock.LockTimeoutException: self.retry(exc=CartError(error_messages['busy'])) diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index 3401f4b3f6..e49cd82e6a 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -28,6 +28,8 @@ error_messages = { 'internal': _("An internal error occured, please try again."), 'busy': _('We were not able to process your request completely as the ' 'server was too busy. Please try again.'), + 'voucher_redeemed': _('A voucher you tried to use already has been used.'), + 'voucher_expired': _('A voucher you tried to use has expired.'), } @@ -133,29 +135,51 @@ def _check_positions(event: Event, dt: datetime, positions: List[CartPosition]): cp.delete() continue quotas = list(cp.item.quotas.all()) if cp.variation is None else list(cp.variation.quotas.all()) + + if cp.voucher: + if cp.voucher.redeemed: + err = err or error_messages['voucher_redeemed'] + continue + cp.voucher.redeemed = True + cp.voucher.save() + if cp.expires >= dt: # Other checks are not necessary continue + price = cp.item.default_price if cp.variation is None else ( cp.variation.default_price if cp.variation.default_price is not None else cp.item.default_price) + + if cp.voucher: + if cp.voucher.valid_until < now(): + err = err or error_messages['voucher_expired'] + continue + if price is not False and cp.voucher.price is not None: + price = cp.voucher.price + if price is False or len(quotas) == 0: err = err or error_messages['unavailable'] cp.delete() continue + if price != cp.price: positions[i] = cp cp.price = price cp.save() err = err or error_messages['price_changed'] continue + quota_ok = True - for quota in quotas: - avail = quota.availability() - if avail[0] != Quota.AVAILABILITY_OK: - # This quota is sold out/currently unavailable, so do not sell this at all - err = err or error_messages['unavailable'] - quota_ok = False - break + + if not cp.voucher or not (cp.voucher.allow_ignore_quota or cp.voucher.block_quota): + for quota in quotas: + avail = quota.availability() + if avail[0] != Quota.AVAILABILITY_OK: + # This quota is sold out/currently unavailable, so do not sell this at all + err = err or error_messages['unavailable'] + quota_ok = False + break + if quota_ok: positions[i] = cp cp.expires = now() + timedelta( @@ -167,7 +191,6 @@ def _check_positions(event: Event, dt: datetime, positions: List[CartPosition]): raise OrderError(err) -@transaction.atomic() def _create_order(event: Event, email: str, positions: List[CartPosition], dt: datetime, payment_provider: BasePaymentProvider, locale: str=None): total = sum([c.price for c in positions]) @@ -211,9 +234,10 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str], id__in=position_ids).select_related('item', 'variation')) if len(position_ids) != len(positions): raise OrderError(error_messages['internal']) - _check_positions(event, dt, positions) - order = _create_order(event, email, positions, dt, pprov, - locale=locale) + with transaction.atomic(): + _check_positions(event, dt, positions) + order = _create_order(event, email, positions, dt, pprov, + locale=locale) mail( order.email, _('Your order: %(code)s') % {'code': order.code}, diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html index f8abebc276..9c985d6e71 100644 --- a/src/pretix/control/templates/pretixcontrol/order/index.html +++ b/src/pretix/control/templates/pretixcontrol/order/index.html @@ -85,6 +85,12 @@ {% if line.variation %} – {{ line.variation }} {% endif %} + {% if line.voucher %} +
{% trans "Voucher code used:" %} + + {{ line.voucher.code }} + + {% endif %} {% if line.has_questions %}
{% if line.item.admission and event.settings.attendee_names_asked %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html index 28ad8fa71e..fc9ee5b1bb 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html @@ -4,6 +4,11 @@ {% block title %}{% trans "Voucher" %}{% endblock %} {% block inside %}

{% trans "Voucher" %}

+ {% if voucher.redeemed %} +
+ {% trans "This voucher already has been used. It is not recommended to modify it." %} +
+ {% endif %}
{% csrf_token %} {% bootstrap_form_errors form %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/index.html b/src/pretix/control/templates/pretixcontrol/vouchers/index.html index b6f05c3594..6f558f6a69 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/index.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/index.html @@ -25,7 +25,7 @@ {{ v.code }} - {% if v.is_ordered %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} + {% if v.redeemed %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} {{ v.valid_until|date }} {{ v.item }} diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index cc3f5e7ac8..c533636596 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -135,8 +135,8 @@ class OrderDetail(OrderView): def keyfunc(pos): if (pos.item.admission and self.request.event.settings.attendee_names_asked) \ or pos.item.questions.all(): - return pos.id, 0, 0, 0 - return 0, pos.item_id, pos.variation_id, pos.price + return pos.id, 0, 0, 0, None + return 0, pos.item_id, pos.variation_id, pos.price, pos.voucher positions = [] for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc): diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html index 551fde86ee..1b0149f5fe 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html @@ -7,6 +7,9 @@ {% if line.variation %} – {{ line.variation }} {% endif %} + {% if line.voucher %} +
{% trans "Voucher code used:" %} {{ line.voucher.code }} + {% endif %} {% if line.has_questions %}
{% if line.item.admission and event.settings.attendee_names_asked%} diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index 34cb2ac39c..7c253af37a 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -6,32 +6,32 @@ {% block content %} {% if cart.positions %} -
-
-

{% trans "Your cart" %}

-
-
- {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %} -
-
- {% if cart.minutes_left > 0 %} - {% blocktrans trimmed with minutes=cart.minutes_left %} - The items in your cart are reserved for you for {{ minutes }} minutes. - {% endblocktrans %} - {% else %} - {% trans "The items in your cart are no longer reserved for you." %} - {% endif %} +
+
+

{% trans "Your cart" %}

+
+
+ {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %} +
+
+ {% if cart.minutes_left > 0 %} + {% blocktrans trimmed with minutes=cart.minutes_left %} + The items in your cart are reserved for you for {{ minutes }} minutes. + {% endblocktrans %} + {% else %} + {% trans "The items in your cart are no longer reserved for you." %} + {% endif %} +
+
+ + {% trans "Proceed with checkout" %} + +
+
-
- - {% trans "Proceed with checkout" %} - -
-
-
{% endif %} {% if not event.presale_is_running %}
@@ -67,7 +67,7 @@ data-title="{{ item.name }}" data-lightbox="{{ item.id }}"> {{ item.name }} + alt="{{ item.name }}"/> {% endif %} @@ -100,7 +100,8 @@
{{ event.currency }} {{ var.price|floatformat:2 }} {% if item.tax_rate %} -
{% blocktrans trimmed with rate=item.tax_rate %} +
+ {% blocktrans trimmed with rate=item.tax_rate %} incl. {{ rate }}% taxes {% endblocktrans %} {% endif %} @@ -127,7 +128,7 @@ data-title="{{ item.name }}" data-lightbox="{{ item.id }}"> {{ item.name }} + alt="{{ item.name }}"/> {% endif %} {{ item.name }} @@ -136,9 +137,10 @@
{{ event.currency }} {{ item.price|floatformat:2 }} {% if item.tax_rate %} -
{% blocktrans trimmed with rate=item.tax_rate %} - incl. {{ rate }}% taxes - {% endblocktrans %} +
+ {% blocktrans trimmed with rate=item.tax_rate %} + incl. {{ rate }}% taxes + {% endblocktrans %} {% endif %}
{% if item.cached_availability.0 == 100 %} @@ -156,8 +158,29 @@ {% endfor %} {% if event.presale_is_running %} + {% if vouchers_exist %} +
+
+
+ + +
+ + +
+
+ +
+
+
+ {% endif %}
-
+
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index f2d3ac2b0a..8ad0dc397c 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -48,8 +48,8 @@ class CartMixin: def keyfunc(pos): if answers and ((pos.item.admission and self.request.event.settings.attendee_names_asked) or pos.item.questions.all()): - return pos.id, 0, 0, 0 - return 0, pos.item_id, pos.variation_id, pos.price + return pos.id, 0, 0, 0, None + return 0, pos.item_id, pos.variation_id, pos.price, pos.voucher positions = [] for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc): diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py index 48462cfeec..568d196728 100644 --- a/src/pretix/presale/views/cart.py +++ b/src/pretix/presale/views/cart.py @@ -26,7 +26,7 @@ class CartActionMixin: def get_error_url(self): return self.get_next_url() - def _items_from_post_data(self): + def _items_from_post_data(self, warn=True): """ Parses the POST data and returns a list of tuples in the form (item id, variation id or None, number) @@ -47,7 +47,7 @@ class CartActionMixin: except ValueError: messages.error(self.request, _('Please enter numbers only.')) return [] - if len(items) == 0: + if len(items) == 0 and warn: messages.warning(self.request, _('You did not select any products.')) return [] return items @@ -93,9 +93,11 @@ class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View): return super().get_error_message(exception) def post(self, request, *args, **kwargs): - items = self._items_from_post_data() - if items: - return self.do(self.request.event.id, items, self.request.session.session_key) + voucher = self.request.POST.get('voucher') + items = self._items_from_post_data(warn=not voucher) + if items or voucher: + return self.do(self.request.event.id, items, self.request.session.session_key, + voucher) else: if 'ajax' in self.request.GET or 'ajax' in self.request.POST: return JsonResponse({ diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index f5151ace34..dc206b65b7 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -60,5 +60,11 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView): group[0] is not None and group[0].id is not None) else (0, 0) ) + vouchers_exist = self.request.event.get_cache().get('vouchers_exist') + if vouchers_exist is None: + vouchers_exist = self.request.event.vouchers.exists() + self.request.event.get_cache().set('vouchers_exist', vouchers_exist) + context['vouchers_exist'] = vouchers_exist + context['cart'] = self.get_cart() return context diff --git a/src/static/pretixpresale/js/ui/main.js b/src/static/pretixpresale/js/ui/main.js index eaef1ac489..d14683e8a1 100644 --- a/src/static/pretixpresale/js/ui/main.js +++ b/src/static/pretixpresale/js/ui/main.js @@ -12,6 +12,12 @@ $(function () { $(this).parent().parent().parent().find(".variations").slideToggle(); }); $(".collapsed").removeClass("collapsed").addClass("collapse"); + + $("#voucher-box").hide(); + $("#voucher-toggle a").click(function () { + $("#voucher-box").slideDown(); + $("#voucher-toggle").slideUp(); + }); }); var waitingDialog = {