-
Order opens
-
{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}
+
+
+
- Order opens
+ - {{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}
- - Order closes
- -
- {% if order.stoptime %}
- {% set stoptimefmt = (
- "%H:%M" if order.stoptime.date() == order.starttime.date()
- else "%Y-%m-%d, %H:%M"
- ) %}
- {{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }})
- {% else %}
- Never
- {% endif %}
-
-
-
-
-
- Location
-
-
- {% if order.location %}
- {{ order.location_name }}
- {% else %}
- {{ order.location_name }}
- {% endif %}
-
-
-
- Courier
-
-
- {% if order.courier == None %}
- {% if not current_user.is_anonymous() %}
-
- {% else %}No-one yet{% endif %}
- {% else %}
- {{ order.courier.username }}
- {% endif %}
-
-
-
-
-
-
-
+
Order closes
+
+ {% if order.stoptime %}
+ {% set stoptimefmt = (
+ "%H:%M" if order.stoptime.date() == order.starttime.date()
+ else "%Y-%m-%d, %H:%M"
+ ) %}
+ {{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }})
+ {% else %}
+ Never
+ {% endif %}
+
+
+
+
Location
+
+ {% if order.location %}
+ {{ order.location_name }}
+ {% else %}
+ {{ order.location_name }}
+ {% endif %}
+
+
+
Courier
+
+ {% if order.courier == None %}
+ {% if not current_user.is_anonymous() %}
+
+ {% else %}No-one yet{% endif %}
+ {% else %}
+ {{ order.courier.username }}
+ {% endif %}
+
+
+
+
+
+ {% if order.can_close(current_user.id) -%}
+
+ {% endif %}
+ {% if courier_or_admin %}
+
Edit
+ {%- endif %}
-
- {% if order.can_close(current_user.id) -%}
-
- {% endif %}
- {% if courier_or_admin %}
-
Edit
- {%- endif %}
-
diff --git a/app/templates/utils.html b/app/templates/utils.html
index ed7e2f3..6ef2cf7 100644
--- a/app/templates/utils.html
+++ b/app/templates/utils.html
@@ -1,17 +1,14 @@
{% macro render_order(order) -%}
-
+
{{ order.location_name }}
-
{{ order.items.count() }} items ordered for {{ order.association }}
+
{{ order.items.count() }} items ordered
{% if order.stoptime %}
Closes {{ order.stoptime.strftime("%H:%M") }}{{ order.stoptime|countdown }}
{% else %}open{% endif %}
-
-
-
-