Subversion Repositories SmartDukaan

Rev

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

Rev 26769 Rev 26770
Line 122... Line 122...
122 
				emailIdOrMobileNumber);
 122 
				emailIdOrMobileNumber);
123 
		try {
 123 
		try {
124
124
125 
			Map<String, Object> map = retailerService.getByEmailIdOrMobileNumber(emailIdOrMobileNumber);
 125 
			Map<String, Object> map = retailerService.getByEmailIdOrMobileNumber(emailIdOrMobileNumber);
126 
			model.addAllAttributes(map);
 126 
			model.addAllAttributes(map);
- 
 
 127 
			if (map.containsKey("retailer")) {
- 
 
 128 
				Retailer retailer = (Retailer) map.get("retailer");
- 
 
 129 
				User user = userRepository.selectById(retailer.getId());
- 
 
 130 
				if (user.getLocation() != null) {
- 
 
 131 
					Location location = locationRepository.selectById(user.getLocation());
- 
 
 132 
					model.addAttribute("locationdetail", location);
- 
 
 133 
					LOGGER.info("location" + location);
- 
 
 134 
				}
- 
 
 135 
			}
127 
		} catch(Exception e) {
 136 
		} catch(Exception e) {
128 
			//Do nothing
 137 
			//Do nothing
129 
		}
 138 
		}
130 
		model.addAttribute("counterSizes", CounterSize.values());
 139 
		model.addAttribute("counterSizes", CounterSize.values());
131 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 140 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
132 
		LOGGER.info("warehouseMap", warehouseMap);
 141 
		LOGGER.info("warehouseMap", warehouseMap);
133 
		model.addAttribute("warehouses", warehouseMap);
 142 
		model.addAttribute("warehouses", warehouseMap);
134 
		if (map.containsKey("retailer")) {
 - 
 
135 
			Retailer retailer = (Retailer) map.get("retailer");
 - 
 
136 
			User user = userRepository.selectById(retailer.getId());
 - 
 
137 
			if (user.getLocation() != null) {
 - 
 
138 
				Location location = locationRepository.selectById(user.getLocation());
 - 
 
139 
				model.addAttribute("locationdetail", location);
 - 
 
140 
				LOGGER.info("location" + location);
 - 
 
141 
			}
 - 
 
142 
		}
 - 
 
143 
		return "retailer-details";
 143 
		return "retailer-details";
144 
	}
 144 
	}
145 
 
 145 
 
146 
	@RequestMapping(value = "/retailerDetails", method = RequestMethod.PUT)
 146 
	@RequestMapping(value = "/retailerDetails", method = RequestMethod.PUT)
147 
	public String updateRetailerDetails(HttpServletRequest request,
 147 
	public String updateRetailerDetails(HttpServletRequest request,