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

Fix another crash around original prices

Browse Source
This commit is contained in:
Raphael Michel
2019-05-14 17:20:22 +02:00
parent 6ef3603d9f
commit 00bc5f4fae
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/presale/views/event.py
View File

@@ -146,12 +146,6 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web'):
display_add_to_cart = display_add_to_cart or item.order_max > 0 display_add_to_cart = display_add_to_cart or item.order_max > 0
else: else:
item.original_price = (
item.tax(item.original_price, currency=event.currency, include_bundled=True,
base_price_is='net' if event.settings.display_net_prices else 'gross') # backwards-compat
if item.original_price else None
)
for var in item.available_variations: for var in item.available_variations:
if voucher and (voucher.allow_ignore_quota or voucher.block_quota): if voucher and (voucher.allow_ignore_quota or voucher.block_quota):
var.cached_availability = ( var.cached_availability = (
@@ -187,6 +181,12 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web'):
display_add_to_cart = display_add_to_cart or var.order_max > 0 display_add_to_cart = display_add_to_cart or var.order_max > 0
item.original_price = (
item.tax(item.original_price, currency=event.currency, include_bundled=True,
base_price_is='net' if event.settings.display_net_prices else 'gross') # backwards-compat
if item.original_price else None
)
item.available_variations = [ item.available_variations = [
v for v in item.available_variations if v._subevent_quotas and ( v for v in item.available_variations if v._subevent_quotas and (
not voucher or not voucher.quota_id or v in restrict_vars not voucher or not voucher.quota_id or v in restrict_vars