Subversion Repositories SmartDukaan

Rev

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

Rev 6152 Rev 6475
Line 1... Line 1...
1
package in.shop2020.serving.controllers;
1
package in.shop2020.serving.controllers;
2
 
2
 
3
import in.shop2020.datalogger.EventType;
3
import in.shop2020.datalogger.EventType;
4
import in.shop2020.model.v1.order.Order;
4
import in.shop2020.model.v1.order.Order;
-
 
5
import in.shop2020.model.v1.order.OrderStatus;
5
import in.shop2020.model.v1.order.TransactionServiceException;
6
import in.shop2020.model.v1.order.TransactionServiceException;
6
import in.shop2020.model.v1.user.Affiliate;
7
import in.shop2020.model.v1.user.Affiliate;
7
import in.shop2020.model.v1.user.Cart;
8
import in.shop2020.model.v1.user.Cart;
8
import in.shop2020.model.v1.user.ShoppingCartException;
9
import in.shop2020.model.v1.user.ShoppingCartException;
9
import in.shop2020.model.v1.user.TrackLogType;
10
import in.shop2020.model.v1.user.TrackLogType;
Line 16... Line 17...
16
import in.shop2020.thrift.clients.TransactionClient;
17
import in.shop2020.thrift.clients.TransactionClient;
17
import in.shop2020.thrift.clients.UserClient;
18
import in.shop2020.thrift.clients.UserClient;
18
import in.shop2020.utils.DataLogger;
19
import in.shop2020.utils.DataLogger;
19
 
20
 
20
import java.text.SimpleDateFormat;
21
import java.text.SimpleDateFormat;
-
 
22
import java.util.Calendar;
21
import java.util.Date;
23
import java.util.Date;
22
import java.util.List;
24
import java.util.List;
23
 
25
 
24
import org.apache.log4j.Logger;
26
import org.apache.log4j.Logger;
25
import org.apache.struts2.convention.annotation.InterceptorRef;
27
import org.apache.struts2.convention.annotation.InterceptorRef;
Line 124... Line 126...
124
	
126
	
125
	public List<Order> getOrders(){
127
	public List<Order> getOrders(){
126
		return this.orders;
128
		return this.orders;
127
	}
129
	}
128
	
130
	
-
 
131
	public List<Order> getSuccessfulOrders(){
-
 
132
		if((this.orders.get(0).getStatus() == OrderStatus.COD_VERIFICATION_PENDING 
-
 
133
				|| this.orders.get(0).getStatus() == OrderStatus.SUBMITTED_FOR_PROCESSING) && this.orders.get(0).getCreated_timestamp() + 10*60*1000 > Calendar.getInstance().getTimeInMillis()){
-
 
134
			return this.orders;	
-
 
135
		}
-
 
136
		return null;
-
 
137
	}
-
 
138
		
129
	public String getMessage(){
139
	public String getMessage(){
130
		return this.message;
140
		return this.message;
131
	}
141
	}
132
	
142
	
133
	public boolean getIsShooglooAff() {
143
	public boolean getIsShooglooAff() {