This commit is contained in:
nikolark committed 2014-10-11 17:06:29 +02:00
1 parent f8a94b7bee
commit c7fb6102b0
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -37,7 +37,7 @@
<tr> <tr>
<td>{{ order.created }}</td> <td>{{ order.created }}</td>
<td>{% if order.customer %}{% if order.customer.get_profile.image %}<img src="{{ order.customer.get_profile.image }}" class="customer" title="{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}" />{% else %}{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}{% endif %}{% else %}Ekstern{% endif %}</td> <td>{% if order.customer %}{% if order.customer.get_profile.image %}<img src="{{ order.customer.get_profile.image }}" class="customer" title="{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}" />{% else %}{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}{% endif %}{% else %}Ekstern{% endif %}</td>
<td>{% for line in order.orderline_set.all %} <td>{% for line in order.orderlines.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> <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>{{ 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><{% 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>-->
+1 -1
View File
@@ -9,7 +9,7 @@
<p> <p>
Orderen inneholdt: Orderen inneholdt:
<ul> <ul>
{% for line in order.orderline_set.all %} {% for line in order.orderlines.all %}
<li> <li>
<span class="bold">{{ line.amount}}</span> <span class="bold">{{ line.amount}}</span>
<a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a> <a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a>