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

Fix incorrect link on position page

Browse Source
This commit is contained in:
Raphael Michel
2020-10-16 22:25:22 +02:00
parent fec682dddb
commit 6257b8cb54
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/presale/templates/pretixpresale/event/fragment_downloads.html
View File

@@ -13,7 +13,7 @@
{% trans "Please check your email account, we've sent you your tickets." %} {% trans "Please check your email account, we've sent you your tickets." %}
</h4> </h4>
<p class="text-muted"> <p class="text-muted">
{% if scope == "position" %} {% if position_page %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
You can also download them right here as soon as the person who placed the order clicked the You can also download them right here as soon as the person who placed the order clicked the
link in the email they received to confirm the email address is valid. link in the email they received to confirm the email address is valid.
@@ -29,7 +29,7 @@
</div> </div>
{% elif can_download and download_buttons and order.count_positions %} {% elif can_download and download_buttons and order.count_positions %}
<div class="alert alert-info info-download"> <div class="alert alert-info info-download">
{% if cart.positions|length > 1 and can_download_multi %} {% if cart.positions|length > 1 and can_download_multi %} {# never True on ticket page #}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Please have your ticket ready when entering the event. Please have your ticket ready when entering the event.
{% endblocktrans %} {% endblocktrans %}
@@ -51,7 +51,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p> </p>
{% elif tickets_with_download|length == 1 %} {% elif tickets_with_download|length == 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Please have your ticket ready when entering the event. Please have your ticket ready when entering the event.
{% endblocktrans %} {% endblocktrans %}
@@ -60,9 +60,7 @@
{% endblocktrans %} {% endblocktrans %}
<p class="info-download"> <p class="info-download">
{% for b in download_buttons %} {% for b in download_buttons %}
<form action=" <form action="{% if position_page and tickets_with_download.0.addon_to %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.addon_to.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.addon_to.positionid %}{% elif position_page %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=tickets_with_download.0.pk %}{% endif %}"
{% if position_page and tickets_with_download.0.addon_to %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.addon_to.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.addon_to.positionid %}{% elif position_page %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=tickets_with_download.0.pk %}{% endif %}"
method="post" data-asynctask data-asynctask-download method="post" data-asynctask data-asynctask-download
class="download-btn-form{% if b.javascript_required %} requirejs{% endif %}"> class="download-btn-form{% if b.javascript_required %} requirejs{% endif %}">
{% csrf_token %} {% csrf_token %}

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

@@ -163,7 +163,7 @@
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% include "pretixpresale/event/fragment_downloads.html" with scope="order" %} {% include "pretixpresale/event/fragment_downloads.html" with position_page=False %}
<div class="panel panel-primary cart"> <div class="panel panel-primary cart">
<div class="panel-heading"> <div class="panel-heading">
{% if order.can_modify_answers %} {% if order.can_modify_answers %}

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

@@ -22,7 +22,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</h2> </h2>
{% eventsignal event "pretix.presale.signals.position_info_top" order=order position=position request=request %} {% eventsignal event "pretix.presale.signals.position_info_top" order=order position=position request=request %}
{% include "pretixpresale/event/fragment_downloads.html" with scope="position" %} {% include "pretixpresale/event/fragment_downloads.html" with position_page=True %}
<div class="panel panel-primary cart"> <div class="panel panel-primary cart">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">