Subversion Repositories SmartDukaan

Rev

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

Rev 27876 Rev 27895
Line 107... Line 107...
107 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 107 
		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
108 
				.collect(Collectors.toList());
 108 
				.collect(Collectors.toList());
109 
 
 109 
 
110 
		Set<String> brands = mongoClient.getMongoBrands(loginDetails.getFofoId(), null, 3).stream()
 110 
		Set<String> brands = mongoClient.getMongoBrands(loginDetails.getFofoId(), null, 3).stream()
111 
				.map(x -> (String) x.get("name")).collect(Collectors.toSet());
 111 
				.map(x -> (String) x.get("name")).collect(Collectors.toSet());
112 
		brands.add("Vivo");
 - 
 
113 
 
 112 
 
114 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 113 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
115 
 
 114 
 
116 
		model.addAttribute("customRetailersMap", customRetailersMap);
 115 
		model.addAttribute("customRetailersMap", customRetailersMap);
117 
		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
 116 
		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
Line 262... Line 261...
262 
 
 261 
 
263 
		return "offer_margin_detail_partner";
 262 
		return "offer_margin_detail_partner";
264 
 
 263 
 
265 
	}
 264 
	}
266 
 
 265 
 
267 
}
 266 
}
268 

            267