Subversion Repositories SmartDukaan

Rev

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

Rev 28795 Rev 28796
Line 332... Line 332...
332 
			date = LocalDate.now();
 332 
			date = LocalDate.now();
333 
		}
 333 
		}
334 
		model.addAttribute("date", date);
 334 
		model.addAttribute("date", date);
335 
 
 335 
 
336 
		List<Scheme> schemes = null;
 336 
		List<Scheme> schemes = null;
- 
 
 337 
		List<SchemeInOut> schemeInOut = null;
- 
 
 338 
 
337 
		long size = 0;
 339 
		long size = 0;
338 
 
 340 
 
339 
		if (partnerType == null) {
 341 
		if (partnerType == null) {
340 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(),
 342 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(),
341 
					date.isAfter(LocalDate.now()) ? LocalDate.now() : date);
 343 
					date.isAfter(LocalDate.now()) ? LocalDate.now() : date);
Line 400... Line 402...
400 
 
 402 
 
401 
			LOGGER.info("searchImei" + searchImei);
 403 
			LOGGER.info("searchImei" + searchImei);
402 
 
 404 
 
403 
			InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumberFofoId(searchImei,
 405 
			InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumberFofoId(searchImei,
404 
					loginDetails.getFofoId());
 406 
					loginDetails.getFofoId());
405 
			List<SchemeInOut> schemeInOut = new ArrayList<>();
 - 
 
406 
			Map<Integer, Scheme> schemeMap = new HashMap<>();
 407 
			Map<Integer, Scheme> schemeMap = new HashMap<>();
407 
			if (inventoryItem != null) {
 408 
			if (inventoryItem != null) {
408 
 
 409 
 
409 
				LOGGER.info("inventoryItem" + inventoryItem);
 410 
				LOGGER.info("inventoryItem" + inventoryItem);
410 
 
 411 
 
Line 431... Line 432...
431 
				}
 432 
				}
432 
			}
 433 
			}
433 
 
 434 
 
434 
			model.addAttribute("schemeMap", schemeMap);
 435 
			model.addAttribute("schemeMap", schemeMap);
435 
 
 436 
 
436 
			model.addAttribute("schemeInOut", schemeInOut);
 - 
 
437 
 
 - 
 
438 
		}
 437 
		}
- 
 
 438 
		model.addAttribute("schemeInOut", schemeInOut);
- 
 
 439 
 
439 
		model.addAttribute("searchItem", searchItem);
 440 
		model.addAttribute("searchItem", searchItem);
440 
		model.addAttribute("searchTerm", searchTerm);
 441 
		model.addAttribute("searchTerm", searchTerm);
441 
		model.addAttribute("partnerType", partnerType);
 442 
		model.addAttribute("partnerType", partnerType);
442 
		model.addAttribute("isAdmin", isAdmin);
 443 
		model.addAttribute("isAdmin", isAdmin);
443 
		model.addAttribute("schemes", schemes);
 444 
		model.addAttribute("schemes", schemes);
Line 453... Line 454...
453 
			}
 454 
			}
454 
			if (!(searchImei.equals(""))) {
 455 
			if (!(searchImei.equals(""))) {
455 
				InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumberFofoId(searchImei,
 456 
				InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumberFofoId(searchImei,
456 
						loginDetails.getFofoId());
 457 
						loginDetails.getFofoId());
457 
 
 458 
 
458 
				offers = offerService.getPublishedOffers(date, loginDetails.getFofoId(), inventoryItem.getItemId());
 - 
 
459 
				priceDropImeis = priceDropIMEIRepository.selectByFofoIdImei(loginDetails.getFofoId(), searchImei);
 459 
				priceDropImeis = priceDropIMEIRepository.selectByFofoIdImei(loginDetails.getFofoId(), searchImei);
460 
				for (PriceDropIMEI priceDropIMEI : priceDropImeis) {
 460 
				for (PriceDropIMEI priceDropIMEI : priceDropImeis) {
461 
					int priceDropId = priceDropIMEI.getPriceDropId();
 461 
					int priceDropId = priceDropIMEI.getPriceDropId();
462 
					PriceDrop pd = priceDropRepository.selectById(priceDropId);
 462 
					PriceDrop pd = priceDropRepository.selectById(priceDropId);
463 
 
 463