From 95e52cc79dc4037806e823b8758d8bef0f67be3b Mon Sep 17 00:00:00 2001
From: Hannes <hannes_huber@t-online.de>
Date: Sun, 10 May 2020 14:57:02 +0200
Subject: [PATCH] fix non-formatted and non-vatted price

---
 .../src/main/resources/templates/shop/articles/id.html      | 6 +++---
 prototype/src/main/resources/templates/shop/index.html      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/prototype/src/main/resources/templates/shop/articles/id.html b/prototype/src/main/resources/templates/shop/articles/id.html
index 73de367..588b5be 100644
--- a/prototype/src/main/resources/templates/shop/articles/id.html
+++ b/prototype/src/main/resources/templates/shop/articles/id.html
@@ -23,7 +23,7 @@
                     <script th:src="@{/js/back.js}"></script>
                     <div class="back" data-group="shop" data-insert="true"></div>
 
-                    <h2 th:text="${article.shopPricePerUnitNetCent}"></h2>
+                    <h2><span th:text="${#numbers.formatDecimal(article.getPriceGross() * 0.01, 1, 'POINT', 2, 'COMMA')}"></span><span> EUR</span></h2>
                     <p th:text="${article.description}"></p>
                 </div>
                 <div class="s">
@@ -32,7 +32,7 @@
                 <div class="s"></div>
                 <form class="s" method="POST">
                     <div class="detailgrid m">
-                        <h2 th:text="${article.shopPricePerUnitNetCent}"></h2>
+                        <h2><span th:text="${#numbers.formatDecimal(article.getPriceGross() * 0.01, 1, 'POINT', 2, 'COMMA')}"></span><span> EUR</span></h2>
                         <div>
                             <label class="nolinebreak">Menge:</label>
                             <select name="quantity" size="1">
@@ -58,7 +58,7 @@
                 <section th:each="article: ${commercialArticles}"><a th:href="@{/shop/articles/{id}(id = ${article.id})}" class="section">
                     <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
                     <h2 th:text="${article.title}"></h2>
-                    <p class='price' th:text="${article.shopPricePerUnitNetCent}"></p>
+                    <p class='price'><span th:text="${#numbers.formatDecimal(article.getPriceGross() * 0.01, 1, 'POINT', 2, 'COMMA')}"></span><span> EUR</span></p>
                     <p th:text="${article.description}"></p>
                 </a>
                 </section>
diff --git a/prototype/src/main/resources/templates/shop/index.html b/prototype/src/main/resources/templates/shop/index.html
index f38b012..300471a 100644
--- a/prototype/src/main/resources/templates/shop/index.html
+++ b/prototype/src/main/resources/templates/shop/index.html
@@ -23,7 +23,7 @@
 
                         <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
                         <h2 th:text="${article.title}" />
-                        <p class='price' th:text="${article.shopPricePerUnitNetCent}" />
+                        <p class='price'><span th:text="${#numbers.formatDecimal(article.getPriceGross() * 0.01, 1, 'POINT', 2, 'COMMA')}"></span><span> EUR</span></p>
                         <p th:text="${article.description}" />
                     </a>
                 </section>
@@ -65,7 +65,7 @@
 
                             <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
                             <h2 th:text="${article.title}" />
-                            <p class='price' th:text="${article.shopPricePerUnitNetCent}" />
+                            <p class='price'><span th:text="${#numbers.formatDecimal(article.getPriceGross() * 0.01, 1, 'POINT', 2, 'COMMA')}"></span><span> EUR</span></p>
                             <p th:text="${article.description}" />
                         </a>
                     </section>