Subversion Repositories SmartDukaan

Rev

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

Rev 30449 Rev 30652
Line 86... Line 86...
86 
 
 86 
 
87 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
 87 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
88 
	@Column(name = "warranty_expiry_timestamp")
 88 
	@Column(name = "warranty_expiry_timestamp")
89 
	private LocalDateTime warrantyExpiryTimestamp;
 89 
	private LocalDateTime warrantyExpiryTimestamp;
90 
 
 90 
 
91 
	@Column(name = "serial_number", length = 8192)
 - 
 
92 
	private String serialNumber;
 - 
 
93 
 
 - 
 
94 
	@Column(name = "vatRate")
 - 
 
95 
	private Float vatRate;
 - 
 
96 
 
 - 
 
97 
	@Column(name = "nlc")
 91 
	@Column(name = "nlc")
98 
	private Float nlc;
 92 
	private Float nlc;
99 
 
 93 
 
100 
	@Column(name = "logisticsCost")
 94 
	@Column(name = "logisticsCost")
101 
	private Float logisticsCost;
 95 
	private Float logisticsCost;
Line 106... Line 100...
106 
	@Column(name = "returnQty")
 100 
	@Column(name = "returnQty")
107 
	private int returnQty;
 101 
	private int returnQty;
108 
 
 102 
 
109 
	@Column(name = "igstRate")
 103 
	@Column(name = "igstRate")
110 
	private Float igstRate;
 104 
	private Float igstRate;
111
105 
 
112 
	@Column(name = "cgstRate")
 106 
	@Column(name = "cgstRate")
113 
	private Float cgstRate;
 107 
	private Float cgstRate;
114 
 
 108 
 
115 
	@Column(name = "sgstRate")
 109 
	@Column(name = "sgstRate")
116 
	private Float sgstRate;
 110 
	private Float sgstRate;
117 
 
 111 
 
- 
 
 112 
 
118 
	@Column(name = "hsnCode")
 113 
	@Column(name = "hsnCode")
119 
	private String hsnCode;
 114 
	private String hsnCode;
120 
 
 115 
 
121 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
 116 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
122 
	@Column(name = "damaged_expiry_timestamp")
 117 
	@Column(name = "damaged_expiry_timestamp")
Line 125... Line 120...
125 
	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 120 
	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
126 
	//@Fetch(value = FetchMode.SUBSELECT)
 121 
	//@Fetch(value = FetchMode.SUBSELECT)
127 
	@JoinColumn(name = "item_id", insertable = false, updatable = false, nullable = false, referencedColumnName = "id")
 122 
	@JoinColumn(name = "item_id", insertable = false, updatable = false, nullable = false, referencedColumnName = "id")
128 
	private Item item;
 123 
	private Item item;
129 
 
 124 
 
- 
 
 125 
	public float getTotalTaxRate() {
- 
 
 126 
		return (this.cgstRate == null ? 0 : this.cgstRate) + (this.sgstRate == null ? 0 : this.sgstRate) + (this.igstRate == null ? 0 : this.igstRate);
- 
 
 127 
	}
130 
 
 128 
 
131 
	public String getItemDescription() {
 129 
	public String getItemDescription() {
132 
		StringBuilder itemString = new StringBuilder();
 130 
		StringBuilder itemString = new StringBuilder();
133 
		if (this.getBrand() != null && !this.getBrand().isEmpty()) {
 131 
		if (this.getBrand() != null && !this.getBrand().isEmpty()) {
134 
			itemString.append(this.getBrand().trim());
 132 
			itemString.append(this.getBrand().trim());
Line 323... Line 321...
323 
 
 321 
 
324 
	public void setWarrantyExpiryTimestamp(LocalDateTime warrantyExpiryTimestamp) {
 322 
	public void setWarrantyExpiryTimestamp(LocalDateTime warrantyExpiryTimestamp) {
325 
		this.warrantyExpiryTimestamp = warrantyExpiryTimestamp;
 323 
		this.warrantyExpiryTimestamp = warrantyExpiryTimestamp;
326 
	}
 324 
	}
327 
 
 325 
 
328 
	public String getSerialNumber() {
 - 
 
329 
		return serialNumber;
 - 
 
330 
	}
 - 
 
331 
 
 - 
 
332 
	public void setSerialNumber(String serialNumber) {
 - 
 
333 
		this.serialNumber = serialNumber;
 - 
 
334 
	}
 - 
 
335 
 
 - 
 
336 
	public Float getVatRate() {
 - 
 
337 
		return vatRate;
 - 
 
338 
	}
 - 
 
339 
 
 - 
 
340 
	public void setVatRate(Float vatRate) {
 - 
 
341 
		this.vatRate = vatRate;
 - 
 
342 
	}
 - 
 
343 
 
 - 
 
344 
	public Float getNlc() {
 326 
	public Float getNlc() {
345 
		return nlc;
 327 
		return nlc;
346 
	}
 328 
	}
347 
 
 329 
 
348 
	public void setNlc(Float nlc) {
 330 
	public void setNlc(Float nlc) {
Line 453... Line 435...
453 
				+ ", modelNumber=" + modelNumber + ", modelName=" + modelName + ", color=" + color + ", extraInfo="
 435 
				+ ", modelNumber=" + modelNumber + ", modelName=" + modelName + ", color=" + color + ", extraInfo="
454 
				+ extraInfo + ", quantity=" + quantity + ", mrp=" + mrp + ", unitPrice=" + unitPrice + ", unitWeight="
 436 
				+ extraInfo + ", quantity=" + quantity + ", mrp=" + mrp + ", unitPrice=" + unitPrice + ", unitWeight="
455 
				+ unitWeight + ", totalPrice=" + totalPrice + ", transferPrice=" + transferPrice + ", totalWeight="
 437 
				+ unitWeight + ", totalPrice=" + totalPrice + ", transferPrice=" + transferPrice + ", totalWeight="
456 
				+ totalWeight + ", orderId=" + orderId + ", imeiNumber=" + imeiNumber + ", itemNumber=" + itemNumber
 438 
				+ totalWeight + ", orderId=" + orderId + ", imeiNumber=" + imeiNumber + ", itemNumber=" + itemNumber
457 
				+ ", dealText=" + dealText + ", warrantyExpiryTimestamp=" + warrantyExpiryTimestamp + ", serialNumber="
 439 
				+ ", dealText=" + dealText + ", warrantyExpiryTimestamp=" + warrantyExpiryTimestamp + ", serialNumber="
458 
				+ serialNumber + ", vatRate=" + vatRate + ", nlc=" + nlc + ", logisticsCost=" + logisticsCost
 440 
				+ ", nlc=" + nlc + ", logisticsCost=" + logisticsCost
459 
				+ ", codCollectionCharges=" + codCollectionCharges + ", returnQty=" + returnQty + ", igstRate="
 441 
				+ ", codCollectionCharges=" + codCollectionCharges + ", returnQty=" + returnQty + ", igstRate="
460 
				+ igstRate + ", cgstRate=" + cgstRate + ", sgstRate=" + sgstRate + ", hsnCode=" + hsnCode
 442 
				+ igstRate + ", cgstRate=" + cgstRate + ", sgstRate=" + sgstRate + ", hsnCode=" + hsnCode
461 
				+ ", damagedExpiryTimestamp=" + damagedExpiryTimestamp + ", item=" + item + "]";
 443 
				+ ", damagedExpiryTimestamp=" + damagedExpiryTimestamp + ", item=" + item + "]";
462 
	}
 444 
	}
463 
 
 445