diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index 3cd695532..e02c79493 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -74,7 +74,7 @@ public class FoodOfferController { return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; } else { if(!this.checkDates(foodOffer)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; } Client client = this.clientService.getCurrentClient(); @@ -148,7 +148,7 @@ public class FoodOfferController { } else { if(!this.checkDates(foodOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return FoodOfferController.VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; } BeanUtils.copyProperties(this.foodOfferService.findFoodOfferById(foodOfferEdit.getId()), foodOfferEdit, diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index fa2c9e28e..6ff1dc88d 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -65,7 +65,7 @@ public class NuOfferController { private boolean checkConditions(final NuOffer NuOffer) { boolean res = false; - if(NuOffer.getGold() > NuOffer.getSilver() && NuOffer.getSilver() > NuOffer.getBronze()) { + if(NuOffer.getGold() >= NuOffer.getSilver() && NuOffer.getSilver() >= NuOffer.getBronze()) { res = true; } return res; @@ -73,7 +73,7 @@ public class NuOfferController { private boolean checkDiscounts(final NuOffer NuOffer) { boolean res = false; - if(NuOffer.getDiscountGold() > NuOffer.getDiscountSilver() && NuOffer.getDiscountSilver() > NuOffer.getDiscountBronze()) { + if(NuOffer.getDiscountGold() >= NuOffer.getDiscountSilver() && NuOffer.getDiscountSilver() >= NuOffer.getDiscountBronze()) { res = true; } return res; @@ -92,15 +92,15 @@ public class NuOfferController { return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } else { if(!this.checkDates(nuOffer)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkConditions(nuOffer)) { - //Poner aqui mensaje de error + result.rejectValue("gold","" ,"Oro debe ser mayor o igual que plata, y plata mayor o igual que bronce"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkDiscounts(nuOffer)) { - //Poner aqui mensaje de error + result.rejectValue("discountGold","" ,"El descuento de Oro debe ser mayor o igual que el de plata, y el de plata mayor o igual que el de bronce"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } nuOffer.setStatus(StatusOffer.hidden); @@ -175,15 +175,15 @@ public class NuOfferController { } else { if(!this.checkDates(nuOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkConditions(nuOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("gold","" ,"Oro debe ser mayor o igual que plata, y plata mayor o igual que bronce"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkDiscounts(nuOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("discountGold","" ,"El descuento de Oro debe ser mayor o igual que el de plata, y el de plata mayor o igual que el de bronce"); return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } BeanUtils.copyProperties(this.nuOfferService.findNuOfferById(nuOfferEdit.getId()), nuOfferEdit, "start", diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index a6ec32949..b749f7016 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -6,11 +6,10 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import org.springframework.cheapy.model.SpeedOffer; -import org.springframework.cheapy.model.StatusOffer; import org.springframework.beans.BeanUtils; import org.springframework.cheapy.model.Client; -import org.springframework.cheapy.model.FoodOffer; +import org.springframework.cheapy.model.SpeedOffer; +import org.springframework.cheapy.model.StatusOffer; import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.SpeedOfferService; import org.springframework.stereotype.Controller; @@ -63,7 +62,7 @@ public class SpeedOfferController { private boolean checkConditions(final SpeedOffer speedOffer) { boolean res = false; - if(speedOffer.getGold() < speedOffer.getSilver() && speedOffer.getSilver() < speedOffer.getBronze()) { + if(speedOffer.getGold() <= speedOffer.getSilver() && speedOffer.getSilver() <= speedOffer.getBronze()) { res = true; } return res; @@ -71,7 +70,7 @@ public class SpeedOfferController { private boolean checkDiscounts(final SpeedOffer speedOffer) { boolean res = false; - if(speedOffer.getDiscountGold() > speedOffer.getDiscountSilver() && speedOffer.getDiscountSilver() > speedOffer.getDiscountBronze()) { + if(speedOffer.getDiscountGold() >= speedOffer.getDiscountSilver() && speedOffer.getDiscountSilver() >= speedOffer.getDiscountBronze()) { res = true; } return res; @@ -90,15 +89,15 @@ public class SpeedOfferController { return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } else { if(!this.checkDates(speedOffer)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkConditions(speedOffer)) { - //Poner aqui mensaje de error + result.rejectValue("gold","" ,"Oro debe ser menor o igual que plata, y plata menor o igual que bronce"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkDiscounts(speedOffer)) { - //Poner aqui mensaje de error + result.rejectValue("discountGold","" ,"El descuento de Oro debe ser menor o igual que el de plata, y el de plata menor o igual que el de bronce"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } Client client = this.clientService.getCurrentClient(); @@ -168,15 +167,15 @@ public class SpeedOfferController { } else { if(!this.checkDates(speedOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkConditions(speedOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("gold","" ,"Oro debe ser menor o igual que plata, y plata menor o igual que bronce"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkDiscounts(speedOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("discountGold","" ,"El descuento de Oro debe ser menor o igual que el de plata, y el de plata menor o igual que el de bronce"); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } BeanUtils.copyProperties(this.speedOfferService.findSpeedOfferById(speedOfferEdit.getId()), speedOfferEdit, diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index 780854600..552fe2fe5 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -81,12 +81,12 @@ public class TimeOfferController { return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } else { if(!this.checkDates(timeOffer)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkTimes(timeOffer)) { - //Poner aqui mensaje de error + result.rejectValue("finish","" ,"La hora de fin debe ser posterior a la de inicio"); return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } @@ -166,11 +166,11 @@ public class TimeOfferController { } else { if(!this.checkDates(timeOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("end","" ,"La fecha de fin debe ser posterior a la fecha de inicio"); return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } if(!this.checkTimes(timeOfferEdit)) { - //Poner aqui mensaje de error + result.rejectValue("finish","" ,"La hora de fin debe ser posterior a la de inicio"); return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } BeanUtils.copyProperties(this.timeOfferService.findTimeOfferById(timeOfferEdit.getId()), timeOfferEdit,