Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #96 from ZeusWPI/date_time_update

Browse source 
Date time update. 
Update looks good, merging.
This commit is contained in:
Maxime 2019-04-01 23:41:08 +02:00 committed by GitHub
commit cd3e31d44b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/templates/order.html
View file

@ -25,7 +25,10 @@
{% 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/> 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 %} total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %}
</div> </div>
{% if form -%} {% if form -%}

7
app/templates/utils.html
View file

@ -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 %}