diff --git a/src/main/java/de/rwth/swc/sqa/DataService.java b/src/main/java/de/rwth/swc/sqa/DataService.java index 38b029fd5f3e2fa5ec2ecb094f03a0062530cea3..6a3d50900b0345920294d4c6184f169eab93ff85 100644 --- a/src/main/java/de/rwth/swc/sqa/DataService.java +++ b/src/main/java/de/rwth/swc/sqa/DataService.java @@ -65,7 +65,8 @@ public class DataService { public static boolean discountCanBeApplied(DiscountCard discountCard, TicketValidationRequest ticketValidationRequest){ boolean applyDiscount=false; if(discountCard.getId().equals(ticketValidationRequest.getDiscountCardId())){ - if(ticketValidationRequest.getZone().getValue().equals("30d")|| ticketValidationRequest.getZone().getValue().equals("1y")){ + if(ticketValidationRequest.getDisabled()){ + //if(ticketValidationRequest.get.getValue().equals("30d")|| ticketValidationRequest.getZone().getValue().equals("1y")){ //apply type 25 and 50 applyDiscount=true; }