Subversion Repositories SmartDukaan

Rev

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

Rev 29423 Rev 29424
Line 244... Line 244...
244 
		if (co.getDeliveryTimestamp() != null) {
 244 
		if (co.getDeliveryTimestamp() != null) {
245 
			tm.setActualDelivered(co.getDeliveryTimestamp());
 245 
			tm.setActualDelivered(co.getDeliveryTimestamp());
246 
			tm.setInTransitDelivered(false);
 246 
			tm.setInTransitDelivered(false);
247 
		} else {
 247 
		} else {
248 
			tm.setExpectedDelivered(co.getExpectedDeliveryTime());
 248 
			tm.setExpectedDelivered(co.getExpectedDeliveryTime());
249 
			if (tm.isInTransitShipping()) {
 249 
			if (tm.isInTransitBilling()) {
- 
 
 250 
				tm.setInTransitDelivered(false);
- 
 
 251 
			}
- 
 
 252 
 
- 
 
 253 
			else if (tm.isInTransitShipping()) {
250 
				tm.setInTransitDelivered(false);
 254 
				tm.setInTransitDelivered(false);
251 
			} else {
 255 
			} else {
252 
				tm.setInTransitDelivered(true);
 256 
				tm.setInTransitDelivered(true);
253 
			}
 257 
			}
254 
		}
 258 
		}