Subversion Repositories SmartDukaan

Rev

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

Rev 6626 Rev 6720
Line 236... Line 236...
236 
			for(Long entityId: entityIdItemMap.keySet()){
 236 
			for(Long entityId: entityIdItemMap.keySet()){
237
237
238 
				List<Item> items = entityIdItemMap.get(entityId);
 238 
				List<Item> items = entityIdItemMap.get(entityId);
239 
				Item firstItem = items.get(0);
 239 
				Item firstItem = items.get(0);
240
240
241 
				if(isMobile(firstItem) || isLaptop(firstItem)) {
 241 
				if(!firstItem.getItemStatus().equals(status.COMING_SOON) && isMobile(firstItem) || isLaptop(firstItem)) {
242 
					itemIds.add(firstItem.getId());
 242 
					itemIds.add(firstItem.getId());
243 
				}
 243 
				}
244 
			}
 244 
			}
245
245
246 
			PromotionClient promotionClient = new PromotionClient();
 246 
			PromotionClient promotionClient = new PromotionClient();
Line 262... Line 262...
262
262
263 
		for(Long entityId: entityIdItemMap.keySet()){
 263 
		for(Long entityId: entityIdItemMap.keySet()){
264 
			List<Item> items = entityIdItemMap.get(entityId);
 264 
			List<Item> items = entityIdItemMap.get(entityId);
265 
			Item firstItem = items.get(0);
 265 
			Item firstItem = items.get(0);
266
266
267 
			if(!(firstItem.getItemStatus().equals(status.COMING_SOON) && !firstItem.isShowSellingPrice()) && !isMobile(firstItem) && !isTablet(firstItem))	{
 267 
			if((firstItem.getItemStatus().equals(status.COMING_SOON) && !firstItem.isShowSellingPrice()) || !isMobile(firstItem) && !isTablet(firstItem))	{
268 
				continue;
 268 
				continue;
269 
			}
 269 
			}
270
270
271 
			irDataXMLSnippets.add(this.xmlIndentation[1] + "<products>");
271 
			irDataXMLSnippets.add(this.xmlIndentation[1] + "<products>");
272
272