Merge pull request #96 from ZeusWPI/date_time_update
Date time update. Update looks good, merging.
This commit is contained in:
commit
cd3e31d44b
2 changed files with 9 additions and 3 deletions
|
@ -25,7 +25,10 @@
|
|||
{% 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/>
|
||||
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/>
|
||||
total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %}
|
||||
</div>
|
||||
{% if form -%}
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in a new issue