Subversion Repositories SmartDukaan

Rev

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

Rev 3499 Rev 3546
Line 1... Line 1...
1 
package in.shop2020.serving.controllers;
 1 
package in.shop2020.serving.controllers;
2 
 
 2 
 
3 
import in.shop2020.model.v1.order.Order;
 3 
import in.shop2020.model.v1.order.Order;
4 
import in.shop2020.model.v1.order.OrderStatus;
 4 
import in.shop2020.model.v1.order.OrderStatus;
5 
import in.shop2020.model.v1.order.TransactionServiceException;
 - 
 
6 
import in.shop2020.thrift.clients.TransactionClient;
 5 
import in.shop2020.thrift.clients.TransactionClient;
7 
import in.shop2020.util.CRMConstants;
 6 
import in.shop2020.util.CRMConstants;
8 
 
 7 
 
9 
import java.text.SimpleDateFormat;
 8 
import java.text.SimpleDateFormat;
10 
import java.util.ArrayList;
 9 
import java.util.ArrayList;
Line 13... Line 12...
13 
import java.util.List;
 12 
import java.util.List;
14 
import java.util.Map;
 13 
import java.util.Map;
15 
import java.util.TimeZone;
 14 
import java.util.TimeZone;
16 
 
 15 
 
17 
import org.apache.log4j.Logger;
 16 
import org.apache.log4j.Logger;
18 
import org.apache.thrift.TException;
 - 
 
19 
 
 17 
 
20 
/**
 18 
/**
21 
 * @author vikas
 19 
 * @author vikas
22 
 *
 20 
 *
23 
 */
 21 
 */
Line 78... Line 76...
78 
            userOrders.add(orderMap);
 76 
            userOrders.add(orderMap);
79 
        }
 77 
        }
80 
        return "index";
 78 
        return "index";
81 
    }
 79 
    }
82 
 
 80 
 
83 
    public String update() throws NumberFormatException, TransactionServiceException, TException {
 - 
 
84 
        transactionServiceClient = new TransactionClient().getClient();
 - 
 
85 
        transactionServiceClient.changeOrderStatus(Long.parseLong(id), OrderStatus.valueOf(status), "IN PROCESS - COD verified");
 - 
 
86 
        return INDEX;
 - 
 
87 
    }
 - 
 
88 
 
 - 
 
89 
    public void setUserId(String userId) {
 81 
    public void setUserId(String userId) {
90 
        try {
 82 
        try {
91 
            this.userId = Long.parseLong(userId);
 83 
            this.userId = Long.parseLong(userId);
92 
        }
 84 
        }
93 
        catch (NumberFormatException e) {
 85 
        catch (NumberFormatException e) {