Subversion Repositories SmartDukaan

Rev

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

Rev 29608 Rev 29648
Line 544... Line 544...
544
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
544
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
545
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
545
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
546
		if (date == null) {
546
		if (date == null) {
547
			date = LocalDate.now();
547
			date = LocalDate.now();
548
		}
548
		}
-
 
549
		final LocalDate date1 = date;
549
		model.addAttribute("date", date);
550
		model.addAttribute("date", date);
550
 
551
 
551
		List<Scheme> schemes = null;
552
		List<Scheme> schemes = null;
552
		List<SchemeInOut> schemeInOut = null;
553
		List<SchemeInOut> schemeInOut = null;
553
 
554
 
Line 595... Line 596...
595
			if (tagListing != null) {
596
			if (tagListing != null) {
596
				model.addAttribute("dp", tagListing.getSellingPrice());
597
				model.addAttribute("dp", tagListing.getSellingPrice());
597
				model.addAttribute("mop", tagListing.getMop());
598
				model.addAttribute("mop", tagListing.getMop());
598
			}
599
			}
599
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
600
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
-
 
601
			//Remove 411 and 612
600
			model.addAttribute("schemes", schemes);
602
			model.addAttribute("schemes", schemes.stream().filter(x-> {
-
 
603
				return date1.isAfter(LocalDate.of(2021, 12, 1)) && x.getId()!=411 && x.getId()!=612;
-
 
604
			}).collect(Collectors.toList()));
601
			if (schemes.size() == 0) {
605
			if (schemes.size() == 0) {
602
				if (isAdmin)
606
				if (isAdmin)
603
					return "schemes";
607
					return "schemes";
604
				else {
608
				else {
605
 
609
 
Line 660... Line 664...
660
 
664
 
661
		model.addAttribute("searchItem", searchItem);
665
		model.addAttribute("searchItem", searchItem);
662
		model.addAttribute("searchTerm", searchTerm);
666
		model.addAttribute("searchTerm", searchTerm);
663
		model.addAttribute("partnerType", partnerType);
667
		model.addAttribute("partnerType", partnerType);
664
		model.addAttribute("isAdmin", isAdmin);
668
		model.addAttribute("isAdmin", isAdmin);
665
		model.addAttribute("schemes", schemes);
669
		model.addAttribute("schemes", schemes.stream().filter(x-> {
-
 
670
			return date1.isAfter(LocalDate.of(2021, 12, 1)) && x.getId()!=411 && x.getId()!=612;
-
 
671
		}).collect(Collectors.toList()));
666
		LOGGER.info("schemes" + schemes);
672
		LOGGER.info("schemes" + schemes);
667
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
673
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
668
		if (isAdmin)
674
		if (isAdmin)
669
			return "schemes";
675
			return "schemes";
670
		else {
676
		else {