Subversion Repositories SmartDukaan

Rev

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

Rev 14906 Rev 14911
Line 52... Line 52...
52
        try {
52
        try {
53
            SearchFilter searchFilter = new SearchFilter();
53
            SearchFilter searchFilter = new SearchFilter();
54
            
54
            
55
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
55
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
56
            	searchFilter.setNotShowPmTickets(true);
56
            	searchFilter.setNotShowPmTickets(true);
-
 
57
            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
-
 
58
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
-
 
59
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
-
 
60
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
-
 
61
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
-
 
62
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
57
            }
63
            }
58
            if (activityId != null && !activityId.isEmpty()) {
64
            if (activityId != null && !activityId.isEmpty()) {
59
                searchFilter.setActivityId(Long.parseLong(activityId));
65
                searchFilter.setActivityId(Long.parseLong(activityId));
60
            } else if (userId != null && !userId.isEmpty()) {
66
            } else if (userId != null && !userId.isEmpty()) {
61
                searchFilter.setCustomerId(Long.parseLong(userId));
67
                searchFilter.setCustomerId(Long.parseLong(userId));
Line 199... Line 205...
199
            searchFilter.setIsActivityRead(false);
205
            searchFilter.setIsActivityRead(false);
200
            searchFilter.setActivityCreatorIds(Collections.singletonList(CRMConstants.ADMIN_AGENT_ID));
206
            searchFilter.setActivityCreatorIds(Collections.singletonList(CRMConstants.ADMIN_AGENT_ID));
201
 
207
 
202
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
208
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
203
            	searchFilter.setNotShowPmTickets(true);
209
            	searchFilter.setNotShowPmTickets(true);
-
 
210
            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
-
 
211
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
-
 
212
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
-
 
213
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
-
 
214
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
-
 
215
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
204
            }
216
            }
205
            
217
            
206
            searchFilter.setTicketAssigneeIds(Collections
218
            searchFilter.setTicketAssigneeIds(Collections
207
                    .singletonList(CRMAuthorizingRealm.getAgent(
219
                    .singletonList(CRMAuthorizingRealm.getAgent(
208
                            currentAgentEmailId).getId()));
220
                            currentAgentEmailId).getId()));