feat: jobs filters/sort/summary, prix HT/TTC/remise, poids piece, meshy fixes
Deploy via Portainer / deploy (push) Successful in 0s
Deploy via Portainer / deploy (push) Successful in 0s
This commit is contained in:
+12
-5
@@ -99,7 +99,7 @@
|
|||||||
<th>Poids</th>
|
<th>Poids</th>
|
||||||
<th>Duree</th>
|
<th>Duree</th>
|
||||||
<th class="text-end">Prix HT</th>
|
<th class="text-end">Prix HT</th>
|
||||||
<th class="text-end">Prix final</th>
|
<th class="text-end">Prix TTC</th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -135,21 +135,28 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle small">{{ j.print_time_s | fmt_time }}</td>
|
<td class="align-middle small">{{ j.print_time_s | fmt_time }}</td>
|
||||||
|
{% set prix_ttc = (j.final_price / (1 - j.discount_pct / 100)) if (j.discount_pct and j.discount_pct > 0 and j.discount_pct < 100) else (j.final_price or 0) %}
|
||||||
<td class="align-middle text-end">
|
<td class="align-middle text-end">
|
||||||
{% if prix_ht > 0 %}
|
{% if prix_ht > 0 %}
|
||||||
<span class="fw-semibold">{{ '%.2f'|format(prix_ht) }} €</span><span class="text-muted" style="font-size:.72rem"> /pce</span>
|
<span class="fw-semibold">{{ '%.2f'|format(prix_ht) }} €</span><span class="text-muted" style="font-size:.72rem"> HT/pce</span>
|
||||||
{% if qty > 1 %}
|
{% if qty > 1 %}
|
||||||
<br><span class="text-muted" style="font-size:.78rem">{{ '%.2f'|format(prix_ht * qty) }} € x{{ qty }}</span>
|
<br><span class="text-muted" style="font-size:.78rem">{{ '%.2f'|format(prix_ht * qty) }} € x{{ qty }}</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}--{% endif %}
|
{% else %}--{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle text-end">
|
<td class="align-middle text-end">
|
||||||
<span class="fw-bold" style="color:#ff6b35">{{ '%.2f'|format(j.final_price or 0) }} €</span>
|
<span class="fw-semibold">{{ '%.2f'|format(prix_ttc) }} €</span><span class="text-muted" style="font-size:.72rem"> TTC</span>
|
||||||
{% if j.discount_pct and j.discount_pct > 0 %}
|
{% if j.discount_pct and j.discount_pct > 0 %}
|
||||||
<span class="badge bg-danger ms-1" style="font-size:.65rem">-{{ j.discount_pct }}%</span>
|
<br><span class="fw-bold" style="color:#ff6b35">{{ '%.2f'|format(j.final_price or 0) }} €</span>
|
||||||
|
<span class="badge bg-danger" style="font-size:.62rem">-{{ j.discount_pct }}%</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if qty > 1 %}
|
{% if qty > 1 %}
|
||||||
<br><span class="text-muted" style="font-size:.72rem">{{ '%.2f'|format((j.final_price or 0) * qty) }} € tot.</span>
|
<br><span class="text-muted" style="font-size:.72rem">
|
||||||
|
{{ '%.2f'|format(prix_ttc * qty) }} € TTC tot.
|
||||||
|
{% if j.discount_pct and j.discount_pct > 0 %}
|
||||||
|
→ <span style="color:#ff6b35">{{ '%.2f'|format((j.final_price or 0) * qty) }} €</span>
|
||||||
|
{% endif %}
|
||||||
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
|
|||||||
Reference in New Issue
Block a user