Subversion Repositories SmartDukaan

Rev

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

Rev 7645 Rev 9166
Line 98... Line 98...
98 
    private long                walletAmount;
 98 
    private long                walletAmount;
99 
    //End:- Added by Manish Sharma for Displaying wallet amount at user page on June-05-2013
 99 
    //End:- Added by Manish Sharma for Displaying wallet amount at user page on June-05-2013
100
100
101 
    private List<Order> orders = new ArrayList<Order>();
 101 
    private List<Order> orders = new ArrayList<Order>();
102
102
- 
 
 103 
    private List<RechargeOrder> rechargeOrders = new ArrayList<RechargeOrder>();
103 
    private String amazonId;
 104 
    private String amazonId;
104
105
105 
 
 106 
 
106 
    @Action("/")
 107 
    @Action("/")
107 
    public String index() throws Exception {
 108 
    public String index() throws Exception {
Line 124... Line 125...
124 
                transactionServiceClient = new TransactionClient().getClient();
 125 
                transactionServiceClient = new TransactionClient().getClient();
125 
                setOrders(transactionServiceClient.getOrdersByAmazonOrderCode(amazonId));
 126 
                setOrders(transactionServiceClient.getOrdersByAmazonOrderCode(amazonId));
126 
                return "orders-index";
 127 
                return "orders-index";
127 
            }
 128 
            }
128
129
- 
 
 130 
            if (deviceNumber != null && !deviceNumber.isEmpty()) {
- 
 
 131 
                transactionServiceClient = new TransactionClient().getClient();
- 
 
 132 
                rechargeOrders = transactionServiceClient.getRechargeOrdersForDevice(deviceNumber);
- 
 
 133 
                setRechargeOrders(rechargeOrders);
- 
 
 134 
                return "recharge-orders-result-index";
- 
 
 135 
                //user = userContextServiceClient.getUserById(rechargeOrders.get(0).getUserId());
- 
 
 136 
            }
- 
 
 137
129 
            userContextServiceClient = new UserClient().getClient();
 138 
            userContextServiceClient = new UserClient().getClient();
130 
            if (email != null && !email.isEmpty()) {
 139 
            if (email != null && !email.isEmpty()) {
131 
                user = userContextServiceClient.getUserByEmail(email);
 140 
                user = userContextServiceClient.getUserByEmail(email);
132 
            } else if (orderId != null && !orderId.isEmpty()) {
 141 
            } else if (orderId != null && !orderId.isEmpty()) {
133 
                transactionServiceClient = new TransactionClient().getClient();
 142 
                transactionServiceClient = new TransactionClient().getClient();
Line 138... Line 147...
138 
            } else if (rechargeOrderId != null && !rechargeOrderId.isEmpty()){
 147 
            } else if (rechargeOrderId != null && !rechargeOrderId.isEmpty()){
139 
                transactionServiceClient = new TransactionClient().getClient();
 148 
                transactionServiceClient = new TransactionClient().getClient();
140 
                RechargeOrder rechargeOrder = transactionServiceClient.getRechargeOrder(Long
 149 
                RechargeOrder rechargeOrder = transactionServiceClient.getRechargeOrder(Long
141 
                        .parseLong(rechargeOrderId));
 150 
                        .parseLong(rechargeOrderId));
142 
                user = userContextServiceClient.getUserById(rechargeOrder.getUserId());
 151 
                user = userContextServiceClient.getUserById(rechargeOrder.getUserId());
143 
            } else if (deviceNumber != null && !deviceNumber.isEmpty()) {
 - 
 
144 
                transactionServiceClient = new TransactionClient().getClient();
 - 
 
145 
                List<RechargeOrder> rechargeOrders = transactionServiceClient.getRechargeOrdersForDevice(deviceNumber);
 - 
 
146 
                user = userContextServiceClient.getUserById(rechargeOrders.get(0).getUserId());
 - 
 
147 
            } else if (ticketId != null && !ticketId.isEmpty()) {
 152 
            } else if (ticketId != null && !ticketId.isEmpty()) {
148 
                SearchFilter searchFilter = new SearchFilter();
 153 
                SearchFilter searchFilter = new SearchFilter();
149 
                searchFilter.setTicketId(Long.parseLong(ticketId));
 154 
                searchFilter.setTicketId(Long.parseLong(ticketId));
150 
                crmServiceClient = new CRMClient().getClient();
 155 
                crmServiceClient = new CRMClient().getClient();
151 
                List<Ticket> tickets = crmServiceClient
 156 
                List<Ticket> tickets = crmServiceClient
Line 723... Line 728...
723 
 
 728 
 
724 
    public String getAmazonId() {
 729 
    public String getAmazonId() {
725 
        return amazonId;
 730 
        return amazonId;
726 
    }
 731 
    }
727 
 
 732 
 
- 
 
 733 
	public List<RechargeOrder> getRechargeOrders() {
- 
 
 734 
		return rechargeOrders;
- 
 
 735 
	}
- 
 
 736 
 
- 
 
 737 
	public void setRechargeOrders(List<RechargeOrder> rechargeOrders) {
- 
 
 738 
		this.rechargeOrders = rechargeOrders;
- 
 
 739 
	}
- 
 
 740 
 
728 
}
 741 
}
729 

            742