CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-22 12:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

repair bodged merge

Browse Source
This commit is contained in:
Lukas Bockstaller
2026-08-21 16:37:26 +02:00
parent afac250fdc
commit 83cb12281f
1 changed files with 74 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/base/services/orders.py
+74 -53
View File
@@ -50,8 +50,8 @@ from django.core.cache import cache
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import models, transaction from django.db import models, transaction
from django.db.models import ( from django.db.models import (
Count, Exists, F, IntegerField, Max, Min, OuterRef, Prefetch, Q, QuerySet, Count, Exists, F, IntegerField, Max, Min, OuterRef, Prefetch, Q, QuerySet, Subquery,
Subquery, Sum, Value, Sum, Value,
) )
from django.db.models.functions import Cast, Greatest from django.db.models.functions import Cast, Greatest
from django.db.transaction import get_connection from django.db.transaction import get_connection
@@ -67,13 +67,11 @@ from pretix.base.email import get_email_context
from pretix.base.i18n import get_language_without_region, language from pretix.base.i18n import get_language_without_region, language
from pretix.base.media import MEDIA_TYPES from pretix.base.media import MEDIA_TYPES
from pretix.base.models import ( from pretix.base.models import (
CartPosition, Device, Event, GiftCard, Item, ItemVariation, Membership, CartPosition, Device, Event, GiftCard, Item, ItemVariation, LogEntry,
Order, OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User, Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
Voucher, SeatCategoryMapping, User, Voucher,
)
from pretix.base.models.cancellation import (
CancellationCheck, CheckResult, CheckTypes, PositionSet,
) )
from pretix.base.models.cancellation import CancellationCheck, CheckResult, CheckTypes, PositionSet
from pretix.base.models.event import Event_SettingsStore, SubEvent from pretix.base.models.event import Event_SettingsStore, SubEvent
from pretix.base.models.orders import ( from pretix.base.models.orders import (
BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee, BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee,
@@ -1661,7 +1659,7 @@ class OrderChangeManager:
MembershipOperation = namedtuple('MembershipOperation', ('position', 'membership')) MembershipOperation = namedtuple('MembershipOperation', ('position', 'membership'))
CancelOperation = namedtuple('CancelOperation', ('position', 'price_diff')) CancelOperation = namedtuple('CancelOperation', ('position', 'price_diff'))
AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat', 'membership', AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat', 'membership',
'valid_from', 'valid_until', 'is_bundled', 'result')) 'valid_from', 'valid_until', 'is_bundled', 'result', 'count'))
SplitOperation = namedtuple('SplitOperation', ('position',)) SplitOperation = namedtuple('SplitOperation', ('position',))
FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value', 'price_diff')) FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value', 'price_diff'))
AddFeeOperation = namedtuple('AddFeeOperation', ('fee', 'price_diff')) AddFeeOperation = namedtuple('AddFeeOperation', ('fee', 'price_diff'))
@@ -1675,16 +1673,25 @@ class OrderChangeManager:
ForceRecomputeOperation = namedtuple('ForceRecomputeOperation', tuple()) ForceRecomputeOperation = namedtuple('ForceRecomputeOperation', tuple())
class AddPositionResult: class AddPositionResult:
_position: Optional[OrderPosition] _positions: Optional[List[OrderPosition]]
def __init__(self): def __init__(self):
self._position = None self._positions = None
@property @property
def position(self) -> OrderPosition: def position(self) -> OrderPosition:
if self._position is None: if self._positions is None:
raise RuntimeError(
"Order position has not been created yet. Call commit() first on OrderChangeManager.")
if len(self._positions) != 1:
raise RuntimeError("More than one position created.")
return self._positions[0]
@property
def positions(self) -> List[OrderPosition]:
if self._positions is None:
raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.") raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
return self._position return self._positions
def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, allow_blocked_seats=False): def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, allow_blocked_seats=False):
self.order = order self.order = order
@@ -1894,8 +1901,13 @@ class OrderChangeManager:
def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None, def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
subevent: SubEvent = None, seat: Seat = None, membership: Membership = None, subevent: SubEvent = None, seat: Seat = None, membership: Membership = None,
valid_from: datetime = None, valid_until: datetime = None) -> 'OrderChangeManager.AddPositionResult': valid_from: datetime = None, valid_until: datetime = None,
count: int = 1) -> 'OrderChangeManager.AddPositionResult':
if count < 1:
raise ValueError("Count must be positive")
if isinstance(seat, str): if isinstance(seat, str):
if count > 1:
raise ValueError("Cannot combine count > 1 with seat")
if not seat: if not seat:
seat = None seat = None
else: else:
@@ -1949,14 +1961,14 @@ class OrderChangeManager:
if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00'): if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00'):
self._invoice_dirty = True self._invoice_dirty = True
self._totaldiff_guesstimate += price.gross self._totaldiff_guesstimate += price.gross * count
self._quotadiff.update(new_quotas) self._quotadiff.update({q: count for q in new_quotas})
if seat: if seat:
self._seatdiff.update([seat]) self._seatdiff.update([seat])
result = self.AddPositionResult() result = self.AddPositionResult()
self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat, membership, self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat, membership,
valid_from, valid_until, is_bundled, result)) valid_from, valid_until, is_bundled, result, count))
return result return result
def split(self, position: OrderPosition): def split(self, position: OrderPosition):
@@ -2594,29 +2606,36 @@ class OrderChangeManager:
secret_dirty.remove(position) secret_dirty.remove(position)
position.save(update_fields=['canceled', 'secret']) position.save(update_fields=['canceled', 'secret'])
elif isinstance(op, self.AddOperation): elif isinstance(op, self.AddOperation):
pos = OrderPosition.objects.create( new_pos = []
item=op.item, variation=op.variation, addon_to=op.addon_to, new_logs = []
price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code, for i in range(op.count):
tax_value=op.price.tax, tax_rule=op.item.tax_rule, pos = OrderPosition.objects.create(
positionid=nextposid, subevent=op.subevent, seat=op.seat, item=op.item, variation=op.variation, addon_to=op.addon_to,
used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until, price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code,
is_bundled=op.is_bundled, tax_value=op.price.tax, tax_rule=op.item.tax_rule,
) positionid=nextposid, subevent=op.subevent, seat=op.seat,
nextposid += 1 used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until,
self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={ is_bundled=op.is_bundled,
'position': pos.pk, )
'item': op.item.pk, nextposid += 1
'variation': op.variation.pk if op.variation else None, new_pos.append(pos)
'addon_to': op.addon_to.pk if op.addon_to else None, new_logs.append(
'price': op.price.gross, self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
'positionid': pos.positionid, 'position': pos.pk,
'membership': pos.used_membership_id, 'item': op.item.pk,
'subevent': op.subevent.pk if op.subevent else None, 'variation': op.variation.pk if op.variation else None,
'seat': op.seat.pk if op.seat else None, 'addon_to': op.addon_to.pk if op.addon_to else None,
'valid_from': op.valid_from.isoformat() if op.valid_from else None, 'price': op.price.gross,
'valid_until': op.valid_until.isoformat() if op.valid_until else None, 'positionid': pos.positionid,
}) 'membership': pos.used_membership_id,
op.result._position = pos 'subevent': op.subevent.pk if op.subevent else None,
'seat': op.seat.pk if op.seat else None,
'valid_from': op.valid_from.isoformat() if op.valid_from else None,
'valid_until': op.valid_until.isoformat() if op.valid_until else None,
}, save=False))
op.result._positions = new_pos
LogEntry.bulk_create_and_postprocess(new_logs)
elif isinstance(op, self.SplitOperation): elif isinstance(op, self.SplitOperation):
position = position_cache.setdefault(op.position.pk, op.position) position = position_cache.setdefault(op.position.pk, op.position)
split_positions.append(position) split_positions.append(position)
@@ -2941,7 +2960,8 @@ class OrderChangeManager:
return total return total
def _check_order_size(self): def _check_order_size(self):
if (len(self.order.positions.all()) + len([op for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE: if (len(self.order.positions.all()) + sum([op.count for op in self._operations if isinstance(op,
self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
raise OrderError( raise OrderError(
self.error_messages['max_order_size'] % { self.error_messages['max_order_size'] % {
'max': settings.PRETIX_MAX_ORDER_SIZE, 'max': settings.PRETIX_MAX_ORDER_SIZE,
@@ -3002,7 +3022,7 @@ class OrderChangeManager:
]) + len([ ]) + len([
o for o in self._operations if isinstance(o, self.SplitOperation) o for o in self._operations if isinstance(o, self.SplitOperation)
]) ])
adds = len([o for o in self._operations if isinstance(o, self.AddOperation)]) adds = sum([o.count for o in self._operations if isinstance(o, self.AddOperation)])
if current > 0 and current - cancels + adds < 1: if current > 0 and current - cancels + adds < 1:
raise OrderError(self.error_messages['complete_cancel']) raise OrderError(self.error_messages['complete_cancel'])
@@ -3049,17 +3069,18 @@ class OrderChangeManager:
elif isinstance(op, self.CancelOperation) and op.position in positions_to_fake_cart: elif isinstance(op, self.CancelOperation) and op.position in positions_to_fake_cart:
fake_cart.remove(positions_to_fake_cart[op.position]) fake_cart.remove(positions_to_fake_cart[op.position])
elif isinstance(op, self.AddOperation): elif isinstance(op, self.AddOperation):
cp = CartPosition( for i in range(op.count):
event=self.event, cp = CartPosition(
item=op.item, event=self.event,
variation=op.variation, item=op.item,
used_membership=op.membership, variation=op.variation,
subevent=op.subevent, used_membership=op.membership,
seat=op.seat, subevent=op.subevent,
) seat=op.seat,
cp.override_valid_from = op.valid_from )
cp.override_valid_until = op.valid_until cp.override_valid_from = op.valid_from
fake_cart.append(cp) cp.override_valid_until = op.valid_until
fake_cart.append(cp)
try: try:
validate_memberships_in_order(self.order.customer, fake_cart, self.event, lock=True, ignored_order=self.order, testmode=self.order.testmode) validate_memberships_in_order(self.order.customer, fake_cart, self.event, lock=True, ignored_order=self.order, testmode=self.order.testmode)
except ValidationError as e: except ValidationError as e: