Subversion Repositories SmartDukaan

Rev

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

Rev 16208 Rev 16244
Line 53... Line 53...
53 
    public String index() {
 53 
    public String index() {
54 
        try {
 54 
        try {
55 
            SearchFilter searchFilter = new SearchFilter();
 55 
            SearchFilter searchFilter = new SearchFilter();
56 
            if(isProfitMandiAgent()){
 56 
            if(isProfitMandiAgent()){
57 
            	searchFilter.setNotShowPmTickets(false);
 57 
            	searchFilter.setNotShowPmTickets(false);
58 
            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
 58 
            	searchFilter.setTicketCategoryList(profitMandiTicketCategoryList);
59 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
 59
60 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
 60 
            }else if(isSaholicAndProfitMandiAllowed()){
61 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
 - 
 
62 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
 61
63 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
 - 
 
64 
            }else{
 62 
            }else{
65 
            	if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
 63 
            	if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
66 
	            	searchFilter.setNotShowPmTickets(true);
 64 
	            	searchFilter.setNotShowPmTickets(true);
67 
	            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
 65 
	            	searchFilter.setTicketCategoryList(profitMandiTicketCategoryList);
68 
	                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
 - 
 
69 
	                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
 - 
 
70 
	                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
 - 
 
71 
	                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
 - 
 
72 
	                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
 - 
 
73 
	            }
 66 
	            }
74 
            }
 67 
            }
75 
            if (activityId != null && !activityId.isEmpty()) {
 68 
            if (activityId != null && !activityId.isEmpty()) {
76 
                searchFilter.setActivityId(Long.parseLong(activityId));
 69 
                searchFilter.setActivityId(Long.parseLong(activityId));
77 
            } else if (userId != null && !userId.isEmpty()) {
 70 
            } else if (userId != null && !userId.isEmpty()) {