Subversion Repositories SmartDukaan

Rev

Rev 32021 | Rev 32949 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32021 Rev 32868
Line 73... Line 73...
73 
	private boolean discount = false;
 73 
	private boolean discount = false;
74 
 
 74 
 
75 
	@Column(name = "active", columnDefinition = "TINYINT(1)")
 75 
	@Column(name = "active", columnDefinition = "TINYINT(1)")
76 
	private boolean active;
 76 
	private boolean active;
77 
 
 77 
 
78 
	@Override
 - 
 
79 
	public boolean equals(Object o) {
 - 
 
80 
		if (this == o) return true;
 - 
 
81 
		if (o == null || getClass() != o.getClass()) return false;
 - 
 
82 
		Offer offer = (Offer) o;
 - 
 
83 
		return id == offer.id && Double.compare(offer.brandSharePercentage, brandSharePercentage) == 0 && baseCriteia == offer.baseCriteia && Double.compare(offer.sellinPercentage, sellinPercentage) == 0 && booster == offer.booster && active == offer.active && alreadyActive == offer.alreadyActive && Objects.equals(name, offer.name) && Objects.equals(offerNotes, offer.offerNotes) && Objects.equals(terms, offer.terms) && schemeType == offer.schemeType && targetType == offer.targetType && payoutType == offer.payoutType && Objects.equals(activationBrands, offer.activationBrands) && Objects.equals(itemCriteria, offer.itemCriteria) && Objects.equals(partnerCriteria, offer.partnerCriteria) && Objects.equals(startDate, offer.startDate) && Objects.equals(endDate, offer.endDate) && Objects.equals(createdTimestamp, offer.createdTimestamp) && Objects.equals(processedTimestamp, offer.processedTimestamp) && Objects.equals(itemCriteriaString, offer.itemCriteriaString);
 - 
 
84 
	}
 - 
 
85 
 
 - 
 
86 
	@Override
 - 
 
87 
	public int hashCode() {
 - 
 
88 
		return Objects.hash(id, brandSharePercentage, name, offerNotes, terms, schemeType, baseCriteia, sellinPercentage, targetType, payoutType, activationBrands, itemCriteria, partnerCriteria, startDate, endDate, createdTimestamp, booster, active, processedTimestamp, alreadyActive, itemCriteriaString);
 - 
 
89 
	}
 - 
 
90 
 
 - 
 
91 
	public LocalDateTime getProcessedTimestamp() {
 78 
	public LocalDateTime getProcessedTimestamp() {
92 
		return processedTimestamp;
 79 
		return processedTimestamp;
93 
	}
 80 
	}
94 
 
 81 
 
95 
	public void setProcessedTimestamp(LocalDateTime processedTimestamp) {
 82 
	public void setProcessedTimestamp(LocalDateTime processedTimestamp) {
Line 97... Line 84...
97 
	}
 84 
	}
98 
 
 85 
 
99 
	@Column(name = "processed_timestamp")
 86 
	@Column(name = "processed_timestamp")
100 
	private LocalDateTime processedTimestamp;
 87 
	private LocalDateTime processedTimestamp;
101 
 
 88 
 
102 
	@Transient
 - 
 
103 
	private boolean alreadyActive;
 - 
 
104 
 
 - 
 
105 
 
 - 
 
106 
	public boolean isAlreadyActive() {
 - 
 
107 
		return alreadyActive;
 - 
 
108 
	}
 - 
 
109 
 
 - 
 
110 
	public void setAlreadyActive(boolean alreadyActive) {
 - 
 
111 
		this.alreadyActive = alreadyActive;
 - 
 
112 
	}
 - 
 
113 
 
 89 
 
114 
	public AchievementType getPayoutType() {
 90 
	public AchievementType getPayoutType() {
115 
		return payoutType;
 91 
		return payoutType;
116 
	}
 92 
	}
117 
 
 93 
 
Line 287... Line 263...
287 
				", createdTimestamp=" + createdTimestamp +
 263 
				", createdTimestamp=" + createdTimestamp +
288 
				", booster=" + booster +
 264 
				", booster=" + booster +
289 
				", discount=" + discount +
 265 
				", discount=" + discount +
290 
				", active=" + active +
 266 
				", active=" + active +
291 
				", processedTimestamp=" + processedTimestamp +
 267 
				", processedTimestamp=" + processedTimestamp +
292 
				", alreadyActive=" + alreadyActive +
 - 
 
293 
				", itemCriteriaString='" + itemCriteriaString + '\'' +
 268 
				", itemCriteriaString='" + itemCriteriaString + '\'' +
294 
				'}';
 269 
				'}';
295 
	}
 270 
	}
296 
 
 271 
 
297 
	public boolean isDiscount() {
 272 
	public boolean isDiscount() {