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

Add-On product refinements

Browse Source
This commit is contained in:
Raphael Michel
2017-04-30 13:23:03 +02:00
parent 82f9f5027f
commit 5d6083dce4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pretix/presale/forms/checkout.py
View File

@@ -164,17 +164,21 @@ class AddOnsForm(forms.Form):
price_net = item.default_price_net price_net = item.default_price_net
label = item.name label = item.name
if not item.tax_rate or not price: if not price:
n = '{name} (+ {currency} {price})'.format( n = '{name}'.format(
name=label
)
elif not item.tax_rate:
n = _('{name} (+ {currency} {price})').format(
name=label, currency=event.currency, price=number_format(price) name=label, currency=event.currency, price=number_format(price)
) )
elif event.settings.display_net_prices: elif event.settings.display_net_prices:
n = '{name} (+ {currency} {price} plus {taxes}% taxes)'.format( n = _('{name} (+ {currency} {price} plus {taxes}% taxes)').format(
name=label, currency=event.currency, price=number_format(price_net), name=label, currency=event.currency, price=number_format(price_net),
taxes=number_format(item.tax_rate) taxes=number_format(item.tax_rate)
) )
else: else:
n = '{name} (+ {currency} {price} incl. {taxes}% taxes)'.format( n = _('{name} (+ {currency} {price} incl. {taxes}% taxes)').format(
name=label, currency=event.currency, price=number_format(price), name=label, currency=event.currency, price=number_format(price),
taxes=number_format(item.tax_rate) taxes=number_format(item.tax_rate)
) )
@@ -228,7 +232,7 @@ class AddOnsForm(forms.Form):
for i in items: for i in items:
if i.has_variations: if i.has_variations:
choices = [('', '–')] choices = [('', _('no selection'))]
for v in i.available_variations: for v in i.available_variations:
cached_availability = v.check_quotas(_cache=quota_cache) cached_availability = v.check_quotas(_cache=quota_cache)
choices.append((v.pk, self._label(event, v, cached_availability))) choices.append((v.pk, self._label(event, v, cached_availability)))