From fbe8ce69530177a1145f1cb0181d4540ce324405 Mon Sep 17 00:00:00 2001
From: Mathis Kral <mathis_tiberius.kral@mailbox.tu-dresden.de>
Date: Fri, 26 Jan 2024 17:57:16 +0100
Subject: [PATCH] Fix wrong price calculation on invoice

---
 src/main/resources/templates/invoice.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/invoice.html b/src/main/resources/templates/invoice.html
index 7cc4c34..dddddbd 100644
--- a/src/main/resources/templates/invoice.html
+++ b/src/main/resources/templates/invoice.html
@@ -25,21 +25,24 @@ SPDX-FileCopyrightText: 2023-2024 swt23w23
 					<th scope="col">Beschreibung</th>
 					<th scope="col">Einzelpreis/Basispreis</th>
 					<th scope="col">Menge</th>
+					<th scope="col">Mietpreis</th>
 					<th scope="col">Gesamtpreis</th>
 				</tr>
 			</thead>
 			<tbody class="table-group-divider">
 				<tr th:each="orderLine : ${order.getOrderLines()}">
 					<td th:text="${orderLine.getProductName()}"></td>
-					<td th:text="${orderLine.getPrice()}"></td>
+					<td th:text="${orderLine.getPrice().divide(orderLine.getQuantity().getAmount())}"></td>
 					<td th:text="${orderLine.getQuantity()}"></td>
-					<td th:text="${orderLine.getPrice().multiply(orderLine.getQuantity().getAmount()).add(order.getChargeLines(orderLine).getTotal())}"></td>
+					<td th:text="${order.getChargeLines(orderLine).getTotal()}"></td>
+					<td th:text="${orderLine.getPrice().add(order.getChargeLines(orderLine).getTotal())}"></td>
 				</tr>
 				<tr th:each="chargeLine : ${order.getChargeLines()}">
 					<td th:text="${staffCharges.get(chargeLine).getName()}"></td>
-					<td th:text="${chargeLine.getPrice()}"></td>
+					<td>-</td>
 					<td>1</td>
 					<td th:text="${chargeLine.getPrice()}"></td>
+					<td th:text="${chargeLine.getPrice()}"></td>
 				</tr>
 			</tbody>
 		</table>