johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Parpaillax
2024-04-25 15:44:49 +02:00
parent 061c4003ed a898b160b7
commit 34d3696adf
6 changed files with 96 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/templates/article.html
View File

@@ -26,7 +26,7 @@
</div>
<div class="mt-2 d-flex flex-row align-items-end justify-content-between">
<strong><label class="col-form-label">Vendeur</label></strong>
<span th:text="${username}"></span>
<span th:text="${username.pseudo}"></span>
</div>
<div class="mt-2 d-flex flex-row align-items-end justify-content-between">
<strong><label class="col-form-label">Catégorie</label></strong>
@@ -40,6 +40,18 @@
<strong><label class="col-form-label">Date fin enchère</label></strong>
<span th:text="${article.dateFinEnch}"></span>
</div>
<!-- Rajouter une condition sur retrait pour l'afficher uniquement quand -->
<!-- la vente est gagné ET à l'utilisateur qui a remporté la vente-->
<div class="mt-2 d-flex flex-row align-items-end justify-content-between">
<strong><label class="col-form-label">Retrait</label></strong>
<span th:text="${retrait} ? ${retrait.rue} + ' ' + ${retrait.code_postale} + ' ' + ${retrait.ville} : 'Adresse inconnue'"></span>
</div>
<form th:action="@{/enchere/incEnchere}" method="post" th:object="${enchere}" class="mt-2 d-flex flex-row align-items-end justify-content-between">
<input type="hidden" id="articleId" name="articleId" th:value="${article.id}">
<label for="montantEnchere">Montant</label>
<input type="number" th:field="*{montantEnchere}" id="montantEnchere">
<button type="submit" class="btn btn-primary">Enchérir</button>
</form>
</div>
</div>
</div>