This commit is contained in:
nikolark committed 2012-08-16 19:56:33 +02:00
1 parent 305e9888a0
commit 6b2dc28ea3
5 files changed
+35 -3

No files matched your search

+1 -1
View File
@@ -41,7 +41,7 @@
<td>{% for line in order.orderline_set.all %}
<span class="amount">{{ line.amount}}</span> <a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td>{{ order.order_sum }}</td>
<td>{% include "modal-delete-order.html" with order=order %}<a class="btn btn-danger" data-toggle="modal" href="#modal-order-{{order.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>
<td><a class="btn btn-info" data-toggle="modal" href="{% url order_reciept order=order.id %} "><i class="icon-list-alt icon-white"></i> Kvittering</a> {% include "modal-delete-order.html" with order=order %}<a class="btn btn-danger" data-toggle="modal" href="#modal-order-{{order.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>
</tr>
{% endfor %}
</tbody>
+2 -2
View File
@@ -7,11 +7,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a href="/" class="brand">Biceps Bar System - BBS</a>
<a href="/" class="brand">KAKtoffelbodens flotte campingkasse [BBS]</a>
<div class="nav-collapse">
<ul class="nav">
{% if active %}
<li class="{% if active = "register" %}active{% endif %}"><a href="/register"><i class="icon-home icon-white"></i> Kjøp drikke</a></li>
<li class="{% if active = "register" %}active{% endif %}"><a href="/register"><i class="icon-home icon-white"></i> Kjøp</a></li>
<li class="{% if active = "deposit" %}active{% endif %}"><a href="/deposit">Sett inn penger</a></li>
<li class="{% if active = "log" %}active{% endif %}"><a href="/log"> Vis logg</a></li>
<li class="{% if active = "stats" %}active{% endif %}"><a href="/stats"> Vis statistikk</a></li>
+22
View File
@@ -0,0 +1,22 @@
{% extends "base.html" %}
{% block content %}
<section id="reciept" class="row-fluid">
<section class="row-fluid">
<div class="span6">
<h2>KAKtoffelboden - plassen utenfor Chateau Neuf</h2>
<ul>
<li>
Dato: {{ order.created }}
</li>
{% for line in orderlines %}
<li>
<strong>{{line.product }}</strong> {{line.amount}} stk * {{line.unit_price}} = {{line.tot}}
</li>
{% endfor %}
</ul>
Totalt: {{order.order_sum }}
</div>
</section>
{% endblock %}