Minor services optimizations

This commit is contained in:
Raphael Michel
2015-12-06 18:32:29 +01:00
parent 324c35cbeb
commit 613c072ee6
2 changed files with 19 additions and 17 deletions

View File

@@ -1,6 +1,7 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.conf import settings from django.conf import settings
from django.db import transaction
from django.db.models import Q from django.db.models import Q
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -65,7 +66,7 @@ def _check_date(event: Event) -> None:
raise CartError(error_messages['ended']) raise CartError(error_messages['ended'])
def _add_items(event: Event, items: List[Tuple[str, Optional[str], int]], def _add_new_items(event: Event, items: List[Tuple[str, Optional[str], int]],
cart_id: str, expiry: datetime) -> Optional[str]: cart_id: str, expiry: datetime) -> Optional[str]:
err = None err = None
@@ -145,7 +146,7 @@ def _add_items_to_cart(event: Event, items: List[Tuple[str, Optional[str], int]]
if not items: if not items:
raise CartError(error_messages['empty']) raise CartError(error_messages['empty'])
err = _add_items(event, items, cart_id, expiry) err = _add_new_items(event, items, cart_id, expiry)
_delete_expired(expired) _delete_expired(expired)
if err: if err:
raise CartError(err) raise CartError(err)

View File

@@ -182,6 +182,7 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str],
_check_positions(event, dt, positions) _check_positions(event, dt, positions)
order = _create_order(event, email, positions, dt, pprov, order = _create_order(event, email, positions, dt, pprov,
locale=locale) locale=locale)
mail( mail(
order.email, _('Your order: %(code)s') % {'code': order.code}, order.email, _('Your order: %(code)s') % {'code': order.code},
'pretixpresale/email/order_placed.txt', 'pretixpresale/email/order_placed.txt',