{% for b in download_buttons %}
+ class="btn btn-default btn-sm" data-asyncdownload>
{{ b.text }}
{% endfor %}
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 475f6f63e4..814d675a45 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -532,11 +532,14 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
except CachedTicket.DoesNotExist:
ct = None
+ if not ct:
+ ct = CachedTicket.objects.create(
+ order_position=self.order_position, provider=self.output.identifier,
+ extension='', type='', file=None)
+ generate.apply_async(args=(self.order_position.id, self.output.identifier))
+
if 'ajax' in request.GET:
return HttpResponse('1' if ct and ct.file else '0')
- elif not ct:
- generate.apply_async(args=(self.order_position.id, self.output.identifier))
- return render(request, "pretixbase/cachedfiles/pending.html", {})
elif not ct.file:
return render(request, "pretixbase/cachedfiles/pending.html", {})
else:
diff --git a/src/static/pretixpresale/js/ui/asyncdownload.js b/src/static/pretixpresale/js/ui/asyncdownload.js
new file mode 100644
index 0000000000..fe09e9967e
--- /dev/null
+++ b/src/static/pretixpresale/js/ui/asyncdownload.js
@@ -0,0 +1,60 @@
+/*global $, waitingDialog, gettext */
+var async_dl_url = null;
+var async_dl_timeout = null;
+
+function async_dl_check() {
+ "use strict";
+ $.ajax(
+ {
+ 'type': 'GET',
+ 'url': async_dl_url + '?ajax=1',
+ 'success': async_dl_check_callback,
+ 'error': async_dl_check_error,
+ 'context': this,
+ }
+ );
+}
+
+function async_dl_check_callback(data, jqXHR, status) {
+ "use strict";
+ if (data == 1) {
+ $("body").data('ajaxing', false);
+ location.href = async_dl_url;
+ waitingDialog.hide();
+ return;
+ }
+ async_dl_timeout = window.setTimeout(async_dl_check, 250);
+ $("#loadingmodal p").text(gettext('Your request has been queued on the server and will now be ' +
+ 'processed. If this takes longer than two minutes, please contact us or go ' +
+ 'back in your browser and try again.'));
+}
+
+function async_dl_check_error(jqXHR, textStatus, errorThrown) {
+ "use strict";
+ $("body").data('ajaxing', false);
+ waitingDialog.hide();
+ var c = $(jqXHR.responseText).filter('.container');
+ if (c.length > 0) {
+ ajaxErrDialog.show(c.first().html());
+ } else if (jqXHR.status >= 400) {
+ alert(gettext('An error of type {code} occured.').replace(/\{code\}/, jqXHR.status));
+ }
+}
+
+$(function () {
+ "use strict";
+ $("body").on('click', 'a[data-asyncdownload]', function (e) {
+ e.preventDefault();
+ if ($("body").data('ajaxing')) {
+ return;
+ }
+ async_dl_url = $(this).attr("href");
+ $("body").data('ajaxing', true);
+ waitingDialog.show(gettext('We are processing your request …'));
+ $("#loadingmodal p").text(gettext('We are currently sending your request to the server. If this takes longer ' +
+ 'than one minute, please check your internet connection and then reload ' +
+ 'this page and try again.'));
+
+ async_dl_check();
+ });
+});
diff --git a/src/static/pretixpresale/js/ui/asynctask.js b/src/static/pretixpresale/js/ui/asynctask.js
index 33b512ad20..719130bdb9 100644
--- a/src/static/pretixpresale/js/ui/asynctask.js
+++ b/src/static/pretixpresale/js/ui/asynctask.js
@@ -33,10 +33,12 @@ function async_task_check_error(jqXHR, textStatus, errorThrown) {
"use strict";
var c = $(jqXHR.responseText).filter('.container');
if (c.length > 0) {
+ $("body").data('ajaxing', false);
waitingDialog.hide();
ajaxErrDialog.show(c.first().html());
} else {
if (jqXHR.status >= 400 && jqXHR.status < 500) {
+ $("body").data('ajaxing', false);
waitingDialog.hide();
alert(gettext('An error of type {code} occured.').replace(/\{code\}/, jqXHR.status));
} else {