From 4322f620d7627fedd49eb80e7f154823c5d4ccc1 Mon Sep 17 00:00:00 2001
From: klaasgoethals <klaasgoethals2000@gmail.com>
Date: Fri, 15 Feb 2019 16:47:02 +0100
Subject: [PATCH 1/2] 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: <a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a><br/>
         {% endif %}
-        <b>status:</b> {% if order.stoptime %}<span class="time">{{  order.stoptime|countdown }}</span>{% else %}open{% endif %}<br/>
+        {% if order.stoptime %}
+            closing time: {{ order.stoptime.strftime("%H:%M") }} (<span class="time">{{  order.stoptime|countdown }}</span>)
+        {% else %}open{% endif %}<br/>
         total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %}
     </div>
     {% 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 @@
 <div class="row darker">
     <div class="col-md-8 col-lg-9">
         <h5>{{ order.location.name }}</h5>
-        <p><b>Status:</b> <span class="time">{{ order.stoptime|countdown }}</span><br/>
+        <p>
+        {% if order.stoptime %}
+            <b>Closing time: </b>{{ order.stoptime.strftime("%H:%M") }} (<span class="time">{{  order.stoptime|countdown }}</span>)
+        {% else %}open{% endif %}<br/>
         <b>Orders:</b> {{ order.items.count() }}</p>
     </div>
     <div class="col-md-4 col-lg-3">
@@ -19,4 +22,4 @@
 {%- elif field.description -%}
     <p class="help-block">{{field.description|safe}}</p>
 {%- endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}

From 71e16064d3489d4eaaaecd34a24714abde143dfd Mon Sep 17 00:00:00 2001
From: klaasgoethals <klaasgoethals2000@gmail.com>
Date: Fri, 15 Feb 2019 19:03:35 +0100
Subject: [PATCH 2/2] Added startdate and starttime on order page

---
 app/templates/order.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/templates/order.html b/app/templates/order.html
index 43cfd1d..6637b1c 100644
--- a/app/templates/order.html
+++ b/app/templates/order.html
@@ -25,6 +25,7 @@
         {% if order.location.telephone != None %}
             telephone: <a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a><br/>
         {% endif %}
+        start: {{ order.starttime.strftime("%d/%m/%Y %H:%M") }}<br>
         {% if order.stoptime %}
             closing time: {{ order.stoptime.strftime("%H:%M") }} (<span class="time">{{  order.stoptime|countdown }}</span>)
         {% else %}open{% endif %}<br/>