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

Fixed #85 -- Fixed logic of time restrictions

Browse Source
This commit is contained in:
Raphael Michel
2015-08-14 21:17:28 +02:00
parent 27fe1b98d4
commit d87106ee67
3 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pretix/base/models.py
View File

@@ -1022,15 +1022,22 @@ class Item(Versionable):
else:
var['price'] = self.default_price
# It is possible, that *multiple* restriction plugins change the default price.
# In this case, the cheapest one wins. As soon as there is a restriction
# that changes the price, the default price has no effect.
newprice = None
for receiver, response in responses:
if 'available' in response[i]:
var['available'] &= response[i]['available']
if 'available' in response[i] and not response[i]['available']:
var['available'] = False
break
if 'price' in response[i] and response[i]['price'] is not None \
and (newprice is None or response[i]['price'] < newprice):
newprice = response[i]['price']
var['price'] = newprice or var['price']
variations = [var for var in variations if var['available']]
self._get_all_available_variations_cache = variations
return variations

25
src/pretix/plugins/timerestriction/signals.py
View File

@@ -56,9 +56,22 @@ def availability_handler(sender, **kwargs):
# Walk through all variations we are asked for
for v in variations:
var_restrictions = []
for restriction in restrictions:
applied_to = list(restriction.variations.current.all())
# Only take this restriction into consideration if it
# is directly applied to this variation or if the item
# has no variations
if v.empty() or ('variation' in v and v['variation'] in applied_to):
var_restrictions.append(restriction)
if not var_restrictions:
continue
# If this point is reached, there ARE time restrictions for this item
# Therefore, it is only available inside one of the timeframes, but not
# without any timeframe
# without any timeframe.
available = False
# Make up some unique key for this variation
@@ -79,15 +92,7 @@ def availability_handler(sender, **kwargs):
# Walk through all restriction objects applied to this item
prices = []
for restriction in restrictions:
applied_to = list(restriction.variations.current.all())
# Only take this restriction into consideration if it
# is directly applied to this variation or if the item
# has no variations
if not v.empty() and ('variation' not in v or v['variation'] not in applied_to):
continue
for restriction in var_restrictions:
if restriction.timeframe_from <= now() <= restriction.timeframe_to:
# Selling this item is currently possible
available = True