Show stoptime AND countdown on home and order page
This commit is contained in:
parent
09c65e2bcc
commit
4322f620d7
2 changed files with 8 additions and 3 deletions
|
@ -25,7 +25,9 @@
|
||||||
{% if order.location.telephone != None %}
|
{% if order.location.telephone != None %}
|
||||||
telephone: <a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a><br/>
|
telephone: <a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a><br/>
|
||||||
{% endif %}
|
{% 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 %}
|
total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% if form -%}
|
{% if form -%}
|
||||||
|
|
|
@ -2,7 +2,10 @@
|
||||||
<div class="row darker">
|
<div class="row darker">
|
||||||
<div class="col-md-8 col-lg-9">
|
<div class="col-md-8 col-lg-9">
|
||||||
<h5>{{ order.location.name }}</h5>
|
<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>
|
<b>Orders:</b> {{ order.items.count() }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 col-lg-3">
|
<div class="col-md-4 col-lg-3">
|
||||||
|
@ -19,4 +22,4 @@
|
||||||
{%- elif field.description -%}
|
{%- elif field.description -%}
|
||||||
<p class="help-block">{{field.description|safe}}</p>
|
<p class="help-block">{{field.description|safe}}</p>
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
Loading…
Reference in a new issue