Subversion Repositories SmartDukaan

Rev

Rev 19172 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 19172 Rev 19260
Line 72... Line 72...
72 
	private boolean serialized;
 72 
	private boolean serialized;
73 
	private OrderAlert alert;
 73 
	private OrderAlert alert;
74 
	private long productCondition;
74 
	private long productCondition;
75 
	private String source;
 75 
	private String source;
76 
	private String logisticsTransactionId;
 76 
	private String logisticsTransactionId;
- 
 
 77 
	private OrderCategory category;
77
78
78 
	private Map<Long, Map<String, String>> acceptTogetherOrdersMap;
 79 
	private Map<Long, Map<String, String>> acceptTogetherOrdersMap;
79 
	private Map<Long, Map<String, String>> billTogetherOrdersMap;
 80 
	private Map<Long, Map<String, String>> billTogetherOrdersMap;
80
81
81 
	@SuppressWarnings("unused")
 82 
	@SuppressWarnings("unused")
Line 153... Line 154...
153 
		this.freebieItemId = freebieItemId;
 154 
		this.freebieItemId = freebieItemId;
154 
		this.source = source;
 155 
		this.source = source;
155 
		this.productCondition = productCondition;
 156 
		this.productCondition = productCondition;
156 
		this.transactionId = transactionId;
 157 
		this.transactionId = transactionId;
157 
		checkForAlerts();
 158 
		checkForAlerts();
- 
 
 159 
		setCategory(OrderCategory.NONE);
158 
	}
 160 
	}
159 
 
 161 
 
160 
	private void checkForAlerts(){
 162 
	private void checkForAlerts(){
161 
	    this.alert = OrderAlert.NONE;
 163 
	    this.alert = OrderAlert.NONE;
162 
	    Date date = new Date(System.currentTimeMillis());
 164 
	    Date date = new Date(System.currentTimeMillis());
Line 630... Line 632...
630 
 
 632 
 
631 
	public void setExpectedShippingTime(long expectedShippingTime) {
 633 
	public void setExpectedShippingTime(long expectedShippingTime) {
632 
		this.expectedShippingTime = expectedShippingTime;
 634 
		this.expectedShippingTime = expectedShippingTime;
633 
	}
 635 
	}
634 
 
 636 
 
- 
 
 637 
	public OrderCategory getCategory() {
- 
 
 638 
		return category;
- 
 
 639 
	}
- 
 
 640 
 
- 
 
 641 
	public void setCategory(OrderCategory category) {
- 
 
 642 
		this.category = category;
- 
 
 643 
	}
- 
 
 644 
 
635 
}
 645 
}