Subversion Repositories SmartDukaan

Rev

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

Rev 29652 Rev 29658
Line 595... Line 595...
595 
			Item item = itemRepository.selectById(searchItem);
 595 
			Item item = itemRepository.selectById(searchItem);
596 
			if (tagListing != null) {
 596 
			if (tagListing != null) {
597 
				model.addAttribute("dp", tagListing.getSellingPrice());
 597 
				model.addAttribute("dp", tagListing.getSellingPrice());
598 
				model.addAttribute("mop", tagListing.getMop());
 598 
				model.addAttribute("mop", tagListing.getMop());
599 
			}
 599 
			}
600 
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
 600 
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit).stream().filter(x-> {
601 
			//Remove 411 and 612
 - 
 
602 
			model.addAttribute("schemes", schemes.stream().filter(x-> {
 - 
 
603 
				return (x.getId()!=411 && x.getId()!=612) || date1.isBefore(LocalDate.of(2021, 12, 1));
 601 
				return (x.getId()!=411 && x.getId()!=612) || date1.isBefore(LocalDate.of(2021, 12, 1));
604 
			}).collect(Collectors.toList()));
 602 
			}).collect(Collectors.toList());
- 
 
 603 
			//Remove 411 and 612
- 
 
 604 
			model.addAttribute("schemes", schemes);
605 
			if (schemes.size() == 0) {
 605 
			if (schemes.size() == 0) {
606 
				if (isAdmin)
 606 
				if (isAdmin)
607 
					return "schemes";
 607 
					return "schemes";
608 
				else {
 608 
				else {
609 
 
 609