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

Fix incorrecly used error messages

Browse Source
This commit is contained in:
Raphael Michel
2023-01-31 22:11:53 +01:00
parent 04e16bbb39
commit c5b7ff66b7
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1073,11 +1073,11 @@ class CartManager:
if voucher_available_count < 1: if voucher_available_count < 1:
if op.voucher in self._voucher_depend_on_cart: if op.voucher in self._voucher_depend_on_cart:
err = err or _(error_messages['voucher_redeemed_cart']) % self.event.settings.reservation_time err = err or (error_messages['voucher_redeemed_cart'] % self.event.settings.reservation_time)
else: else:
err = err or error_messages['voucher_redeemed'] err = err or error_messages['voucher_redeemed']
elif voucher_available_count < requested_count: elif voucher_available_count < requested_count:
err = err or _(error_messages['voucher_redeemed_partial']) % voucher_available_count err = err or (error_messages['voucher_redeemed_partial'] % voucher_available_count)
available_count = min(quota_available_count, voucher_available_count) available_count = min(quota_available_count, voucher_available_count)

23
src/pretix/presale/checkoutflow.py
View File

@@ -631,35 +631,30 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
selected[i, None] = val, price selected[i, None] = val, price
if sum(a[0] for a in selected.values()) > category['max_count']: if sum(a[0] for a in selected.values()) > category['max_count']:
# TODO: Proper pluralization
raise ValidationError( raise ValidationError(
_(error_messages['addon_max_count']), error_messages['addon_max_count'] % {
'addon_max_count',
{
'base': str(form['item'].name), 'base': str(form['item'].name),
'max': category['max_count'], 'max': category['max_count'],
'cat': str(category['category'].name), 'cat': str(category['category'].name),
} },
'addon_max_count'
) )
elif sum(a[0] for a in selected.values()) < category['min_count']: elif sum(a[0] for a in selected.values()) < category['min_count']:
# TODO: Proper pluralization
raise ValidationError( raise ValidationError(
_(error_messages['addon_min_count']), error_messages['addon_min_count'] % {
'addon_min_count',
{
'base': str(form['item'].name), 'base': str(form['item'].name),
'min': category['min_count'], 'min': category['min_count'],
'cat': str(category['category'].name), 'cat': str(category['category'].name),
} },
'addon_min_count',
) )
elif any(sum(v[0] for k, v in selected.items() if k[0] == i) > 1 for i in category['items']) and not category['multi_allowed']: elif any(sum(v[0] for k, v in selected.items() if k[0] == i) > 1 for i in category['items']) and not category['multi_allowed']:
raise ValidationError( raise ValidationError(
_(error_messages['addon_no_multi']), error_messages['addon_no_multi'] % {
'addon_no_multi',
{
'base': str(form['item'].name), 'base': str(form['item'].name),
'cat': str(category['category'].name), 'cat': str(category['category'].name),
} },
'addon_no_multi',
) )
try: try:
validate_cart_addons.send( validate_cart_addons.send(