Subversion Repositories SmartDukaan

Rev

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

Rev 7595 Rev 7645
Line 94... Line 94...
94
    private String            escalate;
94
    private String            escalate;
95
    private String            cancelReason;
95
    private String            cancelReason;
96
    private String            transactionId;
96
    private String            transactionId;
97
    private String            pickupExtension;
97
    private String            pickupExtension;
98
    private Map<String, Long> ticketCategorycountMap;
98
    private Map<String, Long> ticketCategorycountMap;
-
 
99
    private String premises = "";
-
 
100
    private String closureType = "";
99
    private String paymentId;
101
    private String paymentId;
100
 
102
 
101
    private HashMap<String, String> allAttachmentsForTicket;
103
    private HashMap<String, String> allAttachmentsForTicket;
102
 
104
 
103
    public String index() {
105
    public String index() {
Line 970... Line 972...
970
    }
972
    }
971
    
973
    
972
    public String authorizeReturn() {
974
    public String authorizeReturn() {
973
        try {
975
        try {
974
            log.info("Authorizing OrderId =" + orderId);
976
            log.info("Authorizing OrderId =" + orderId);
-
 
977
            boolean isReship = false;
-
 
978
            boolean fromStore  = false;
975
            transactionServiceClient = new TransactionClient().getClient();
979
            transactionServiceClient = new TransactionClient().getClient();
-
 
980
            if(premises.equals("store")) {
-
 
981
                fromStore = true;
-
 
982
            }
-
 
983
            
-
 
984
            if(closureType.equals("reship")) {
-
 
985
                isReship = true;
-
 
986
            }
976
            transactionServiceClient.markOrderReturnRequestAuthorized(Long.parseLong(orderId), true);
987
            transactionServiceClient.markOrderReturnRequestAuthorized(Long.parseLong(orderId), true, fromStore, isReship);
977
            if (id != null && !id.isEmpty()) {
988
            if (id != null && !id.isEmpty()) {
978
                SearchFilter searchFilter = new SearchFilter();
989
                SearchFilter searchFilter = new SearchFilter();
979
                crmServiceClient = new CRMClient().getClient();
990
                crmServiceClient = new CRMClient().getClient();
980
                searchFilter.setTicketId(Long.parseLong(id));
991
                searchFilter.setTicketId(Long.parseLong(id));
981
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
992
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
Line 1012... Line 1023...
1012
    
1023
    
1013
    public String denyReturn() {
1024
    public String denyReturn() {
1014
        try {
1025
        try {
1015
            log.info("Denying OrderId =" + orderId);
1026
            log.info("Denying OrderId =" + orderId);
1016
            transactionServiceClient = new TransactionClient().getClient();
1027
            transactionServiceClient = new TransactionClient().getClient();
1017
            transactionServiceClient.markOrderReturnRequestAuthorized(Long.parseLong(orderId), false);
1028
            transactionServiceClient.markOrderReturnRequestAuthorized(Long.parseLong(orderId), false, false, false);
1018
            if (id != null && !id.isEmpty()) {
1029
            if (id != null && !id.isEmpty()) {
1019
                SearchFilter searchFilter = new SearchFilter();
1030
                SearchFilter searchFilter = new SearchFilter();
1020
                crmServiceClient = new CRMClient().getClient();
1031
                crmServiceClient = new CRMClient().getClient();
1021
                searchFilter.setTicketId(Long.parseLong(id));
1032
                searchFilter.setTicketId(Long.parseLong(id));
1022
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
1033
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
Line 1052... Line 1063...
1052
    }
1063
    }
1053
    
1064
    
1054
    public String authorizeDOA() {
1065
    public String authorizeDOA() {
1055
        try {
1066
        try {
1056
            log.info("Authorizing OrderId =" + orderId);
1067
            log.info("Authorizing OrderId =" + orderId);
-
 
1068
            boolean isReship = false;
-
 
1069
            boolean fromStore  = false;
1057
            transactionServiceClient = new TransactionClient().getClient();
1070
            transactionServiceClient = new TransactionClient().getClient();
-
 
1071
            if(premises.equals("store")) {
-
 
1072
                fromStore = true;
-
 
1073
            }
-
 
1074
            
-
 
1075
            if(closureType.equals("reship")) {
-
 
1076
                isReship = true;
-
 
1077
            }
1058
            transactionServiceClient.markOrderDoaRequestAuthorized(Long.parseLong(orderId), true);
1078
            transactionServiceClient.markOrderDoaRequestAuthorized(Long.parseLong(orderId), true, fromStore, isReship);
1059
            if (id != null && !id.isEmpty()) {
1079
            if (id != null && !id.isEmpty()) {
1060
                SearchFilter searchFilter = new SearchFilter();
1080
                SearchFilter searchFilter = new SearchFilter();
1061
                crmServiceClient = new CRMClient().getClient();
1081
                crmServiceClient = new CRMClient().getClient();
1062
                searchFilter.setTicketId(Long.parseLong(id));
1082
                searchFilter.setTicketId(Long.parseLong(id));
1063
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
1083
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
Line 1094... Line 1114...
1094
    
1114
    
1095
    public String denyDOA() {
1115
    public String denyDOA() {
1096
        try {
1116
        try {
1097
            log.info("Denying OrderId =" + orderId);
1117
            log.info("Denying OrderId =" + orderId);
1098
            transactionServiceClient = new TransactionClient().getClient();
1118
            transactionServiceClient = new TransactionClient().getClient();
1099
            transactionServiceClient.markOrderDoaRequestAuthorized(Long.parseLong(orderId), false);
1119
            transactionServiceClient.markOrderDoaRequestAuthorized(Long.parseLong(orderId), false, false, false);
1100
            if (id != null && !id.isEmpty()) {
1120
            if (id != null && !id.isEmpty()) {
1101
                SearchFilter searchFilter = new SearchFilter();
1121
                SearchFilter searchFilter = new SearchFilter();
1102
                crmServiceClient = new CRMClient().getClient();
1122
                crmServiceClient = new CRMClient().getClient();
1103
                searchFilter.setTicketId(Long.parseLong(id));
1123
                searchFilter.setTicketId(Long.parseLong(id));
1104
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
1124
                Ticket ticket = crmServiceClient.getTickets(searchFilter).get(0);
Line 1448... Line 1468...
1448
 
1468
 
1449
	public void setTicketCategorycountMap(
1469
	public void setTicketCategorycountMap(
1450
			Map<String, Long> ticketCategorycountMap) {
1470
			Map<String, Long> ticketCategorycountMap) {
1451
		this.ticketCategorycountMap = ticketCategorycountMap;
1471
		this.ticketCategorycountMap = ticketCategorycountMap;
1452
	}
1472
	}
-
 
1473
 
-
 
1474
    public String getPremises() {
-
 
1475
        return premises;
-
 
1476
    }
-
 
1477
 
-
 
1478
    public void setPremises(String premises) {
-
 
1479
        this.premises = premises;
-
 
1480
    }
-
 
1481
 
-
 
1482
    public String getClosureType() {
-
 
1483
        return closureType;
-
 
1484
    }
-
 
1485
 
-
 
1486
    public void setClosureType(String closureType) {
-
 
1487
        this.closureType = closureType;
-
 
1488
    }
1453
}
1489
}