Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix promo codes 500 error #4171

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Fix promo codes 500 error #4171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions uber/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ def __getattr__(self, name):
try:
return sum(item[0] * item[1] for item in cost_calc[1].items()) / 100
except AttributeError:
if len(cost_calc) > 2:
return cost_calc[1] * cost_calc[2] / 100
if len(cost_calc) > 3:
return cost_calc[1] * cost_calc[3] / 100
else:
return cost_calc[1] / 100
except Exception:
Expand Down
12 changes: 11 additions & 1 deletion uber/templates/preregistration/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,17 @@
<td>
<ul style="padding-left:15px">
{% if attendee.badge_type in c.BADGE_TYPE_PRICES %}
<li>{{ attendee.badge_type_label|replace(' ', '-') }}-level r{% else %}<li>R{% endif %}egistration for {{ c.EVENT_NAME }}{% if attendee.badges %} for {{ attendee.badges }} people{% endif %}{% if (attendee.default_badge_cost and attendee.age_discount|abs < attendee.default_badge_cost) or attendee.default_promo_code_group_cost %} ({{ ((attendee.default_badge_cost or attendee.default_promo_code_group_cost) - attendee.age_discount|abs)|format_currency }}){% endif %}</li>
{% set badge_cost = attendee.default_badge_cost + attendee.default_badge_upgrade_cost %}
{% elif (attendee.default_badge_cost and attendee.age_discount and attendee.age_discount|abs < attendee.default_badge_cost) or attendee.default_promo_code_group_cost %}
{% set badge_cost = (attendee.default_badge_cost or attendee.default_promo_code_group_cost) - attendee.age_discount|abs %}
{% elif attendee.promo_code %}
{% set badge_cost = attendee.badge_cost_without_promo_code %}
{% else %}
{% set badge_cost = 0 %}
{% endif %}
<li>{% if attendee.badge_type in c.BADGE_TYPE_PRICES %}{{ attendee.badge_type_label|replace(' ', '-') }}-level r{% else %}R{% endif %}egistration for {{ c.EVENT_NAME }}
{% if attendee.badges %} for {{ attendee.badges }} people{% endif %}
{% if badge_cost %} ({{ badge_cost|format_currency }}){% endif %}</li>
{% if attendee.requested_hotel_info %}
<li>Requested hotel booking info</li>
{% endif %}
Expand Down
Loading