Subversion Repositories SmartDukaan

Rev

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

Rev 7422 Rev 7433
Line 225... Line 225...
225 
            logger.error("Error looking up warehouse: " + t_order.getVendorId(), e);
 225 
            logger.error("Error looking up warehouse: " + t_order.getVendorId(), e);
226 
        }
 226 
        }
227 
 
 227 
 
228 
		String delayReason = null;
 228 
		String delayReason = null;
229 
		if(t_order.getDelayReason() != null)
 229 
		if(t_order.getDelayReason() != null)
230 
		    delayReason = t_order.getDelayReason().name();
230 
		    delayReason = t_order.getDelayReason().name();
231
231
- 
 
 232 
		String osource;
- 
 
 233 
		if(t_order.getSource() == 1){
- 
 
 234 
			osource = "WEBSITE";
- 
 
 235 
		}else if(t_order.getSource() == 2){
- 
 
 236 
			osource = "STORE";
- 
 
 237 
		}else{
- 
 
 238 
			osource = "WEBSITE";
- 
 
 239 
		}
- 
 
 240
- 
 
 241 
		if(OrderSource.findByValue((int)t_order.getSource()) == null){
- 
 
 242 
			logger.error("Error looking source: " + t_order.getId() + " " + t_order.getSource());
- 
 
 243 
		}
232 
		Order order = new Order(t_order.getId(),
 244 
		Order order = new Order(t_order.getId(),
233 
				t_order.getCustomer_id(),
 245 
				t_order.getCustomer_id(),
234 
				t_order.getCustomer_name(),
 246 
				t_order.getCustomer_name(),
235 
				t_order.getCustomer_mobilenumber(),
 247 
				t_order.getCustomer_mobilenumber(),
236 
				t_order.getCustomer_pincode(),
 248 
				t_order.getCustomer_pincode(),
Line 276... Line 288...
276 
				ItemType.SERIALIZED.equals(item.getType()),
 288 
				ItemType.SERIALIZED.equals(item.getType()),
277 
				item.isHasItemNo(),
 289 
				item.isHasItemNo(),
278 
				t_order.getFulfilmentWarehouseId(),
 290 
				t_order.getFulfilmentWarehouseId(),
279 
				t_order.getPickupStoreId(),
 291 
				t_order.getPickupStoreId(),
280 
				t_order.getFreebieItemId(),
 292 
				t_order.getFreebieItemId(),
281 
				OrderSource.findByValue((int)t_order.getSource()).toString());
 293 
				osource);
282 
		return order;
 294 
		return order;
283 
	}
 295 
	}
284 
 
 296 
 
285 
	/**
 297 
	/**
286 
	 * Queries the transction server to get the list of all return orders that
 298 
	 * Queries the transction server to get the list of all return orders that