Subversion Repositories SmartDukaan

Rev

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

Rev 27046 Rev 28311
Line 72... Line 72...
72 
	@Enumerated(EnumType.STRING)
 72 
	@Enumerated(EnumType.STRING)
73 
	private OrderStatus status;
 73 
	private OrderStatus status;
74 
 
 74 
 
75 
	@Column(name = "status_description")
 75 
	@Column(name = "status_description")
76 
	private String statusDescription;
 76 
	private String statusDescription;
- 
 
 77
- 
 
 78 
	@Column(name = "cancelled_timestamp")
- 
 
 79 
	private LocalDateTime cancelledTimestamp;
77 
 
 80 
 
78 
	@Column(name = "billed_timestamp")
 81 
	@Column(name = "billed_timestamp")
79 
	private LocalDateTime billedTimestamp;
 82 
	private LocalDateTime billedTimestamp;
80 
 
 83 
 
81 
	public String getStatusDescription() {
 84 
	public String getStatusDescription() {
Line 95... Line 98...
95 
	}
 98 
	}
96 
 
 99 
 
97 
	public void setStatus(OrderStatus status) {
 100 
	public void setStatus(OrderStatus status) {
98 
		this.status = status;
 101 
		this.status = status;
99 
	}
 102 
	}
- 
 
 103
- 
 
 104 
 
- 
 
 105 
	public LocalDateTime getCancelledTimestamp() {
- 
 
 106 
		return cancelledTimestamp;
- 
 
 107 
	}
- 
 
 108 
 
- 
 
 109 
	public void setCancelledTimestamp(LocalDateTime cancelledTimestamp) {
- 
 
 110 
		this.cancelledTimestamp = cancelledTimestamp;
- 
 
 111 
	}
100 
 
 112 
 
101 
	@Column(name = "scheduled_delivery_time")
 113 
	@Column(name = "scheduled_delivery_time")
102 
	private LocalDateTime scheduledDeliveryTime;
 114 
	private LocalDateTime scheduledDeliveryTime;
103 
 
 115 
 
104 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
 116 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
Line 107... Line 119...
107 
 
 119 
 
108 
	@Override
 120 
	@Override
109 
	public int hashCode() {
 121 
	public int hashCode() {
110 
		final int prime = 31;
 122 
		final int prime = 31;
111 
		int result = 1;
 123 
		int result = 1;
- 
 
 124 
		result = prime * result + ((billedTimestamp == null) ? 0 : billedTimestamp.hashCode());
- 
 
 125 
		result = prime * result + ((cancelledTimestamp == null) ? 0 : cancelledTimestamp.hashCode());
112 
		result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
 126 
		result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
113 
		result = prime * result + id;
 127 
		result = prime * result + id;
114 
		result = prime * result + ((imgUrl == null) ? 0 : imgUrl.hashCode());
 128 
		result = prime * result + ((imgUrl == null) ? 0 : imgUrl.hashCode());
115 
		result = prime * result + itemId;
 129 
		result = prime * result + itemId;
116 
		result = prime * result + ((itemName == null) ? 0 : itemName.hashCode());
 130 
		result = prime * result + ((itemName == null) ? 0 : itemName.hashCode());
117 
		result = prime * result + orderId;
 131 
		result = prime * result + orderId;
118 
		result = prime * result + quantity;
 132 
		result = prime * result + quantity;
119 
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
 133 
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
120 
		result = prime * result + Float.floatToIntBits(sellingPrice);
 134 
		result = prime * result + Float.floatToIntBits(sellingPrice);
121 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
 135 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
- 
 
 136 
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
122 
		return result;
 137 
		return result;
123 
	}
 138 
	}
124 
 
 139 
 
125 
	@Override
 140 
	@Override
126 
	public boolean equals(Object obj) {
 141 
	public boolean equals(Object obj) {
Line 129... Line 144...
129 
		if (obj == null)
 144 
		if (obj == null)
130 
			return false;
 145 
			return false;
131 
		if (getClass() != obj.getClass())
 146 
		if (getClass() != obj.getClass())
132 
			return false;
 147 
			return false;
133 
		PendingOrderItem other = (PendingOrderItem) obj;
 148 
		PendingOrderItem other = (PendingOrderItem) obj;
- 
 
 149 
		if (billedTimestamp == null) {
- 
 
 150 
			if (other.billedTimestamp != null)
- 
 
 151 
				return false;
- 
 
 152 
		} else if (!billedTimestamp.equals(other.billedTimestamp))
- 
 
 153 
			return false;
- 
 
 154 
		if (cancelledTimestamp == null) {
- 
 
 155 
			if (other.cancelledTimestamp != null)
- 
 
 156 
				return false;
- 
 
 157 
		} else if (!cancelledTimestamp.equals(other.cancelledTimestamp))
- 
 
 158 
			return false;
134 
		if (createTimestamp == null) {
 159 
		if (createTimestamp == null) {
135 
			if (other.createTimestamp != null)
 160 
			if (other.createTimestamp != null)
136 
				return false;
 161 
				return false;
137 
		} else if (!createTimestamp.equals(other.createTimestamp))
 162 
		} else if (!createTimestamp.equals(other.createTimestamp))
138 
			return false;
 163 
			return false;
Line 159... Line 184...
159 
				return false;
 184 
				return false;
160 
		} else if (!scheduledDeliveryTime.equals(other.scheduledDeliveryTime))
 185 
		} else if (!scheduledDeliveryTime.equals(other.scheduledDeliveryTime))
161 
			return false;
 186 
			return false;
162 
		if (Float.floatToIntBits(sellingPrice) != Float.floatToIntBits(other.sellingPrice))
 187 
		if (Float.floatToIntBits(sellingPrice) != Float.floatToIntBits(other.sellingPrice))
163 
			return false;
 188 
			return false;
- 
 
 189 
		if (status != other.status)
- 
 
 190 
			return false;
164 
		if (status == null) {
 191 
		if (statusDescription == null) {
165 
			if (other.status != null)
 192 
			if (other.statusDescription != null)
166 
				return false;
 193 
				return false;
167 
		} else if (!status.equals(other.status))
 194 
		} else if (!statusDescription.equals(other.statusDescription))
168 
			return false;
 195 
			return false;
169 
		return true;
 196 
		return true;
170 
	}
 197 
	}
171 
 
 198 
 
172 
	public LocalDateTime getScheduledDeliveryTime() {
 199 
	public LocalDateTime getScheduledDeliveryTime() {
Line 231... Line 258...
231 
 
 258 
 
232 
	@Override
 259 
	@Override
233 
	public String toString() {
 260 
	public String toString() {
234 
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", itemName=" + itemName
 261 
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", itemName=" + itemName
235 
				+ ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice=" + sellingPrice + ", status="
 262 
				+ ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice=" + sellingPrice + ", status="
236 
				+ status + ", statusDescription=" + statusDescription + ", billedTimestamp=" + billedTimestamp
 263 
				+ status + ", statusDescription=" + statusDescription + ", cancelledTimestamp=" + cancelledTimestamp
237 
				+ ", scheduledDeliveryTime=" + scheduledDeliveryTime + ", createTimestamp=" + createTimestamp + "]";
 264 
				+ ", billedTimestamp=" + billedTimestamp + ", scheduledDeliveryTime=" + scheduledDeliveryTime
- 
 
 265 
				+ ", createTimestamp=" + createTimestamp + "]";
238 
	}
 266 
	}
239 
 
 267 
 
240 
}
 268 
}