diff --git a/uber/models/attendee.py b/uber/models/attendee.py index eb8672bc8..2ef0e7408 100644 --- a/uber/models/attendee.py +++ b/uber/models/attendee.py @@ -462,6 +462,7 @@ def to_dict(self, *args, **kwargs): # Kludgey fix for SQLAlchemy breaking our stuff d = super().to_dict(*args, **kwargs) d.pop('attraction_event_signups', None) + d.pop('receipt_changes', None) return d @predelete_adjustment diff --git a/uber/templates/attractions/events.html b/uber/templates/attractions/events.html index 5360bf6d2..dd86aa209 100644 --- a/uber/templates/attractions/events.html +++ b/uber/templates/attractions/events.html @@ -61,6 +61,9 @@ $altSignupBModal = bootstrap.Modal.getOrCreateInstance($altSignupModal); $doneBModal = bootstrap.Modal.getOrCreateInstance($doneModal); + $('#badge-signup-alert').hide(); + $('#nonbadge-signup-alert').hide(); + $btnShowSoldout.on('click', function(event) { var isShowing = $btnShowSoldout.hasClass('btn-plain'); $btnShowSoldout.toggleClass('btn-outline-secondary', isShowing); @@ -109,12 +112,12 @@ $('#' + eventId + ' .remaining-slots').text(response['remaining_slots']); callback(response); } else { - showErrorMessage(response['error'] || 'Error signing up for event', '', {timeOut: 3000}); + showErrorMessage(response['error'] || 'Unknown error signing up for event.', 'nonbadge-signup-alert'); callback(false); } }, error: function(response, status, statusText) { - showErrorMessage('Error signing up for event', '', {timeOut: 3000}); + showErrorMessage('Error signing up for event: could not contact server. Please try again.', 'nonbadge-signup-alert'); callback(false); } }); @@ -142,7 +145,7 @@ if (response['remaining_slots'] === response['old_remaining_slots']) { message = ' was already signed up for '; } - $("#message-alert").addClass("alert-info").show().children('span').html($attendee.html() + message + $eventLabel.html()); + $("#badge-signup-alert").addClass("alert-info").show().children('span').html($attendee.html() + message + $eventLabel.html()); hideBadgeNumConfirm($doneModal, true); } else { hideBadgeNumConfirm($doneModal, false); @@ -245,6 +248,7 @@
Sign up for {{ feature.attraction.name }} – @@ -289,6 +293,7 @@