Overhaul of our check-in features (#1647)

src/pretix/control/templates/pretixcontrol/checkin/index.html

@@ -12,8 +12,8 @@
         {% if 'can_change_event_settings' in request.eventpermset %}
             <a href="{% url "control:event.orders.checkinlists.edit" event=request.event.slug organizer=request.event.organizer.slug list=checkinlist.pk %}"
                     class="btn btn-default">
-                <span class="fa fa-edit"></span>
-                {% trans "Edit list" %}
+                <span class="fa fa-wrench"></span>
+                {% trans "Edit list configuration" %}
             </a>
         {% endif %}
         <a href="{% url "control:event.orders.export" event=request.event.slug organizer=request.event.organizer.slug %}?identifier=checkinlistpdf&checkinlistpdf-list={{ checkinlist.pk }}"
@@ -122,19 +122,30 @@
                                 {{ e.secret|slice:":10" }}…
                             </td>
                             <td>
-                                {% if not e.last_checked_in %}
+                                {% if not e.last_entry %}
                                     <span class="label label-danger">{% trans "Not checked in" %}</span>
                                 {% else %}
-                                    <span class="label label-success">{% trans "Checked in" %}</span>
-                                    {% if e.auto_checked_in %}
-                                        <span class="fa fa-magic text-muted"
-                                              data-toggle="tooltip" title="{% trans "Checked in automatically" %}"></span>
+                                    {% if e.last_exit and e.last_exit_aware > e.last_entry_aware %}
+                                        <span class="label label-success">{% trans "Checked in but left" %}</span>
+                                    {% else %}
+                                        <span class="label label-success">{% trans "Checked in" %}</span>
+                                        {% if e.auto_checked_in %}
+                                            <span class="fa fa-magic text-muted"
+                                                  data-toggle="tooltip" title="{% trans "Checked in automatically" %}"></span>
+                                        {% endif %}
                                     {% endif %}
                                 {% endif %}
                             </td>
                             <td>
-                                {% if e.last_checked_in %}
-                                    {{ e.last_checked_in_aware|date:"SHORT_DATETIME_FORMAT" }}
+                                {% if e.last_entry %}
+                                    {{ e.last_entry_aware|date:"SHORT_DATETIME_FORMAT" }}
+                                {% endif %}
+                                {% if e.last_exit %}
+                                    <small><br>
+                                        {% blocktrans trimmed with date=e.last_exit_aware|date:"SHORT_DATETIME_FORMAT" %}
+                                            Exit: {{ date }}
+                                        {% endblocktrans %}
+                                    </small>
                                 {% endif %}
                             </td>
                         </tr>
@@ -146,6 +157,9 @@
                 <button type="submit" class="btn btn-primary btn-save">
                     {% trans "Check-In selected attendees" %}
                 </button>
+                <button type="submit" class="btn btn-default btn-save" name="checkout" value="true">
+                    {% trans "Check-Out selected attendees" %}
+                </button>
                 <button type="submit" class="btn btn-default btn-save" name="revert" value="true">
                     {% trans "Revert selected check-ins" %}
                 </button>

src/pretix/control/templates/pretixcontrol/checkin/list_edit.html

@@ -1,6 +1,8 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load static %}
+{% load compress %}
 {% block title %}
     {% if checkinlist %}
         {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %}
@@ -15,35 +17,66 @@
         <h1>{% trans "Check-in list" %}</h1>
     {% endif %}
     <form action="" method="post" class="form-horizontal">
