Fix #2090 -- Test mode for memberships

This commit is contained in:
Raphael Michel
2021-05-27 11:47:07 +02:00
parent ab30129fc2
commit 49a9b71ea3
21 changed files with 195 additions and 16 deletions

View File

@@ -395,7 +395,7 @@ class MembershipStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
f.position.used_membership = f.cleaned_data['membership']
try:
validate_memberships_in_order(self.cart_customer, self.positions, self.request.event, lock=False)
validate_memberships_in_order(self.cart_customer, self.positions, self.request.event, lock=False, testmode=self.request.event.testmode)
except ValidationError as e:
messages.error(self.request, e.message)
self.render()

View File

@@ -227,11 +227,13 @@ class MembershipForm(forms.Form):
usages = f'({obj.usages} / {obj.membership_type.max_usages})'
else:
usages = ''
return mark_safe(
f'<strong>{escape(obj.membership_type)}</strong> {usages}<br>'
f'{escape(obj.attendee_name)}<br>'
f'<span class="text-muted">{ds} {de}</span>'
)
d = f'<strong>{escape(obj.membership_type)}</strong> {usages}<br>'
if obj.attendee_name:
d += f'{escape(obj.attendee_name)}<br>'
d += f'<span class="text-muted">{ds} {de}</span>'
if obj.testmode:
d += ' <span class="label label-warning">{}</span>'.format(_("TEST MODE"))
return mark_safe(d)
def clean(self):
d = super().clean()

View File

@@ -59,6 +59,7 @@
<tr>
<td>
{{ m.membership_type.name }}
{% if m.testmode %}<span class="label label-warning">{% trans "TEST MODE" %}</span>{% endif %}
</td>
<td>
{{ m.date_start|date:"SHORT_DATETIME_FORMAT" }}