diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index 9a07294..f7168f6 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -198,10 +198,13 @@ public class ArticleController { LocalDate dateFinEnch = LocalDate.parse(dateFin); LocalDate datePlusUnJour = LocalDate.now().plusDays(1); if (dateFinEnch.isBefore(datePlusUnJour)) { - redirectAttributes.addAttribute("erreur", "La date de début d'enchère ne peux pas être infàrieur à la date du jour + 1."); + redirectAttributes.addAttribute("erreur", "La date de début d'enchère ne peux pas être infèrieur à la date du jour + 1."); + return "redirect:/article/new"; + } + if (dateFinEnch.isBefore(dateDebutEnch) || dateFinEnch.isEqual(dateDebutEnch)){ + redirectAttributes.addAttribute("erreur", "La date de fin d'enchère ne peux pas être infèrieur ou égal à la date de début d'enchère."); return "redirect:/article/new"; } - //Vérification rue if (!Pattern.matches("^[a-zA-Z0-9 ]+$", retrait.getRue())){ redirectAttributes.addAttribute("erreur", "Le rue n'est pas valide."); diff --git a/src/main/java/fr/eni/enchere/controllers/EnchereController.java b/src/main/java/fr/eni/enchere/controllers/EnchereController.java index 5241bbd..158bf26 100644 --- a/src/main/java/fr/eni/enchere/controllers/EnchereController.java +++ b/src/main/java/fr/eni/enchere/controllers/EnchereController.java @@ -99,14 +99,15 @@ public class EnchereController { .max(Comparator.comparing(Enchere::getMontantEnchere)) // Comparaison basée sur le montant d'enchère .map(Enchere::getPseudoUtilisateur); UserProfil user = this.userService.utilisateurByName(pseudoMaxEnchere.get()); - + //Get seller + Article articleSell = articleService.findArticleById(id); + UserProfil userSeller = userService.utilisateurById(articleSell.getUtilisateur()); Optional maxMontantEnchere = listEncheres.stream() .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère .max(Float::compareTo); //setCredit user. - float userCredit = user.getCredit(); - float newCredit = userCredit - maxMontantEnchere.get(); + float newCredit = user.getCredit() - maxMontantEnchere.get(); this.userService.setCredit(newCredit, user.getId()); //Delete enchere @@ -116,6 +117,11 @@ public class EnchereController { //Delete article this.articleService.setSellPrice(id, maxMontantEnchere.get()); + + //Crédit selleur + float sellerCredit = userSeller.getCredit() + maxMontantEnchere.get(); + this.userService.setCredit(sellerCredit, userSeller.getId()); + return "redirect:/enchere"; } diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties index e04a036..de8f6c0 100644 --- a/src/main/resources/i18n/messages_en.properties +++ b/src/main/resources/i18n/messages_en.properties @@ -31,6 +31,7 @@ home.article.end = End of auction: footer.desc = Created by the association "Objects are our friends", ENI-Auctions aims to help its members sell or buy objects of all kinds. profil.title = My Profile +profil.title.other = User profile profil.button = Edit profil.pseudo = Username: profil.surname = First name: @@ -40,6 +41,7 @@ profil.phone = Phone: profil.street = Street: profil.postal = Postal code: profil.city = City: +profil.address = Address: profil.credit = Credits: edit.profil.currentpassword = Current password: @@ -87,6 +89,12 @@ admin.users.table.firstname = First name admin.users.table.email = Email admin.users.table.disable = Disable admin.users.table.delete = Delete +admin.users.bouton.save = Save +admin.users.bouton.isDisabled = Enabled +admin.users.bouton.disabled = Disabled +admin.users.bouton.delete = Delete +admin.users.bouton.isAdmin = Remove admin +admin.users.bouton.Admin = Add admin article.add.title = Add an article article.add.heading = New sale @@ -124,3 +132,9 @@ edit.article.title = Edit my article edit.article.update = Edit edit.article.back = Back edit.article.delete = Cancel my article + +bank.creditNumber = Credit number +bank.cardNumber = Card number +bank.cardExpired = Expiration date +bank.cardTitulaire = Name of the card holder +bank.payer = Pay \ No newline at end of file diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties index 9991f86..91c6d87 100644 --- a/src/main/resources/i18n/messages_fr.properties +++ b/src/main/resources/i18n/messages_fr.properties @@ -32,6 +32,7 @@ footer.desc = Cr\u00e9\u00e9e par l'association "Les objets sont nos amis", ENI- footer. profil.title = Mon profile +profil.title.other = Profil de l'utilisateur profil.button = Modifier profil.pseudo = Pseudo: profil.surname = Pr\u00e9nom: @@ -41,6 +42,7 @@ profil.phone = T\u00e9l\u00e9phone: profil.street = Rue: profil.postal = Code postal: profil.city = Ville: +profil.address = Adresse: profil.credit = Cr\u00e9dits: edit.profil.currentpassword = Mot de passe actuel: @@ -89,6 +91,12 @@ admin.users.table.firstname = Pr\u00E9nom admin.users.table.email = Email admin.users.table.disable = D\u00E9sactiver admin.users.table.delete = Supprimer +admin.users.bouton.save = save +admin.users.bouton.isDisabled = Activer +admin.users.bouton.disabled = D\u00E9sactiver +admin.users.bouton.delete = Supprimer +admin.users.bouton.isAdmin = Retirer Admin +admin.users.bouton.Admin = Ajouter admin article.add.title = Ajouter un article article.add.heading = Nouvelle vente @@ -126,4 +134,10 @@ article.details.retrait = Retrait effectu\u00E9 edit.article.title = Modifier mon article edit.article.update = Modifier edit.article.back = Retour -edit.article.delete = Annuler vente \ No newline at end of file +edit.article.delete = Annuler vente + +bank.creditNumber = Nombre de cr\u00E9dits +bank.cardNumber = Num\u00E9ro de carte +bank.cardExpired = date d'expiration +bank.cardTitulaire = Nom du titulaire de la carte +bank.payer = Payer \ No newline at end of file diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html index f720a56..13f14d5 100644 --- a/src/main/resources/templates/admin.html +++ b/src/main/resources/templates/admin.html @@ -62,23 +62,23 @@
- +
- +
- +
- +
diff --git a/src/main/resources/templates/article.html b/src/main/resources/templates/article.html index 9aaf481..bbada7e 100644 --- a/src/main/resources/templates/article.html +++ b/src/main/resources/templates/article.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/bank.html b/src/main/resources/templates/bank.html index e767d2d..caac232 100644 --- a/src/main/resources/templates/bank.html +++ b/src/main/resources/templates/bank.html @@ -10,7 +10,7 @@
- +
    @@ -19,7 +19,7 @@
- +
    @@ -28,7 +28,7 @@
- +
    @@ -46,7 +46,7 @@
- +
    @@ -54,7 +54,7 @@
- +
diff --git a/src/main/resources/templates/showProfil.html b/src/main/resources/templates/showProfil.html index 7434952..4c0366a 100644 --- a/src/main/resources/templates/showProfil.html +++ b/src/main/resources/templates/showProfil.html @@ -9,16 +9,16 @@
-

Profil de l'utilisateur

+

    -
  • Pseudo:
  • -
  • Nom:
  • -
  • Prénom:
  • -
  • Email:
  • -
  • Téléphone:
  • -
  • Adresse:
  • +
  • +
  • Nom:
  • +
  • Prénom:
  • +
  • Email:
  • +
  • Téléphone:
  • +
  • Adresse: