From 4322f620d7627fedd49eb80e7f154823c5d4ccc1 Mon Sep 17 00:00:00 2001 From: klaasgoethals Date: Fri, 15 Feb 2019 16:47:02 +0100 Subject: [PATCH] Show stoptime AND countdown on home and order page --- app/templates/order.html | 4 +++- app/templates/utils.html | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/templates/order.html b/app/templates/order.html index dc8e17f..43cfd1d 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -25,7 +25,9 @@ {% if order.location.telephone != None %} telephone: {{ order.location.telephone }}
{% endif %} - status: {% if order.stoptime %}{{ order.stoptime|countdown }}{% else %}open{% endif %}
+ {% if order.stoptime %} + closing time: {{ order.stoptime.strftime("%H:%M") }} ({{ order.stoptime|countdown }}) + {% else %}open{% endif %}
total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %} {% if form -%} diff --git a/app/templates/utils.html b/app/templates/utils.html index e2e32ec..6e116ff 100644 --- a/app/templates/utils.html +++ b/app/templates/utils.html @@ -2,7 +2,10 @@
{{ order.location.name }}
-

Status: {{ order.stoptime|countdown }}
+

+ {% if order.stoptime %} + Closing time: {{ order.stoptime.strftime("%H:%M") }} ({{ order.stoptime|countdown }}) + {% else %}open{% endif %}
Orders: {{ order.items.count() }}

@@ -19,4 +22,4 @@ {%- elif field.description -%}

{{field.description|safe}}

{%- endif %} -{% endmacro %} \ No newline at end of file +{% endmacro %}