Subversion Repositories SmartDukaan

Rev

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

Rev 27769 Rev 27876
Line 130... Line 130...
130 
 
 130 
 
131 
	private static final Logger LOGGER = LogManager.getLogger(IndentController.class);
 131 
	private static final Logger LOGGER = LogManager.getLogger(IndentController.class);
132 
	private static final int WALLET_GATEWAY_ID = 8;
 132 
	private static final int WALLET_GATEWAY_ID = 8;
133 
	private static final Set<Integer> defaultTags = new HashSet<Integer>(Arrays.asList(4));
 133 
	private static final Set<Integer> defaultTags = new HashSet<Integer>(Arrays.asList(4));
134 
 
 134 
 
135 
	private final List<OrderStatus> validOrderStatusList = Arrays.asList(OrderStatus.ACCEPTED,
 - 
 
136 
			OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH,
 - 
 
137 
			OrderStatus.DELIVERY_SUCCESS, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.SHIPPED_TO_LOGST,
 - 
 
138 
			OrderStatus.REACHED_DESTINATION_CITY);
 - 
 
139 
 
 - 
 
140 
	private final List<OrderStatus> partnerPendingOrderList = Arrays.asList(OrderStatus.ACCEPTED,
 135 
	private final List<OrderStatus> partnerPendingOrderList = Arrays.asList(OrderStatus.ACCEPTED,
141 
			OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH,
 136 
			OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH,
142 
			OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.SHIPPED_TO_LOGST,
 137 
			OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.SHIPPED_TO_LOGST,
143 
			OrderStatus.REACHED_DESTINATION_CITY);
 138 
			OrderStatus.REACHED_DESTINATION_CITY);
144 
 
 139 
 
Line 567... Line 562...
567 
 
 562 
 
568 
		Map<Integer, Integer> itemsInTransit = null;
 563 
		Map<Integer, Integer> itemsInTransit = null;
569 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 564 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
570 
		if (!isAdmin) {
 565 
		if (!isAdmin) {
571 
			tagListings = new ArrayList<>(tagListings);
 566 
			tagListings = new ArrayList<>(tagListings);
572 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, validOrderStatusList);
 567 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
573 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 568 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
574 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 569 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
575 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 570 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
576 
		} else {
 571 
		} else {
577 
			itemsInTransit = new HashMap<>();
 572 
			itemsInTransit = new HashMap<>();
Line 821... Line 816...
821 
 
 816 
 
822 
		Map<Integer, Integer> itemsInTransit = null;
 817 
		Map<Integer, Integer> itemsInTransit = null;
823 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 818 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
824 
		if (!isAdmin) {
 819 
		if (!isAdmin) {
825 
			tagListings = new ArrayList<>(tagListings);
 820 
			tagListings = new ArrayList<>(tagListings);
826 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, validOrderStatusList);
 821 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
827 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 822 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
828 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 823 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
829 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 824 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
830 
		} else {
 825 
		} else {
831 
			itemsInTransit = new HashMap<>();
 826 
			itemsInTransit = new HashMap<>();
Line 1377... Line 1372...
1377 
 
 1372 
 
1378 
		Map<Integer, Integer> itemsInTransit = null;
 1373 
		Map<Integer, Integer> itemsInTransit = null;
1379 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
 1374 
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
1380 
		if (!isAdmin) {
 1375 
		if (!isAdmin) {
1381 
			tagListings = new ArrayList<>(tagListings);
 1376 
			tagListings = new ArrayList<>(tagListings);
1382 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, validOrderStatusList);
 1377 
			List<Order> inTransitOrders = orderRepository.selectPendingGrnOrder(fofoId, OrderRepository.validOrderStatusList);
1383 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
 1378 
			inTransitOrders = this.filterValidOrders(inTransitOrders);
1384 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 1379 
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
1385 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 1380 
					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
1386 
		} else {
 1381 
		} else {
1387 
			itemsInTransit = new HashMap<>();
 1382 
			itemsInTransit = new HashMap<>();