Subversion Repositories SmartDukaan

Rev

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

Rev 4453 Rev 5880
Line 15... Line 15...
15 
import in.shop2020.thrift.clients.PaymentClient;
 15 
import in.shop2020.thrift.clients.PaymentClient;
16 
import in.shop2020.thrift.clients.TransactionClient;
 16 
import in.shop2020.thrift.clients.TransactionClient;
17 
import in.shop2020.thrift.clients.UserClient;
 17 
import in.shop2020.thrift.clients.UserClient;
18 
import in.shop2020.utils.DataLogger;
 18 
import in.shop2020.utils.DataLogger;
19 
 
 19 
 
- 
 
 20 
import java.text.SimpleDateFormat;
20 
import java.util.Date;
 21 
import java.util.Date;
21 
import java.util.List;
 22 
import java.util.List;
22 
 
 23 
 
23 
import org.apache.log4j.Logger;
 24 
import org.apache.log4j.Logger;
24 
import org.apache.struts2.convention.annotation.InterceptorRef;
 25 
import org.apache.struts2.convention.annotation.InterceptorRef;
Line 135... Line 136...
135
136
136 
	public long getMerchantPaymentId() {
 137 
	public long getMerchantPaymentId() {
137 
	    return merchantPaymentId;
 138 
	    return merchantPaymentId;
138 
	}
 139 
	}
139
140
- 
 
 141 
	public static String formatDate(long timestamp){
- 
 
 142 
		SimpleDateFormat dateformat = new SimpleDateFormat("dd MMMM yyyy");
- 
 
 143 
		return dateformat.format(new Date(timestamp));
- 
 
 144 
	}
- 
 
 145
- 
 
 146
140 
	@Override
 147 
	@Override
141 
	public String getHeaderSnippet() {
 148 
	public String getHeaderSnippet() {
142 
		String url = request.getQueryString();
 149 
		String url = request.getQueryString();
143 
		if (url == null) {
 150 
		if (url == null) {
144 
			url = "";
 151 
			url = "";
145 
		} else {
 152 
		} else {
146 
			url = "?" + url;
 153 
			url = "?" + url;
147 
		}
 154 
		}
148 
		url = request.getRequestURI() + url;
 155 
		url = request.getRequestURI() + url;
149 
		return pageLoader.getHeaderHtml(userinfo.isLoggedIn(), userinfo.getEmail(), url , 0, false);
 156 
		return pageLoader.getHeaderHtml(userinfo.isLoggedIn(), userinfo.getEmail(), url , 0, false);
150 
	}
157 
	}
151 
}
 158 
}
152 

            159