Subversion Repositories SmartDukaan

Rev

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

Rev 4666 Rev 5110
Line 56... Line 56...
56 
	private boolean doaFlag;
 56 
	private boolean doaFlag;
57 
	private String pickupRequestNo;
 57 
	private String pickupRequestNo;
58 
	private boolean cod;
 58 
	private boolean cod;
59
59
60 
	private String delayReason;
 60 
	private String delayReason;
61
- 
 
- 
 
 61 
	private String pickFromWarehouse;
- 
 
 62 
	private long fulfilmentWarehouseId;
- 
 
 63 
	private boolean serialized;
62 
	private OrderAlert alert;
 64 
	private OrderAlert alert;
63
65
64 
	@SuppressWarnings("unused")
 66 
	@SuppressWarnings("unused")
65 
	private Order(){}
 67 
	private Order(){}
66 
 
 68 
 
Line 77... Line 79...
77 
			long itemId, String productGroup, String brand, String modelName,
 79 
			long itemId, String productGroup, String brand, String modelName,
78 
			String modelNumber, String color, String extraInfo, String dealText, double totalAmount,
 80 
			String modelNumber, String color, String extraInfo, String dealText, double totalAmount,
79 
			double totalWeight, String airwayBillNo, String billedBy,
 81 
			double totalWeight, String airwayBillNo, String billedBy,
80 
			String invoiceNumber, long jacketNumber, String itemNumber,
 82 
			String invoiceNumber, long jacketNumber, String itemNumber,
81 
			String serialNumber, long batchNo, long serialNo,
 83 
			String serialNumber, long batchNo, long serialNo,
82 
			boolean doaFlag, String pickupRequestNo, boolean cod, String delayReason) {
 84 
			boolean doaFlag, String pickupRequestNo, boolean cod, String delayReason,
- 
 
 85 
			String pickFromWarehouse, boolean serialized, long fulfilmentWarehouseId) {
83 
		super();
 86 
		super();
84 
		this.orderId = orderId;
 87 
		this.orderId = orderId;
85 
		this.customerId = customerId;
 88 
		this.customerId = customerId;
86 
		this.customerName = customerName;
 89 
		this.customerName = customerName;
87 
		this.customerMobileNumber = customerMobileNumber;
 90 
		this.customerMobileNumber = customerMobileNumber;
Line 120... Line 123...
120 
		this.serialNo = serialNo;
 123 
		this.serialNo = serialNo;
121 
		this.doaFlag = doaFlag;
 124 
		this.doaFlag = doaFlag;
122 
		this.pickupRequestNo = pickupRequestNo;
 125 
		this.pickupRequestNo = pickupRequestNo;
123 
		this.cod = cod;
 126 
		this.cod = cod;
124 
		this.delayReason = delayReason;
 127 
		this.delayReason = delayReason;
- 
 
 128 
		this.pickFromWarehouse = pickFromWarehouse;
- 
 
 129 
		this.serialized = serialized;
- 
 
 130 
		this.fulfilmentWarehouseId = fulfilmentWarehouseId;
125 
		checkForAlerts();
 131 
		checkForAlerts();
126 
	}
 132 
	}
127 
 
 133 
 
128 
	private void checkForAlerts(){
 134 
	private void checkForAlerts(){
129 
	    this.alert = OrderAlert.NONE;
 135 
	    this.alert = OrderAlert.NONE;
Line 470... Line 476...
470 
 
 476 
 
471 
	public long getPromisedShippingTime() {
 477 
	public long getPromisedShippingTime() {
472 
		return promisedShippingTime;
 478 
		return promisedShippingTime;
473 
	}
 479 
	}
474 
 
 480 
 
- 
 
 481 
    public String getPickFromWarehouse() {
- 
 
 482 
        return pickFromWarehouse;
- 
 
 483 
    }
- 
 
 484 
 
- 
 
 485 
    public void setPickFromWarehouse(String pickFromWarehouse) {
- 
 
 486 
        this.pickFromWarehouse = pickFromWarehouse;
- 
 
 487 
    }
- 
 
 488 
 
- 
 
 489 
    public boolean isSerialized() {
- 
 
 490 
        return serialized;
- 
 
 491 
    }
- 
 
 492 
 
- 
 
 493 
    public void setSerialized(boolean serialized) {
- 
 
 494 
        this.serialized = serialized;
- 
 
 495 
    }
- 
 
 496 
 
- 
 
 497 
    public long getFulfilmentWarehouseId() {
- 
 
 498 
        return fulfilmentWarehouseId;
- 
 
 499 
    }
- 
 
 500 
 
- 
 
 501 
    public void setFulfilmentWarehouseId(long fulfilmentWarehouseId) {
- 
 
 502 
        this.fulfilmentWarehouseId = fulfilmentWarehouseId;
- 
 
 503 
    }
- 
 
 504 
 
475 
}
 505 
}