Subversion Repositories SmartDukaan

Rev

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

Rev 30456 Rev 30565
Line 201... Line 201...
201
	@Autowired
201
	@Autowired
202
	HighDemandItemsRepository highDemandItemsRepository;
202
	HighDemandItemsRepository highDemandItemsRepository;
203
 
203
 
204
	@RequestMapping(value = "/getCurrentInventorySnapshot")
204
	@RequestMapping(value = "/getCurrentInventorySnapshot")
205
	public String getCurrentAvailability(HttpServletRequest request,
205
	public String getCurrentAvailability(HttpServletRequest request,
206
										 @RequestParam(name = "offset", defaultValue = "0") int offset,
206
			@RequestParam(name = "offset", defaultValue = "0") int offset,
207
										 @RequestParam(name = "limit", defaultValue = "10") int limit,
207
			@RequestParam(name = "limit", defaultValue = "10") int limit,
208
										 @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
208
			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
209
			throws ProfitMandiBusinessException {
209
			throws ProfitMandiBusinessException {
210
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
210
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
211
		Map<String, Object> map = inventoryService.getCurrentInventorySnapshot(loginDetails.getFofoId(), offset, limit,
211
		Map<String, Object> map = inventoryService.getCurrentInventorySnapshot(loginDetails.getFofoId(), offset, limit,
212
				searchTerm);
212
				searchTerm);
213
		model.addAllAttributes(map);
213
		model.addAllAttributes(map);
Line 434... Line 434...
434
		model.addAttribute("inventoryItems", inventoryItems);
434
		model.addAttribute("inventoryItems", inventoryItems);
435
		return "activated-imeis";
435
		return "activated-imeis";
436
	}
436
	}
437
 
437
 
438
	@RequestMapping(value = "/activated-imeis-grn-pending")
438
	@RequestMapping(value = "/activated-imeis-grn-pending")
439
	public String activatedImeisGrnPending(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
439
	public String activatedImeisGrnPending(HttpServletRequest request, Model model)
-
 
440
			throws ProfitMandiBusinessException {
440
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
441
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
441
 
442
 
442
		List<Order> openOrders = orderRepository.selectGrnTimestampNull(loginDetails.getFofoId(), Arrays.asList(OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERY_SUCCESS));
443
		List<Order> openOrders = orderRepository.selectGrnTimestampNull(loginDetails.getFofoId(),
-
 
444
				Arrays.asList(OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERY_SUCCESS));
-
 
445
		List<ImeiActivationTimestampModel> imeiActivationTimestampModels = activatedImeiRepository
443
		List<ImeiActivationTimestampModel> imeiActivationTimestampModels = activatedImeiRepository.selectActivatedImeisByOrders(openOrders.stream().map(x -> x.getId()).collect(Collectors.toList()));
446
				.selectActivatedImeisByOrders(openOrders.stream().map(x -> x.getId()).collect(Collectors.toList()));
444
		Map<Integer, Order> ordersMap = openOrders.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
447
		Map<Integer, Order> ordersMap = openOrders.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
445
		model.addAttribute("ordersMap", ordersMap);
448
		model.addAttribute("ordersMap", ordersMap);
446
		model.addAttribute("imeiActivationTimestampModels", imeiActivationTimestampModels);
449
		model.addAttribute("imeiActivationTimestampModels", imeiActivationTimestampModels);
447
		return "activated-imeis-grn-pending";
450
		return "activated-imeis-grn-pending";
448
	}
451
	}
Line 452... Line 455...
452
		return "view-dummy-invoices";
455
		return "view-dummy-invoices";
453
	}
456
	}
454
 
457
 
455
	@RequestMapping(value = "/dummy-invoices")
458
	@RequestMapping(value = "/dummy-invoices")
456
	public ResponseEntity<?> downloadInvoices(HttpServletRequest request, @RequestParam String serialNumber,
459
	public ResponseEntity<?> downloadInvoices(HttpServletRequest request, @RequestParam String serialNumber,
457
											  Model model) throws ProfitMandiBusinessException {
460
			Model model) throws ProfitMandiBusinessException {
458
		byte[] bytes = null;
461
		byte[] bytes = null;
459
		if (!imeis.contains(serialNumber)) {
462
		if (!imeis.contains(serialNumber)) {
460
 
463
 
461
			InvoicePdfModel pdfModel = orderService.getDummyPdfModel(serialNumber);
464
			InvoicePdfModel pdfModel = orderService.getDummyPdfModel(serialNumber);
462
			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
465
			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
Line 1022... Line 1025...
1022
 
1025
 
1023
				List<NotifyColorChange> notifyColorChanges = notifyColorChangeRepository.selectByNotifyId(notifyIds);
1026
				List<NotifyColorChange> notifyColorChanges = notifyColorChangeRepository.selectByNotifyId(notifyIds);
1024
				Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = this
1027
				Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = this
1025
						.notifyOrdersToNotifyId(notifyColorChanges);
1028
						.notifyOrdersToNotifyId(notifyColorChanges);
1026
				Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
1029
				Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
1027
				Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream()
1030
				Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().distinct()
1028
						.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
1031
						.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
1029
						.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
1032
						.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
1030
				Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(oldItemIds);
1033
				Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(oldItemIds);
1031
 
1034
 
1032
				model.addAttribute("notifyOrders", notifyOrders);
1035
				model.addAttribute("notifyOrders", notifyOrders);