CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Order import: Respect sales channel when validating seats (#4707)

Browse Source
This commit is contained in:
Raphael Michel
2024-12-18 13:57:29 +01:00
committed by GitHub
parent 22906dfa77
commit 20f171b790
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/base/services/modelimport.py
View File

@@ -118,7 +118,7 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user,
c.assign(record.get(c.identifier), order, position, order._address)
if position.seat is not None:
lock_seats.append(position.seat)
lock_seats.append((order.sales_channel, position.seat))
except (ValidationError, ImportError) as e:
raise DataImportError(
_('Invalid data in row {row}: {message}').format(row=i, message=str(e))
@@ -128,9 +128,9 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user,
with transaction.atomic():
# We don't support vouchers, quotas, or memberships here, so we only need to lock if seats are in use
if lock_seats:
lock_objects(lock_seats, shared_lock_objects=[event])
for s in lock_seats:
if not s.is_available():
lock_objects([s for c, s in lock_seats], shared_lock_objects=[event])
for c, s in lock_seats:
if not s.is_available(sales_channel=c):
raise DataImportError(_('The seat you selected has already been taken. Please select a different seat.'))
save_transactions = []