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

Add OrderPosition.ignore_from_quota_while_blocked (#3119)

Browse Source
This commit is contained in:
Raphael Michel
2023-02-22 12:44:51 +01:00
committed by GitHub
parent 175921fbaf
commit f08333814f
5 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1437,8 +1437,8 @@ class OrderChangeManager:
RegenerateSecretOperation = namedtuple('RegenerateSecretOperation', ('position',))
ChangeValidFromOperation = namedtuple('ChangeValidFromOperation', ('position', 'valid_from'))
ChangeValidUntilOperation = namedtuple('ChangeValidUntilOperation', ('position', 'valid_until'))
AddBlockOperation = namedtuple('AddBlockOperation', ('position', 'block_name'))
RemoveBlockOperation = namedtuple('RemoveBlockOperation', ('position', 'block_name'))
AddBlockOperation = namedtuple('AddBlockOperation', ('position', 'block_name', 'ignore_from_quota_while_blocked'))
RemoveBlockOperation = namedtuple('RemoveBlockOperation', ('position', 'block_name', 'ignore_from_quota_while_blocked'))
def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True):
self.order = order
@@ -1548,11 +1548,11 @@ class OrderChangeManager:
def change_valid_until(self, position: OrderPosition, new_value: datetime):
self._operations.append(self.ChangeValidUntilOperation(position, new_value))
def add_block(self, position: OrderPosition, block_name: str):
self._operations.append(self.AddBlockOperation(position, block_name))
def add_block(self, position: OrderPosition, block_name: str, ignore_from_quota_while_blocked=None):
self._operations.append(self.AddBlockOperation(position, block_name, ignore_from_quota_while_blocked))
def remove_block(self, position: OrderPosition, block_name: str):
self._operations.append(self.RemoveBlockOperation(position, block_name))
def remove_block(self, position: OrderPosition, block_name: str, ignore_from_quota_while_blocked=None):
self._operations.append(self.RemoveBlockOperation(position, block_name, ignore_from_quota_while_blocked))
def change_price(self, position: OrderPosition, price: Decimal):
tax_rule = self._current_tax_rules().get(position.pk, position.tax_rule) or TaxRule.zero()
@@ -2258,7 +2258,9 @@ class OrderChangeManager:
op.position.blocked = op.position.blocked + [op.block_name]
else:
op.position.blocked = [op.block_name]
op.position.save(update_fields=['blocked'])
if op.ignore_from_quota_while_blocked is not None:
op.position.ignore_from_quota_while_blocked = op.ignore_from_quota_while_blocked
op.position.save(update_fields=['blocked', 'ignore_from_quota_while_blocked'])
if op.position.blocked:
op.position.blocked_secrets.update_or_create(
event=self.event,
@@ -2278,7 +2280,9 @@ class OrderChangeManager:
op.position.blocked = [b for b in op.position.blocked if b != op.block_name]
if not op.position.blocked:
op.position.blocked = None
op.position.save(update_fields=['blocked'])
if op.ignore_from_quota_while_blocked is not None:
op.position.ignore_from_quota_while_blocked = op.ignore_from_quota_while_blocked
op.position.save(update_fields=['blocked', 'ignore_from_quota_while_blocked'])
if not op.position.blocked:
try:
bs = op.position.blocked_secrets.get(secret=op.position.secret)

2
src/pretix/base/services/quotas.py
View File

@@ -295,6 +295,8 @@ class QuotaAvailability:
Q(item_id__in={i['item_id'] for i in q_items if i['quota_id'] in quota_ids})
) | Q(
variation_id__in={i['itemvariation_id'] for i in q_vars if i['quota_id'] in quota_ids})
).filter(
~Q(Q(ignore_from_quota_while_blocked=True) & Q(blocked__isnull=False))
).order_by()
if any(q.release_after_exit for q in quotas):
op_lookup = op_lookup.annotate(