Subversion Repositories SmartDukaan

Rev

Rev 36397 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36397 Rev 36451
Line 239... Line 239...
239
				+ type + ", amountType=" + amountType + ", gstReversal=" + basePlusGstCalc + ", amount=" + amount
239
				+ type + ", amountType=" + amountType + ", gstReversal=" + basePlusGstCalc + ", amount=" + amount
240
				+ ", startDateTime=" + startDateTime + ", endDateTime=" + endDateTime + ", createTimestamp="
240
				+ ", startDateTime=" + startDateTime + ", endDateTime=" + endDateTime + ", createTimestamp="
241
				+ createTimestamp + ", activeTimestamp=" + activeTimestamp + ", expireTimestamp=" + expireTimestamp
241
				+ createTimestamp + ", activeTimestamp=" + activeTimestamp + ", expireTimestamp=" + expireTimestamp
242
				+ ", createdBy=" + createdBy + ", cashback=" + cashback + ", retailerIds=" + retailerIds
242
				+ ", createdBy=" + createdBy + ", cashback=" + cashback + ", retailerIds=" + retailerIds
243
				+ ", amountModel='" + amountModel + '\'' + ", schemeValue=" + schemeValue + ", partnerType="
243
				+ ", amountModel='" + amountModel + '\'' + ", schemeValue=" + schemeValue + ", partnerType="
-
 
244
				+ partnerType + ", reference='" + reference + '\''
244
				+ partnerType + ", catalogStringMap=" + catalogStringMap + '}';
245
				+ ", catalogStringMap=" + catalogStringMap + '}';
245
	}
246
	}
246
 
247
 
247
	@Override
248
	@Override
248
	public boolean equals(Object o) {
249
	public boolean equals(Object o) {
249
		if (this == o)
250
		if (this == o)
Line 269... Line 270...
269
		return Objects.hash(id, name, description, type, amountType, basePlusGstCalc, amount, startDateTime,
270
		return Objects.hash(id, name, description, type, amountType, basePlusGstCalc, amount, startDateTime,
270
				endDateTime, createTimestamp, activeTimestamp, expireTimestamp, createdBy, cashback, retailerIds,
271
				endDateTime, createTimestamp, activeTimestamp, expireTimestamp, createdBy, cashback, retailerIds,
271
				amountModel, schemeValue, partnerType, catalogStringMap);
272
				amountModel, schemeValue, partnerType, catalogStringMap);
272
	}
273
	}
273
 
274
 
-
 
275
	@Column(name = "reference")
-
 
276
	private String reference;
-
 
277
 
274
	@Transient
278
	@Transient
275
	private Map<Integer, String> catalogStringMap = new HashMap<>();
279
	private Map<Integer, String> catalogStringMap = new HashMap<>();
276
 
280
 
277
	public int getId() {
281
	public int getId() {
278
		return id;
282
		return id;
Line 459... Line 463...
459
 
463
 
460
	public void setCatalogStringMap(Map<Integer, String> catalogStringMap) {
464
	public void setCatalogStringMap(Map<Integer, String> catalogStringMap) {
461
		this.catalogStringMap = catalogStringMap;
465
		this.catalogStringMap = catalogStringMap;
462
	}
466
	}
463
 
467
 
-
 
468
	public String getReference() {
-
 
469
		return reference;
-
 
470
	}
-
 
471
 
-
 
472
	public void setReference(String reference) {
-
 
473
		this.reference = reference;
-
 
474
	}
-
 
475
 
464
	public boolean isWithinRange(LocalDateTime testDate) {
476
	public boolean isWithinRange(LocalDateTime testDate) {
465
		return !(testDate.isBefore(this.startDateTime) || testDate.isAfter(endDateTime));
477
		return !(testDate.isBefore(this.startDateTime) || testDate.isAfter(endDateTime));
466
	}
478
	}
467
}
479
}
468
480