Subversion Repositories SmartDukaan

Rev

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

Rev 29420 Rev 29421
Line 223... Line 223...
223 
		if (co.getShippingTimestamp() != null) {
 223 
		if (co.getShippingTimestamp() != null) {
224 
			tm.setActualShipping(co.getShippingTimestamp());
 224 
			tm.setActualShipping(co.getShippingTimestamp());
225 
			tm.setInTransitShipping(false);
 225 
			tm.setInTransitShipping(false);
226 
		} else {
 226 
		} else {
227 
			tm.setExpectedShipping(co.getExpectedShipping());
 227 
			tm.setExpectedShipping(co.getExpectedShipping());
- 
 
 228 
			if (tm.isInTransitBilling()) {
- 
 
 229 
				tm.setInTransitShipping(false);
- 
 
 230 
			} else {
228 
			tm.setInTransitShipping(true);
 231 
				tm.setInTransitShipping(true);
- 
 
 232 
			}
229 
		}
 233 
		}
230 
 
 234 
 
231 
		if (co.getDeliveryTimestamp() != null) {
 235 
		if (co.getDeliveryTimestamp() != null) {
232 
			tm.setActualDelivered(co.getDeliveryTimestamp());
 236 
			tm.setActualDelivered(co.getDeliveryTimestamp());
233 
			tm.setInTransitDelivered(false);
 237 
			tm.setInTransitDelivered(false);
234 
		} else {
 238 
		} else {
235 
			tm.setExpectedDelivered(co.getExpectedShipping());
 239 
			tm.setExpectedDelivered(co.getExpectedShipping());
- 
 
 240 
			if (tm.isInTransitShipping()) {
- 
 
 241 
				tm.setInTransitDelivered(false);
- 
 
 242 
			} else {
236 
			tm.setInTransitDelivered(true);
 243 
				tm.setInTransitDelivered(true);
- 
 
 244 
			}
237 
		}
 245 
		}
238 
		co.setTrackingModel(tm);
 246 
		co.setTrackingModel(tm);
239 
		return co;
 247 
		return co;
240 
	}
 248 
	}
241 
 
 249