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

Synchronize cart countdown with server time

Browse Source
This commit is contained in:
Raphael Michel
2017-11-01 20:46:37 +01:00
parent 2678100149
commit 10103b58f0
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/templates/pretixpresale/base.html
View File

@@ -36,7 +36,7 @@
<link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
{% block custom_header %}{% endblock %}
</head>
<body data-locale="{{ request.LANGUAGE_CODE }}">
<body data-locale="{{ request.LANGUAGE_CODE }}" data-now="{% now "U.u" %}">
{% block above %}
{% endblock %}
<div class="container">

5
src/pretix/presale/views/__init__.py
View File

@@ -133,8 +133,9 @@ class CartMixin:
try:
first_expiry = min(p.expires for p in positions) if positions else now()
minutes_left = max(first_expiry - now(), timedelta()).seconds // 60
seconds_left = max(first_expiry - now(), timedelta()).seconds % 60
total_seconds_left = max(first_expiry - now(), timedelta()).total_seconds()
minutes_left = total_seconds_left // 60
seconds_left = total_seconds_left % 60
except AttributeError:
first_expiry = None
minutes_left = None

22
src/pretix/static/pretixpresale/js/ui/cart.js
View File

@@ -3,6 +3,22 @@ var cart = {
_deadline: null,
_deadline_interval: null,
_deadline_call: 0,
_time_offset: 0,
_get_now: function () {
return moment().add(cart._time_offset, 'ms');
},
_calc_offset: function () {
if (typeof window.performance === "undefined") {
return;
}
var perf = window.performance.timing;
var server_time = Math.round(parseFloat($("body").attr("data-now")) * 1000);
// We use requestStart as we don't know how latency is distributed and we rather want to err on the safe side
var client_time = perf.requestStart;
cart._time_offset = server_time - client_time;
},
draw_deadline: function () {
function pad(n, width, z) {
@@ -16,8 +32,9 @@ var cart = {
// Language files are not loaded yet, don't run during the first seconds
return;
}
var diff_minutes = Math.floor(cart._deadline.diff(moment()) / 1000 / 60);
var diff_seconds = Math.floor(cart._deadline.diff(moment()) / 1000 % 60);
var now = cart._get_now();
var diff_minutes = Math.floor(cart._deadline.diff(now) / 1000 / 60);
var diff_seconds = Math.floor(cart._deadline.diff(now) / 1000 % 60);
if (diff_minutes < 0) {
$("#cart-deadline").text(gettext("The items in your cart are no longer reserved for you."));
$("#cart-deadline-short").text(
@@ -40,6 +57,7 @@ var cart = {
"use strict";
cart._deadline = moment($("#cart-deadline").attr("data-expires"));
cart._deadline_interval = window.setInterval(cart.draw_deadline, 500);
cart._calc_offset();
cart.draw_deadline();
}
};