Refs #82 -- Make order expiry more clear (#116)

src/pretix/control/templates/pretixcontrol/event/settings.html

@@ -33,6 +33,7 @@
             {% bootstrap_field sform.show_items_outside_presale_period layout="horizontal" %}
             {% bootstrap_field sform.payment_term_days layout="horizontal" %}
             {% bootstrap_field sform.payment_term_last layout="horizontal" %}
+            {% bootstrap_field sform.payment_term_expire_automatically layout="horizontal" %}
             {% bootstrap_field sform.payment_term_accept_late layout="horizontal" %}
             {% bootstrap_field sform.last_order_modification_date layout="horizontal" %}
         </fieldset>

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

@@ -47,6 +47,17 @@
             </form>
         {% endif %}
     {% endif %}
+    {% if order.is_expired_by_time %}
+        <form action="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"
+                method="post">
+            {% csrf_token %}
+            <div class="alert alert-info">
+                <button name="status" value="e" class="btn btn-default pull-right">{% trans "Expire order" %}</button>
+                {% trans "The payment for this order is overdue, but you have configured not to expire orders automatically. To free quota capacity, you can mark it as expired manually." %}
+                <div class="clearfix"></div>
+            </div>
+        </form>
+    {% endif %}
 
     <div class="row">
         <div class="col-xs-12 col-lg-10">

src/pretix/control/templates/pretixcontrol/orders/fragment_order_status.html

@@ -5,7 +5,7 @@
 {% elif order.status == "p" %}
     <span class="label label-success {{ class }}">{% trans "Paid" %}</span>
 {% elif order.status == "e" %} {# expired #}
-    <span class="label label-danger {{ class }}">{% trans "Pending (expired)" %}</span>
+    <span class="label label-danger {{ class }}">{% trans "Expired" %}</span>
 {% elif order.status == "c" %}
     <span class="label label-danger {{ class }}">{% trans "Cancelled" %}</span>
 {% elif order.status == "r" %}