Subversion Repositories SmartDukaan

Rev

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

Rev 28344 Rev 28377
Line 64... Line 64...
64 
 
 64 
 
65 
	@Transient
 65 
	@Transient
66 
	private Customer customer;
 66 
	private Customer customer;
67 
 
 67 
 
68 
	@Transient
 68 
	@Transient
- 
 
 69 
	private CustomerAddress customerAddress;
- 
 
 70 
 
- 
 
 71 
	public CustomerAddress getCustomerAddress() {
- 
 
 72 
		return customerAddress;
- 
 
 73 
	}
- 
 
 74 
 
- 
 
 75 
	public void setCustomerAddress(CustomerAddress customerAddress) {
- 
 
 76 
		this.customerAddress = customerAddress;
- 
 
 77 
	}
- 
 
 78 
 
- 
 
 79 
	@Transient
69 
	private String payMethodDescription;
 80 
	private String payMethodDescription;
70 
 
 81 
 
71 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
 82 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
72 
	@Column(name = "create_timestamp")
 83 
	@Column(name = "create_timestamp")
73 
	private LocalDateTime createTimestamp = LocalDateTime.now();
 84 
	private LocalDateTime createTimestamp = LocalDateTime.now();
Line 104... Line 115...
104 
 
 115 
 
105 
	@Override
 116 
	@Override
106 
	public String toString() {
 117 
	public String toString() {
107 
		return "PendingOrder [id=" + id + ", fofoId=" + fofoId + ", customerId=" + customerId + ", payMethod="
 118 
		return "PendingOrder [id=" + id + ", fofoId=" + fofoId + ", customerId=" + customerId + ", payMethod="
108 
				+ payMethod + ", customerGstNumber=" + customerGstNumber + ", customerAddressId=" + customerAddressId
 119 
				+ payMethod + ", customerGstNumber=" + customerGstNumber + ", customerAddressId=" + customerAddressId
109 
				+ ", status=" + status + ", customer=" + customer + ", payMethodDescription=" + payMethodDescription
 120 
				+ ", status=" + status + ", customer=" + customer + ", customerAddress=" + customerAddress
- 
 
 121 
				+ ", payMethodDescription=" + payMethodDescription + ", createTimestamp=" + createTimestamp
110 
				+ ", createTimestamp=" + createTimestamp + ", totalAmount=" + totalAmount + ", cancelledAmount="
 122 
				+ ", totalAmount=" + totalAmount + ", cancelledAmount=" + cancelledAmount + ", refundedAmount="
111 
				+ cancelledAmount + ", refundedAmount=" + refundedAmount + ", paidAmount=" + paidAmount
 123 
				+ refundedAmount + ", paidAmount=" + paidAmount + ", billedAmount=" + billedAmount
- 
 
 124 
				+ ", pendingOrderItems=" + pendingOrderItems + ", getStatus()=" + getStatus()
- 
 
 125 
				+ ", getCustomerAddress()=" + getCustomerAddress() + ", getPendingOrderItems()="
- 
 
 126 
				+ getPendingOrderItems() + ", getPayMethodDescription()=" + getPayMethodDescription() + ", getId()="
- 
 
 127 
				+ getId() + ", getCustomer()=" + getCustomer() + ", getFofoId()=" + getFofoId() + ", getPayMethod()="
- 
 
 128 
				+ getPayMethod() + ", getCustomerId()=" + getCustomerId() + ", getCustomerGstNumber()="
- 
 
 129 
				+ getCustomerGstNumber() + ", getCustomerAddressId()=" + getCustomerAddressId()
- 
 
 130 
				+ ", getCreateTimestamp()=" + getCreateTimestamp() + ", getTotalAmount()=" + getTotalAmount()
112 
				+ ", billedAmount=" + billedAmount + ", pendingOrderItems=" + pendingOrderItems + "]";
 131 
				+ ", getCancelledAmount()=" + getCancelledAmount() + ", getRefundedAmount()=" + getRefundedAmount()
- 
 
 132 
				+ ", getPaidAmount()=" + getPaidAmount() + ", getBilledAmount()=" + getBilledAmount() + ", hashCode()="
- 
 
 133 
				+ hashCode() + ", getClass()=" + getClass() + ", toString()=" + super.toString() + "]";
113 
	}
 134 
	}
114 
 
 135 
 
115 
	public int getId() {
 136 
	public int getId() {
116 
		return id;
 137 
		return id;
117 
	}
 138 
	}
Line 230... Line 251...
230 
		temp = Double.doubleToLongBits(cancelledAmount);
 251 
		temp = Double.doubleToLongBits(cancelledAmount);
231 
		result = prime * result + (int) (temp ^ (temp >>> 32));
 252 
		result = prime * result + (int) (temp ^ (temp >>> 32));
232 
		result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
 253 
		result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
233 
		result = prime * result + ((customer == null) ? 0 : customer.hashCode());
 254 
		result = prime * result + ((customer == null) ? 0 : customer.hashCode());
234 
		result = prime * result + customerAddressId;
 255 
		result = prime * result + customerAddressId;
- 
 
 256 
		result = prime * result + ((customerAddress == null) ? 0 : customerAddress.hashCode());
235 
		result = prime * result + ((customerGstNumber == null) ? 0 : customerGstNumber.hashCode());
 257 
		result = prime * result + ((customerGstNumber == null) ? 0 : customerGstNumber.hashCode());
236 
		result = prime * result + customerId;
 258 
		result = prime * result + customerId;
237 
		result = prime * result + fofoId;
 259 
		result = prime * result + fofoId;
238 
		result = prime * result + id;
 260 
		result = prime * result + id;
239 
		temp = Double.doubleToLongBits(paidAmount);
 261 
		temp = Double.doubleToLongBits(paidAmount);
Line 272... Line 294...
272 
				return false;
 294 
				return false;
273 
		} else if (!customer.equals(other.customer))
 295 
		} else if (!customer.equals(other.customer))
274 
			return false;
 296 
			return false;
275 
		if (customerAddressId != other.customerAddressId)
 297 
		if (customerAddressId != other.customerAddressId)
276 
			return false;
 298 
			return false;
- 
 
 299 
		if (customerAddress == null) {
- 
 
 300 
			if (other.customerAddress != null)
- 
 
 301 
				return false;
- 
 
 302 
		} else if (!customerAddress.equals(other.customerAddress))
- 
 
 303 
			return false;
277 
		if (customerGstNumber == null) {
 304 
		if (customerGstNumber == null) {
278 
			if (other.customerGstNumber != null)
 305 
			if (other.customerGstNumber != null)
279 
				return false;
 306 
				return false;
280 
		} else if (!customerGstNumber.equals(other.customerGstNumber))
 307 
		} else if (!customerGstNumber.equals(other.customerGstNumber))
281 
			return false;
 308 
			return false;