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

Make redirections after voucher redemption more consistent

Browse Source
This commit is contained in:
Raphael Michel
2023-10-27 11:47:22 +02:00
parent c325cc1120
commit b32249d48b
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html
View File

@@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" /> <input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" />
<input type="hidden" name="next" value="{{ request.path }}" /> <input type="hidden" name="next" value="{% if next_url %}{{ next_url }}{% else %}{{ request.path }}{% endif %}" />
<div class="col-md-4 col-sm-6 col-xs-12"> <div class="col-md-4 col-sm-6 col-xs-12">
<button class="btn btn-block btn-primary" type="submit"> <button class="btn btn-block btn-primary" type="submit">
{% trans "Redeem voucher" %} {% trans "Redeem voucher" %}

6
src/pretix/presale/templates/pretixpresale/event/voucher_form.html
View File

@@ -9,6 +9,10 @@
{% block title %}{% trans "Voucher redemption" %}{% endblock %} {% block title %}{% trans "Voucher redemption" %}{% endblock %}
{% block content %} {% block content %}
{% if show_cart %}
{% include "pretixpresale/event/fragment_cart_box.html" with open=request.GET.show_cart %}
{% endif %}
<h2>{% trans "Redeem a voucher" %}</h2> <h2>{% trans "Redeem a voucher" %}</h2>
{% include "pretixpresale/event/fragment_voucher_form.html" %} {% include "pretixpresale/event/fragment_voucher_form.html" with next_url=request.path|add:"?show_cart=true" %}
{% endblock %} {% endblock %}

12
src/pretix/presale/views/cart.py
View File

@@ -600,8 +600,11 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.checkout.start', context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.checkout.start',
kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''}) kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''})
else: else:
context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.index', if 'next' in self.request.GET and url_has_allowed_host_and_scheme(self.request.GET.get("next"), allowed_hosts=None):
kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''}) context['cart_redirect'] = self.request.GET.get('next')
else:
context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.index',
kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''})
if context['cart_redirect'].startswith('https:'): if context['cart_redirect'].startswith('https:'):
context['cart_redirect'] = '/' + context['cart_redirect'].split('/', 3)[3] context['cart_redirect'] = '/' + context['cart_redirect'].split('/', 3)[3]
return context return context
@@ -634,7 +637,10 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
else: else:
err = error_messages['voucher_invalid'] err = error_messages['voucher_invalid']
else: else:
return render(request, 'pretixpresale/event/voucher_form.html') context = {}
context['cart'] = self.get_cart()
context['show_cart'] = context['cart']['positions']
return render(request, 'pretixpresale/event/voucher_form.html', context)
if request.event.presale_start and now() < request.event.presale_start: if request.event.presale_start and now() < request.event.presale_start:
err = error_messages['not_started'] err = error_messages['not_started']