Subversion Repositories SmartDukaan

Rev

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

Rev 23798 Rev 23855
Line 24... Line 24...
24
import org.json.JSONObject;
24
import org.json.JSONObject;
25
import org.springframework.beans.factory.annotation.Autowired;
25
import org.springframework.beans.factory.annotation.Autowired;
26
import org.springframework.stereotype.Controller;
26
import org.springframework.stereotype.Controller;
27
import org.springframework.transaction.annotation.Transactional;
27
import org.springframework.transaction.annotation.Transactional;
28
import org.springframework.ui.Model;
28
import org.springframework.ui.Model;
-
 
29
import org.springframework.web.bind.annotation.PathVariable;
29
import org.springframework.web.bind.annotation.RequestBody;
30
import org.springframework.web.bind.annotation.RequestBody;
30
import org.springframework.web.bind.annotation.RequestMapping;
31
import org.springframework.web.bind.annotation.RequestMapping;
31
import org.springframework.web.bind.annotation.RequestMethod;
32
import org.springframework.web.bind.annotation.RequestMethod;
32
import org.springframework.web.bind.annotation.RequestParam;
33
import org.springframework.web.bind.annotation.RequestParam;
33
 
34
 
Line 74... Line 75...
74
import in.shop2020.model.v1.order.OrderType;
75
import in.shop2020.model.v1.order.OrderType;
75
import in.shop2020.model.v1.order.Transaction;
76
import in.shop2020.model.v1.order.Transaction;
76
import in.shop2020.model.v1.order.TransactionService;
77
import in.shop2020.model.v1.order.TransactionService;
77
import in.shop2020.model.v1.order.TransactionStatus;
78
import in.shop2020.model.v1.order.TransactionStatus;
78
import in.shop2020.model.v1.user.ItemPriceQuantity;
79
import in.shop2020.model.v1.user.ItemPriceQuantity;
79
import in.shop2020.model.v1.user.ItemQuantity;
-
 
80
import in.shop2020.model.v1.user.ShoppingCartException;
80
import in.shop2020.model.v1.user.ShoppingCartException;
81
import in.shop2020.model.v1.user.UserContextService.Client;
81
import in.shop2020.model.v1.user.UserContextService.Client;
82
import in.shop2020.payments.Attribute;
82
import in.shop2020.payments.Attribute;
83
import in.shop2020.payments.PaymentException;
83
import in.shop2020.payments.PaymentException;
84
import in.shop2020.payments.PaymentStatus;
84
import in.shop2020.payments.PaymentStatus;
Line 170... Line 170...
170
 
170
 
171
	@RequestMapping(value = "/migrate", method = RequestMethod.PUT)
171
	@RequestMapping(value = "/migrate", method = RequestMethod.PUT)
172
	public String migrate(HttpServletRequest request, Model model) throws Exception {
172
	public String migrate(HttpServletRequest request, Model model) throws Exception {
173
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
173
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
174
		int fofoId = loginDetails.getFofoId();
174
		int fofoId = loginDetails.getFofoId();
175
		List<TagListing> tagListings = tagListingRepository.selectAll();
175
		List<TagListing> tagListings = tagListingRepository.selectAll(false);
176
		for (TagListing tagListing : tagListings) {
176
		for (TagListing tagListing : tagListings) {
177
			int itemId = tagListing.getItemId();
177
			int itemId = tagListing.getItemId();
178
		}
178
		}
179
		return "";
179
		return "";
180
	}
180
	}
Line 262... Line 262...
262
 
262
 
263
		Map<Integer, StockAllocationModel> itemStockAllocationMap = stockAllocationList.stream()
263
		Map<Integer, StockAllocationModel> itemStockAllocationMap = stockAllocationList.stream()
264
				.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
264
				.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
265
		Map<Integer, Integer> itemsInTransit = null;
265
		Map<Integer, Integer> itemsInTransit = null;
266
		LOGGER.info("Item Stock Allocation Model Map {}", itemStockAllocationMap);
266
		LOGGER.info("Item Stock Allocation Model Map {}", itemStockAllocationMap);
267
		List<TagListing> tagListings = tagListingRepository.selectAll();
267
		List<TagListing> tagListings = tagListingRepository.selectAll(true);
268
		if (!roleManager.isAdmin(roleIds)) {
268
		if (!roleManager.isAdmin(roleIds)) {
269
			tagListings = new ArrayList<>(tagListings);
269
			tagListings = new ArrayList<>(tagListings);
270
			List<Order> inTransitOrders = orderRepository.selectOrders(fofoId, validOrderStatusList);
270
			List<Order> inTransitOrders = orderRepository.selectOrders(fofoId, validOrderStatusList);
271
			inTransitOrders = this.filterValidOrders(inTransitOrders);
271
			inTransitOrders = this.filterValidOrders(inTransitOrders);
272
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
272
			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
Line 398... Line 398...
398
			}
398
			}
399
		}
399
		}
400
		return lastOrdersList;
400
		return lastOrdersList;
401
	}
401
	}
402
 
402
 
-
 
403
	@RequestMapping(value = "/indent/confirm-pause/{tagId}", method=RequestMethod.POST)
-
 
404
	public String raisePO(HttpServletRequest request, Model model, @PathVariable int tagId) throws Exception {
-
 
405
		tagListingRepository.updateActiveById(tagId, false);
-
 
406
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
-
 
407
		return "response";
-
 
408
	}
403
	@RequestMapping(value = "/indent/create-po", method=RequestMethod.POST)
409
		@RequestMapping(value = "/indent/create-po", method=RequestMethod.POST)
404
	public String raisePO(HttpServletRequest request, Model model) throws Exception {
410
	public String raisePO(HttpServletRequest request, Model model) throws Exception {
405
		boolean success = false;
411
		boolean success = false;
406
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
412
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
407
		int fofoId = loginDetails.getFofoId();
413
		int fofoId = loginDetails.getFofoId();
408
		List<ItemPriceQuantity> itemQuantities = this.getItemQuantities(fofoId);
414
		List<ItemPriceQuantity> itemQuantities = this.getItemQuantities(fofoId);
Line 460... Line 466...
460
 
466
 
461
		Map<Integer, StockAllocationModel> itemStockAllocationMap = stockAllocationList.stream()
467
		Map<Integer, StockAllocationModel> itemStockAllocationMap = stockAllocationList.stream()
462
				.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
468
				.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
463
		Map<Integer, Integer> itemsInTransit = null;
469
		Map<Integer, Integer> itemsInTransit = null;
464
		LOGGER.info("Item Stock Allocation Model Map {}", itemStockAllocationMap);
470
		LOGGER.info("Item Stock Allocation Model Map {}", itemStockAllocationMap);
465
		List<TagListing> tagListings = tagListingRepository.selectAll();
471
		List<TagListing> tagListings = tagListingRepository.selectAll(false);
466
		List<Order> inTransitOrders = orderRepository.selectOrders(fofoId, validOrderStatusList);
472
		List<Order> inTransitOrders = orderRepository.selectOrders(fofoId, validOrderStatusList);
467
		inTransitOrders = this.filterValidOrders(inTransitOrders);
473
		inTransitOrders = this.filterValidOrders(inTransitOrders);
468
		itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
474
		itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
469
				Collectors.summingInt(x -> x.getLineItem().getQuantity())));
475
				Collectors.summingInt(x -> x.getLineItem().getQuantity())));
470
 
476