Subversion Repositories SmartDukaan

Rev

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

Rev 27876 Rev 28055
Line 501... Line 501...
501 
		model.addAttribute("response", response.toString());
 501 
		model.addAttribute("response", response.toString());
502 
		return "response";
 502 
		return "response";
503 
 
 503 
 
504 
	}
 504 
	}
505 
 
 505 
 
- 
 
 506 
	@RequestMapping(value = "/hotdealsitemsByCatalogId")
- 
 
 507 
	public String getHotdealsitemsByCatalogId(HttpServletRequest request, Model model,
- 
 
 508 
			@RequestParam(required = false) int catalogId, @RequestParam(required = false) int itemId)
- 
 
 509 
			throws ProfitMandiBusinessException {
- 
 
 510 
		if (catalogId == 0) {
- 
 
 511 
			catalogId = itemRepository.selectById(itemId).getCatalogItemId();
- 
 
 512 
		}
- 
 
 513 
		List<Item> items = itemRepository.selectAllByCatalogItemId(catalogId);
- 
 
 514 
		LOGGER.info("Items {}", items);
- 
 
 515 
		Map<Integer, String> itemsColorMap = items.stream().filter(x -> x.getColorNatural().startsWith("f_"))
- 
 
 516 
				.collect(Collectors.toMap(Item::getId, Item::getColor));
- 
 
 517 
		Map<Integer, TagListing> tagsMap = tagListingRepository
- 
 
 518 
				.selectByItemIdsAndTagIds(items.stream().map(x -> x.getId()).collect(Collectors.toSet()), defaultTags)
- 
 
 519 
				.stream().collect(Collectors.toMap(TagListing::getItemId, x -> x));
- 
 
 520 
		LOGGER.info("Items color map {}", itemsColorMap);
- 
 
 521 
		JSONArray response = new JSONArray();
- 
 
 522 
		itemsColorMap.keySet().stream().forEach(x -> {
- 
 
 523 
			response.put(new JSONObject().put("color", itemsColorMap.get(x)).put("id", x).put("hotDeals",
- 
 
 524 
					tagsMap.get(x) == null ? false : tagsMap.get(x).isHotDeals()));
- 
 
 525 
		});
- 
 
 526 
		model.addAttribute("response", response.toString());
- 
 
 527 
		return "response";
- 
 
 528 
 
- 
 
 529 
	}
- 
 
 530 
 
506 
	@RequestMapping(value = "/indent/loadIndent")
 531 
	@RequestMapping(value = "/indent/loadIndent")
507 
	public String loadOpenIndent(HttpServletRequest request, Model model,
 532 
	public String loadOpenIndent(HttpServletRequest request, Model model,
508 
			@RequestParam(required = false, defaultValue = "0") int fofoId,
 533 
			@RequestParam(required = false, defaultValue = "0") int fofoId,
509 
			@RequestParam(defaultValue = "TEN_LAC") CounterSize counterSize) throws Exception {
 534 
			@RequestParam(defaultValue = "TEN_LAC") CounterSize counterSize) throws Exception {
510 
 
 535 
 
Line 562... Line 587...
562 
 
 587 
 
563 
		Map<Integer, Integer> itemsInTransit = null;
 588 
		Map<Integer, Integer> itemsInTransit = null;
564 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 589 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
565 
		if (!isAdmin) {
 590 
		if (!isAdmin) {
566 
			tagListings = new ArrayList<>(tagListings);
 591 
			tagListings = new ArrayList<>(tagListings);
567 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
 592 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId,
- 
 
 593 
					OrderRepository.validOrderStatusList);
568 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 594 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
569 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 595 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
570 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 596 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
571 
		} else {
 597 
		} else {
572 
			itemsInTransit = new HashMap<>();
 598 
			itemsInTransit = new HashMap<>();
Line 816... Line 842...
816 
 
 842 
 
817 
		Map<Integer, Integer> itemsInTransit = null;
 843 
		Map<Integer, Integer> itemsInTransit = null;
818 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 844 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
819 
		if (!isAdmin) {
 845 
		if (!isAdmin) {
820 
			tagListings = new ArrayList<>(tagListings);
 846 
			tagListings = new ArrayList<>(tagListings);
821 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
 847 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId,
- 
 
 848 
					OrderRepository.validOrderStatusList);
822 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 849 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
823 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 850 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
824 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 851 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
825 
		} else {
 852 
		} else {
826 
			itemsInTransit = new HashMap<>();
 853 
			itemsInTransit = new HashMap<>();
Line 1011... Line 1038...
1011 
		}
 1038 
		}
1012 
		model.addAttribute("response", true);
 1039 
		model.addAttribute("response", true);
1013 
		return "response";
 1040 
		return "response";
1014 
	}
 1041 
	}
1015 
 
 1042 
 
- 
 
 1043 
	@RequestMapping(value = "/indent/confirm-hotdeals-pause", method = RequestMethod.POST)
- 
 
 1044 
	public String hotdealUpdate(HttpServletRequest request, Model model, @RequestBody String jsonArrayString)
- 
 
 1045 
			throws Exception {
- 
 
 1046 
		JSONArray jsonArray = new JSONArray(jsonArrayString);
- 
 
 1047 
		for (int i = 0; i < jsonArray.length(); i++) {
- 
 
 1048 
			JSONObject obj = jsonArray.getJSONObject(i);
- 
 
 1049 
 
- 
 
 1050 
			TagListing tl = tagListingRepository.selectByItemId(obj.getInt("id"));
- 
 
 1051 
			if (tl == null) {
- 
 
 1052 
				continue;
- 
 
 1053 
			} else {
- 
 
 1054 
				tl.setHotDeals(obj.getBoolean("hotDeals"));
- 
 
 1055 
				tagListingRepository.persist(tl);
- 
 
 1056 
			}
- 
 
 1057 
		}
- 
 
 1058 
		model.addAttribute("response", true);
- 
 
 1059 
		return "response";
- 
 
 1060 
	}
- 
 
 1061 
 
1016 
	@RequestMapping(value = "/indent/create-po", method = RequestMethod.POST)
 1062 
	@RequestMapping(value = "/indent/create-po", method = RequestMethod.POST)
1017 
	public String raisePO(HttpServletRequest request, Model model) throws Exception {
 1063 
	public String raisePO(HttpServletRequest request, Model model) throws Exception {
1018 
		boolean success = false;
 1064 
		boolean success = false;
1019 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 1065 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
1020 
		int fofoId = loginDetails.getFofoId();
 1066 
		int fofoId = loginDetails.getFofoId();
Line 1372... Line 1418...
1372 
 
 1418 
 
1373 
		Map<Integer, Integer> itemsInTransit = null;
 1419 
		Map<Integer, Integer> itemsInTransit = null;
1374 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 1420 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
1375 
		if (!isAdmin) {
 1421 
		if (!isAdmin) {
1376 
			tagListings = new ArrayList<>(tagListings);
 1422 
			tagListings = new ArrayList<>(tagListings);
1377 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
 1423 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId,
- 
 
 1424 
					OrderRepository.validOrderStatusList);
1378 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 1425 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
1379 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 1426 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
1380 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 1427 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
1381 
		} else {
 1428 
		} else {
1382 
			itemsInTransit = new HashMap<>();
 1429 
			itemsInTransit = new HashMap<>();