merge branch feature/160

This commit is contained in:
pauline 2024-01-02 20:33:15 +01:00
parent 12e8cd8baa
commit dd1b28cc11

View file

@ -84,6 +84,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th style="font-size: 0.5em; width: 2em">OK</th>
<th style="text-align: center">Nom</th> <th style="text-align: center">Nom</th>
{% for item in items %} {% for item in items %}
<th class="item_name" style="font-weight: normal;"> <th class="item_name" style="font-weight: normal;">
@ -91,11 +92,11 @@
</th> </th>
{% endfor %} {% endfor %}
<th style="width: 2cm">Prix</th> <th style="width: 2cm">Prix</th>
<th style="font-size: 0.5em; width: 2em">OK</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr style="background-color: #bababa"> <tr style="background-color: #bababa">
<td></td>
<td style="text-align: left">Prix unitaire</td> <td style="text-align: left">Prix unitaire</td>
{% for item in items %} {% for item in items %}
<td> <td>
@ -103,9 +104,9 @@
</td> </td>
{% endfor %} {% endfor %}
<td></td> <td></td>
<td></td>
</tr> </tr>
<tr style="background-color: #bababa"> <tr style="background-color: #bababa">
<th></th>
<th style="text-align: left">TOTAL</th> <th style="text-align: left">TOTAL</th>
{% for item in items %} {% for item in items %}
<th> <th>
@ -113,10 +114,10 @@
</th> </th>
{% endfor %} {% endfor %}
<th>{{ grouped_order.total_price }} €</th> <th>{{ grouped_order.total_price }} €</th>
<th></th>
</tr> </tr>
{% for order, ordered_items in orders_dict.items %} {% for order, ordered_items in orders_dict.items %}
<tr> <tr>
<td></td>
<td> <td>
{{ order.author.last_name|upper }} {{ order.author.first_name }} {{ order.author.last_name|upper }} {{ order.author.first_name }}
</td> </td>
@ -130,7 +131,6 @@
<td> <td>
{{ order.price }} € {{ order.price }} €
</td> </td>
<td></td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>