Subversion Repositories SmartDukaan

Rev

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

Rev 27046 Rev 28344
Line 63... Line 63...
63 
	}
 63 
	}
64 
 
 64 
 
65 
	@Transient
 65 
	@Transient
66 
	private Customer customer;
 66 
	private Customer customer;
67 
 
 67 
 
- 
 
 68 
	@Transient
- 
 
 69 
	private String payMethodDescription;
- 
 
 70 
 
68 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
 71 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
69 
	@Column(name = "create_timestamp")
 72 
	@Column(name = "create_timestamp")
70 
	private LocalDateTime createTimestamp = LocalDateTime.now();
 73 
	private LocalDateTime createTimestamp = LocalDateTime.now();
71 
 
 74 
 
72 
	@Column(name = "total_amount")
 75 
	@Column(name = "total_amount")
Line 85... Line 88...
85 
 
 88 
 
86 
	public List<PendingOrderItem> getPendingOrderItems() {
 89 
	public List<PendingOrderItem> getPendingOrderItems() {
87 
		return pendingOrderItems;
 90 
		return pendingOrderItems;
88 
	}
 91 
	}
89 
 
 92 
 
- 
 
 93 
	public String getPayMethodDescription() {
- 
 
 94 
		return payMethodDescription;
- 
 
 95 
	}
- 
 
 96 
 
- 
 
 97 
	public void setPayMethodDescription(String payMethodDescription) {
- 
 
 98 
		this.payMethodDescription = payMethodDescription;
- 
 
 99 
	}
- 
 
 100 
 
90 
	public void setPendingOrderItems(List<PendingOrderItem> pendingOrderItems) {
 101 
	public void setPendingOrderItems(List<PendingOrderItem> pendingOrderItems) {
91 
		this.pendingOrderItems = pendingOrderItems;
 102 
		this.pendingOrderItems = pendingOrderItems;
92 
	}
 103 
	}
93 
 
 104 
 
94 
	@Override
 105 
	@Override
95 
	public String toString() {
 106 
	public String toString() {
96 
		return "PendingOrder [id=" + id + ", fofoId=" + fofoId + ", customerId=" + customerId + ", payMethod="
 107 
		return "PendingOrder [id=" + id + ", fofoId=" + fofoId + ", customerId=" + customerId + ", payMethod="
97 
				+ payMethod + ", customerGstNumber=" + customerGstNumber + ", customerAddressId=" + customerAddressId
 108 
				+ payMethod + ", customerGstNumber=" + customerGstNumber + ", customerAddressId=" + customerAddressId
98 
				+ ", status=" + status + ", customer=" + customer + ", createTimestamp=" + createTimestamp
 109 
				+ ", status=" + status + ", customer=" + customer + ", payMethodDescription=" + payMethodDescription
99 
				+ ", totalAmount=" + totalAmount + ", cancelledAmount=" + cancelledAmount + ", refundedAmount="
 110 
				+ ", createTimestamp=" + createTimestamp + ", totalAmount=" + totalAmount + ", cancelledAmount="
100 
				+ refundedAmount + ", paidAmount=" + paidAmount + ", billedAmount=" + billedAmount
 111 
				+ cancelledAmount + ", refundedAmount=" + refundedAmount + ", paidAmount=" + paidAmount
101 
				+ ", pendingOrderItems=" + pendingOrderItems + "]";
 112 
				+ ", billedAmount=" + billedAmount + ", pendingOrderItems=" + pendingOrderItems + "]";
102 
	}
 113 
	}
103 
 
 114 
 
104 
	public int getId() {
 115 
	public int getId() {
105 
		return id;
 116 
		return id;
106 
	}
 117 
	}
Line 226... Line 237...
226 
		result = prime * result + fofoId;
 237 
		result = prime * result + fofoId;
227 
		result = prime * result + id;
 238 
		result = prime * result + id;
228 
		temp = Double.doubleToLongBits(paidAmount);
 239 
		temp = Double.doubleToLongBits(paidAmount);
229 
		result = prime * result + (int) (temp ^ (temp >>> 32));
 240 
		result = prime * result + (int) (temp ^ (temp >>> 32));
230 
		result = prime * result + ((payMethod == null) ? 0 : payMethod.hashCode());
 241 
		result = prime * result + ((payMethod == null) ? 0 : payMethod.hashCode());
- 
 
 242 
		result = prime * result + ((payMethodDescription == null) ? 0 : payMethodDescription.hashCode());
231 
		result = prime * result + ((pendingOrderItems == null) ? 0 : pendingOrderItems.hashCode());
 243 
		result = prime * result + ((pendingOrderItems == null) ? 0 : pendingOrderItems.hashCode());
232 
		temp = Double.doubleToLongBits(refundedAmount);
 244 
		temp = Double.doubleToLongBits(refundedAmount);
233 
		result = prime * result + (int) (temp ^ (temp >>> 32));
 245 
		result = prime * result + (int) (temp ^ (temp >>> 32));
234 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
 246 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
235 
		temp = Double.doubleToLongBits(totalAmount);
 247 
		temp = Double.doubleToLongBits(totalAmount);
Line 278... Line 290...
278 
		if (payMethod == null) {
 290 
		if (payMethod == null) {
279 
			if (other.payMethod != null)
 291 
			if (other.payMethod != null)
280 
				return false;
 292 
				return false;
281 
		} else if (!payMethod.equals(other.payMethod))
 293 
		} else if (!payMethod.equals(other.payMethod))
282 
			return false;
 294 
			return false;
- 
 
 295 
		if (payMethodDescription == null) {
- 
 
 296 
			if (other.payMethodDescription != null)
- 
 
 297 
				return false;
- 
 
 298 
		} else if (!payMethodDescription.equals(other.payMethodDescription))
- 
 
 299 
			return false;
283 
		if (pendingOrderItems == null) {
 300 
		if (pendingOrderItems == null) {
284 
			if (other.pendingOrderItems != null)
 301 
			if (other.pendingOrderItems != null)
285 
				return false;
 302 
				return false;
286 
		} else if (!pendingOrderItems.equals(other.pendingOrderItems))
 303 
		} else if (!pendingOrderItems.equals(other.pendingOrderItems))
287 
			return false;
 304 
			return false;