fix non-formatted and non-vatted price

This commit is contained in:
Hannes Huber 2020-05-10 14:57:02 +02:00
parent d4d1426438
commit 95e52cc79d
2 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@
<script th:src="@{/js/back.js}"></script> <script th:src="@{/js/back.js}"></script>
<div class="back" data-group="shop" data-insert="true"></div> <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> <p th:text="${article.description}"></p>
</div> </div>
<div class="s"> <div class="s">
@ -32,7 +32,7 @@
<div class="s"></div> <div class="s"></div>
<form class="s" method="POST"> <form class="s" method="POST">
<div class="detailgrid m"> <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> <div>
<label class="nolinebreak">Menge:</label> <label class="nolinebreak">Menge:</label>
<select name="quantity" size="1"> <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"> <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})}"/> <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
<h2 th:text="${article.title}"></h2> <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> <p th:text="${article.description}"></p>
</a> </a>
</section> </section>

View File

@ -23,7 +23,7 @@
<img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/> <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
<h2 th:text="${article.title}" /> <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}" /> <p th:text="${article.description}" />
</a> </a>
</section> </section>
@ -65,7 +65,7 @@
<img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/> <img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}"/>
<h2 th:text="${article.title}" /> <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}" /> <p th:text="${article.description}" />
</a> </a>
</section> </section>