Subversion Repositories SmartDukaan

Rev

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

Rev 28339 Rev 28344
Line 91... Line 91...
91 
	private LocalDateTime cancelledTimestamp;
 91 
	private LocalDateTime cancelledTimestamp;
92 
 
 92 
 
93 
	@Column(name = "billed_timestamp")
 93 
	@Column(name = "billed_timestamp")
94 
	private LocalDateTime billedTimestamp;
 94 
	private LocalDateTime billedTimestamp;
95 
 
 95 
 
- 
 
 96 
	@Column(name = "verified_timestamp")
- 
 
 97 
	private LocalDateTime verifiedTimestamp;
- 
 
 98 
 
- 
 
 99 
	public LocalDateTime getVerifiedTimestamp() {
- 
 
 100 
		return verifiedTimestamp;
- 
 
 101 
	}
- 
 
 102 
 
- 
 
 103 
	public void setVerifiedTimestamp(LocalDateTime verifiedTimestamp) {
- 
 
 104 
		this.verifiedTimestamp = verifiedTimestamp;
- 
 
 105 
	}
- 
 
 106 
 
96 
	@Column(name = "delivered_timestamp")
 107 
	@Column(name = "delivered_timestamp")
97 
	private LocalDateTime deliveredTimestamp;
 108 
	private LocalDateTime deliveredTimestamp;
98 
 
 109 
 
99 
	@Column(name = "claimed_timestamp")
 110 
	@Column(name = "claimed_timestamp")
100 
	private LocalDateTime claimedTimestamp;
 111 
	private LocalDateTime claimedTimestamp;
Line 168... Line 179...
168 
		result = prime * result + quantity;
 179 
		result = prime * result + quantity;
169 
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
 180 
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
170 
		result = prime * result + Float.floatToIntBits(sellingPrice);
 181 
		result = prime * result + Float.floatToIntBits(sellingPrice);
171 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
 182 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
172 
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
 183 
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
- 
 
 184 
		result = prime * result + ((verifiedTimestamp == null) ? 0 : verifiedTimestamp.hashCode());
173 
		return result;
 185 
		return result;
174 
	}
 186 
	}
175 
 
 187 
 
176 
	@Override
 188 
	@Override
177 
	public boolean equals(Object obj) {
 189 
	public boolean equals(Object obj) {
Line 242... Line 254...
242 
		if (statusDescription == null) {
 254 
		if (statusDescription == null) {
243 
			if (other.statusDescription != null)
 255 
			if (other.statusDescription != null)
244 
				return false;
 256 
				return false;
245 
		} else if (!statusDescription.equals(other.statusDescription))
 257 
		} else if (!statusDescription.equals(other.statusDescription))
246 
			return false;
 258 
			return false;
- 
 
 259 
		if (verifiedTimestamp == null) {
- 
 
 260 
			if (other.verifiedTimestamp != null)
- 
 
 261 
				return false;
- 
 
 262 
		} else if (!verifiedTimestamp.equals(other.verifiedTimestamp))
- 
 
 263 
			return false;
247 
		return true;
 264 
		return true;
248 
	}
 265 
	}
249 
 
 266 
 
250 
	public LocalDateTime getScheduledDeliveryTime() {
 267 
	public LocalDateTime getScheduledDeliveryTime() {
251 
		return scheduledDeliveryTime;
 268 
		return scheduledDeliveryTime;
Line 311... Line 328...
311 
	public String toString() {
 328 
	public String toString() {
312 
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", itemName=" + itemName
 329 
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", itemName=" + itemName
313 
				+ ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice=" + sellingPrice + ", pendingOrder="
 330 
				+ ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice=" + sellingPrice + ", pendingOrder="
314 
				+ pendingOrder + ", status=" + status + ", statusDescription=" + statusDescription
 331 
				+ pendingOrder + ", status=" + status + ", statusDescription=" + statusDescription
315 
				+ ", cancelledTimestamp=" + cancelledTimestamp + ", billedTimestamp=" + billedTimestamp
 332 
				+ ", cancelledTimestamp=" + cancelledTimestamp + ", billedTimestamp=" + billedTimestamp
316 
				+ ", deliveredTimestamp=" + deliveredTimestamp + ", claimedTimestamp=" + claimedTimestamp
 333 
				+ ", verifiedTimestamp=" + verifiedTimestamp + ", deliveredTimestamp=" + deliveredTimestamp
317 
				+ ", scheduledDeliveryTime=" + scheduledDeliveryTime + ", createTimestamp=" + createTimestamp + "]";
 334 
				+ ", claimedTimestamp=" + claimedTimestamp + ", scheduledDeliveryTime=" + scheduledDeliveryTime
- 
 
 335 
				+ ", createTimestamp=" + createTimestamp + "]";
318 
	}
 336 
	}
319 
 
 337 
 
320 
}
 338 
}