+        <script type="text/plain"
+                id="product-select2">{% url "control:event.items.select2" event=request.event.slug organizer=request.organizer.slug %}</script>
+        <script type="text/plain"
+                id="variations-select2">{% url "control:event.items.variations.select2" event=request.event.slug organizer=request.organizer.slug %}</script>
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General information" %}</legend>
-            {% bootstrap_field form.name layout="control" %}
-            {% if form.subevent %}
-                {% bootstrap_field form.subevent layout="control" %}
-            {% endif %}
-            {% bootstrap_field form.include_pending layout="control" %}
-        </fieldset>
-        <fieldset>
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "General" %}</legend>
+                {% bootstrap_field form.name layout="control" %}
+                {% if form.subevent %}
+                    {% bootstrap_field form.subevent layout="control" %}
+                {% endif %}
+                {% bootstrap_field form.include_pending layout="control" %}
+                {% bootstrap_field form.all_products layout="control" %}
+                {% bootstrap_field form.limit_products layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Advanced" %}</legend>
+                <div class="alert alert-info">
+                    {% blocktrans trimmed %}
+                        These settings on this page are intended for professional users with very specific check-in
+                        situations. Please reach out to support if you have questions about setting this up.
+                    {% endblocktrans %}
+                    <br>
+                </div>
+                <div class="alert alert-warning">
+                    {% blocktrans trimmed %}
+                        Make sure to always use the latest version of our scanning apps for these options to work.
+                    {% endblocktrans %}
+                    <br>
+                    <strong>
+                        {% blocktrans trimmed %}
+                            If you make use of these advanced options, we recommend using our Android and Desktop apps.
+                            Custom check-in rules do not work offline with our iOS scanning app.
+                        {% endblocktrans %}
+                    </strong>
+                </div>
 
-            <legend>{% trans "Products" %}</legend>
-            <p>
-                {% blocktrans trimmed %}
-                    Please select the products that should be part of this check-in list.
-                {% endblocktrans %}
-            </p>
-            {% bootstrap_field form.all_products layout="control" %}
-            {% bootstrap_field form.limit_products layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Advanced" %}</legend>
-            {% bootstrap_field form.auto_checkin_sales_channels layout="control" %}
-        </fieldset>
+                {% bootstrap_field form.allow_multiple_entries layout="control" %}
+                {% bootstrap_field form.allow_entry_after_exit layout="control" %}
+                {% bootstrap_field form.auto_checkin_sales_channels layout="control" %}
+
+                <h3>{% trans "Custom check-in rule" %}</h3>
+                <div id="rules-editor" class="form-inline">
+                    <checkin-rules-editor></checkin-rules-editor>
+                </div>
+                <div class="disabled-withoutjs sr-only">
+                    {{ form.rules }}
+                </div>
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
             </button>
         </div>
     </form>
+    {% compress js %}
+        <script type="text/javascript" src="{% static "vuejs/vue.js" %}"></script>
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules.js" %}"></script>
+    {% endcompress %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/checkin/lists.html

@@ -97,7 +97,13 @@
                             </div>
                         </td>
                         {% if request.event.has_subevents %}
-                            <td>{{ cl.subevent.name }} – {{ cl.subevent.get_date_range_display }}</td>
+                            {% if cl.subevent %}
+                                <td>{{ cl.subevent.name }} – {{ cl.subevent.get_date_range_display }}</td>
+                            {% else %}
+                                <td>
+                                    <em>{% trans "All" %}</em>
+                                </td>
+                            {% endif %}
                         {% endif %}
                         <td>
                             {% for channel in cl.auto_checkin_sales_channels %}
@@ -121,7 +127,7 @@
                         <td class="text-right flip">
                             <a href="{% url "control:event.orders.checkinlists.show" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-default btn-sm"><i class="fa fa-eye"></i></a>
                             {% if "can_change_event_settings" in request.eventpermset %}
-                                <a href="{% url "control:event.orders.checkinlists.edit" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.orders.checkinlists.edit" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-default btn-sm"><i class="fa fa-wrench"></i></a>
                                 <a href="{% url "control:event.orders.checkinlists.delete" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
                             {% endif %}
                         </td>

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -298,10 +298,14 @@
                                 {% endif %}
                                 {% if line.checkins.all %}
                                     {% for c in line.checkins.all %}
-                                        {% if c.auto_checked_in %}
+                                        {% if c.type == "exit" %}
+                                            <span class="fa fa-fw fa-sign-out" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Exit scan: {{ date }}{% endblocktrans %}"></span>
+                                        {% elif c.forced %}
+                                            <span class="fa fa-fw fa-warning" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}"></span>
+                                        {% elif c.auto_checked_in %}
                                             <span class="fa fa-fw fa-magic" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}"></span>
                                         {% else %}
-                                            <span class="fa fa-fw fa-check" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}First scanned: {{ date }}{% endblocktrans %}"></span>
+                                            <span class="fa fa-fw fa-check" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Entry scan: {{ date }}{% endblocktrans %}"></span>
                                         {% endif %}
                                     {% endfor %}
                                 {% endif %}
@@ -324,6 +328,10 @@
                                 {% if line.subevent %}
                                     <br/>
                                     <span class="fa fa-calendar"></span> {{ line.subevent.name }} &middot; {{ line.subevent.get_date_range_display }}
+                                    {% if event.settings.show_times %}
+                                        <span class="fa fa-clock-o"></span>
+                                        {{ line.subevent.date_from|date:"TIME_FORMAT" }}
+                                    {% endif %}
                                 {% endif %}
                                 {% if not line.canceled %}
                                     <div class="position-buttons">