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

Move validate_memberships_in_order into transaction

Browse Source
This commit is contained in:
Raphael Michel
2021-05-12 11:47:40 +02:00
parent 51c8ad16c1
commit 9254a559ef
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pretix/base/services/orders.py
View File

@@ -755,12 +755,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
# Sorry, can't let you keep that! # Sorry, can't let you keep that!
delete(cp) delete(cp)
if not err:
try:
validate_memberships_in_order(customer, [p for p in sorted_positions if p.pk not in deleted_positions], event, lock=True)
except ValidationError as e:
raise OrderError(e.message)
if err: if err:
raise OrderError(err, errargs) raise OrderError(err, errargs)
@@ -821,6 +815,11 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
if checked_gift_cards and any(c.item.issue_giftcard for c in positions): if checked_gift_cards and any(c.item.issue_giftcard for c in positions):
raise OrderError(_("You cannot pay with gift cards when buying a gift card.")) raise OrderError(_("You cannot pay with gift cards when buying a gift card."))
try:
validate_memberships_in_order(customer, positions, event, lock=True)
except ValidationError as e:
raise OrderError(e.message)
fees, pf, gift_card_values = _get_fees(positions, payment_provider, address, meta_info, event, checked_gift_cards) fees, pf, gift_card_values = _get_fees(positions, payment_provider, address, meta_info, event, checked_gift_cards)
total = pending_sum = sum([c.price for c in positions]) + sum([c.value for c in fees]) total = pending_sum = sum([c.price for c in positions]) + sum([c.value for c in fees])