Subversion Repositories SmartDukaan

Rev

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

Rev 28924 Rev 28980
Line 4... Line 4...
4 
import java.io.ByteArrayOutputStream;
 4 
import java.io.ByteArrayOutputStream;
5 
import java.io.InputStream;
 5 
import java.io.InputStream;
6 
import java.time.LocalDate;
 6 
import java.time.LocalDate;
7 
import java.time.LocalDateTime;
 7 
import java.time.LocalDateTime;
8 
import java.time.LocalTime;
 8 
import java.time.LocalTime;
- 
 
 9 
import java.time.YearMonth;
9 
import java.util.ArrayList;
 10 
import java.util.ArrayList;
10 
import java.util.Arrays;
 11 
import java.util.Arrays;
11 
import java.util.HashMap;
 12 
import java.util.HashMap;
12 
import java.util.HashSet;
 13 
import java.util.HashSet;
13 
import java.util.List;
 14 
import java.util.List;
Line 335... Line 336...
335 
 
 336 
 
336 
		List<Scheme> schemes = null;
 337 
		List<Scheme> schemes = null;
337 
		List<SchemeInOut> schemeInOut = null;
 338 
		List<SchemeInOut> schemeInOut = null;
338 
 
 339 
 
339 
		long size = 0;
 340 
		long size = 0;
340 
 
 - 
 
- 
 
 341 
		date = date.isAfter(LocalDate.now()) ? LocalDate.now() : date;
341 
		if (partnerType == null) {
 342 
		if (partnerType == null) {
- 
 
 343 
			//TODO - SCHEME
- 
 
 344 
			/*
- 
 
 345 
			 * partnerType =
342 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(),
 346 
			 * partnerTypeChangeService.getTypeOnMonth(loginDetails.getFofoId(),
343 
					date.isAfter(LocalDate.now()) ? LocalDate.now() : date);
 347 
			 * YearMonth.of(date.getYear(), date.getMonth()));
- 
 
 348 
			 */
- 
 
 349 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
344 
		}
 350 
		}
345 
		if (!(searchTerm.equals(""))) {
 351 
		if (!(searchTerm.equals(""))) {
346 
			schemes = schemeRepository.selectBySearchTerm(searchTerm, offset, limit);
 352 
			schemes = schemeRepository.selectBySearchTerm(searchTerm, offset, limit);
347 
			for (Scheme scheme : schemes) {
 353 
			for (Scheme scheme : schemes) {
348 
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
 354 
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {