Subversion Repositories SmartDukaan

Rev

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

Rev 16092 Rev 16208
Line 13... Line 13...
13 
import in.shop2020.serving.auth.CRMAuthorizingRealm;
 13 
import in.shop2020.serving.auth.CRMAuthorizingRealm;
14 
import in.shop2020.thrift.clients.CRMClient;
 14 
import in.shop2020.thrift.clients.CRMClient;
15 
import in.shop2020.thrift.clients.UserClient;
 15 
import in.shop2020.thrift.clients.UserClient;
16 
import in.shop2020.util.CRMConstants;
 16 
import in.shop2020.util.CRMConstants;
17 
import in.shop2020.util.CRMConstants.ActivityCommonDescriptionMatrix;
 17 
import in.shop2020.util.CRMConstants.ActivityCommonDescriptionMatrix;
- 
 
 18 
import in.shop2020.util.CRMConstants.ActivityPMCommonDescriptionMatrix;
18 
 
 19 
 
19 
import java.text.ParseException;
 20 
import java.text.ParseException;
20 
import java.util.ArrayList;
 21 
import java.util.ArrayList;
21 
import java.util.Collections;
 22 
import java.util.Collections;
22 
import java.util.List;
 23 
import java.util.List;
Line 50... Line 51...
50 
    private String			  notShowPmTickets;
 51 
    private String			  notShowPmTickets;
51 
 
 52 
 
52 
    public String index() {
 53 
    public String index() {
53 
        try {
 54 
        try {
54 
            SearchFilter searchFilter = new SearchFilter();
 55 
            SearchFilter searchFilter = new SearchFilter();
55
56 
            if(isProfitMandiAgent()){
56 
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
 - 
 
57 
            	searchFilter.setNotShowPmTickets(true);
 57 
            	searchFilter.setNotShowPmTickets(false);
58 
            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
 58 
            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
59 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
 59 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_CASHBACK);
60 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
 60 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_FEEDBACK);
61 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
 61 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
62 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
 62 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_OTHER);
63 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
 63 
                searchFilter.getTicketCategoryList().add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
- 
 
 64 
            }else{
- 
 
 65 
            	if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
- 
 
 66 
	            	searchFilter.setNotShowPmTickets(true);
- 
 
 67 
	            	searchFilter.setTicketCategoryList(new ArrayList<TicketCategory>());
- 
 
 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 
	            }
64 
            }
 74 
            }
65 
            if (activityId != null && !activityId.isEmpty()) {
 75 
            if (activityId != null && !activityId.isEmpty()) {
66 
                searchFilter.setActivityId(Long.parseLong(activityId));
 76 
                searchFilter.setActivityId(Long.parseLong(activityId));
67 
            } else if (userId != null && !userId.isEmpty()) {
 77 
            } else if (userId != null && !userId.isEmpty()) {
68 
                searchFilter.setCustomerId(Long.parseLong(userId));
 78 
                searchFilter.setCustomerId(Long.parseLong(userId));
Line 239... Line 249...
239 
 
 249 
 
240 
    public ActivityCommonDescriptionMatrix[] getActivityCommonDescriptionMatrix () {
 250 
    public ActivityCommonDescriptionMatrix[] getActivityCommonDescriptionMatrix () {
241 
        return CRMConstants.ActivityCommonDescriptionMatrix.values();
 251 
        return CRMConstants.ActivityCommonDescriptionMatrix.values();
242 
    }
 252 
    }
243
253
- 
 
 254 
    public ActivityPMCommonDescriptionMatrix[] getPMActivityCommonDescriptionMatrix(){
- 
 
 255 
    	return CRMConstants.ActivityPMCommonDescriptionMatrix.values();
- 
 
 256 
    }
- 
 
 257
244 
    public String getDescription() {
 258 
    public String getDescription() {
245 
        return description;
 259 
        return description;
246 
    }
 260 
    }
247 
 
 261 
 
248 
    public void setDescription(String description) {
 262 
    public void setDescription(String description) {