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

Fix quota handling to allow for "add-on swapping"

Browse Source
This commit is contained in:
Raphael Michel
2017-10-27 00:48:17 +02:00
parent b857157c7b
commit d63cc80507
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pretix/base/services/cart.py
View File

@@ -318,7 +318,7 @@ class CartManager:
self._check_item_constraints(op)
operations.append(op)
self._quota_diff += quota_diff
self._quota_diff.update(quota_diff)
self._voucher_use_diff += voucher_use_diff
self._operations += operations
@@ -456,7 +456,7 @@ class CartManager:
for k, v in al.items():
if k not in input_addons[cp.id]:
if v.expires > self.now_dt:
quotas = list(cp.quotas)
quotas = list(v.quotas)
for quota in quotas:
quota_diff[quota] -= 1
@@ -464,12 +464,14 @@ class CartManager:
op = self.RemoveOperation(position=v)
operations.append(op)
self._quota_diff += quota_diff
self._quota_diff.update(quota_diff)
self._operations += operations
def _get_quota_availability(self):
quotas_ok = {}
quotas_ok = defaultdict(int)
for quota, count in self._quota_diff.items():
if count <= 0:
quotas_ok[quota] = 0
avail = quota.availability(self.now_dt)
if avail[1] is not None and avail[1] < count:
quotas_ok[quota] = min(count, avail[1])
@@ -541,6 +543,9 @@ class CartManager:
for op in self._operations:
if isinstance(op, self.RemoveOperation):
if op.position.expires > self.now_dt:
for q in op.position.quotas:
quotas_ok[q] += 1
op.position.delete()
elif isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation):