Subversion Repositories SmartDukaan

Rev

Rev 786 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 786 Rev 822
Line 9... Line 9...
9 
 
 9 
 
10 
import java.util.*;
 10 
import java.util.*;
11 
 
 11 
 
12 
import org.apache.juli.logging.Log;
 12 
import org.apache.juli.logging.Log;
13 
import org.apache.juli.logging.LogFactory;
 13 
import org.apache.juli.logging.LogFactory;
- 
 
 14 
import org.apache.struts2.convention.annotation.InterceptorRef;
- 
 
 15 
import org.apache.struts2.convention.annotation.InterceptorRefs;
14 
import org.apache.struts2.convention.annotation.Result;
 16 
import org.apache.struts2.convention.annotation.Result;
15 
import org.apache.struts2.convention.annotation.Results;
 17 
import org.apache.struts2.convention.annotation.Results;
16 
import org.apache.thrift.TException;
 18 
import org.apache.thrift.TException;
17 
 
 19 
 
- 
 
 20 
@InterceptorRefs({
- 
 
 21 
    @InterceptorRef("myDefault"),
- 
 
 22 
    @InterceptorRef("login")
- 
 
 23 
})
- 
 
 24 
 
18 
@Results({
 25 
@Results({
19 
    @Result(name="redirect", type="redirectAction",
26 
    @Result(name="payredirect", type="redirectAction",
20 
    		params = {"actionName" , "login"}),
 - 
 
21 
	@Result(name="payredirect", type="redirectAction",
- 
 
22 
			params = {"actionName" , "${url}", "paymentid", "${pid}", "txnid", "${txn}", "amount", "${amount}"}),
 27 
			params = {"actionName" , "${url}", "paymentid", "${pid}", "txnid", "${txn}", "amount", "${amount}"}),
23 
    @Result(name="shipping-redirect", type="redirectAction",
28 
    @Result(name="shipping-redirect", type="redirectAction",
24 
    		params = {"actionName" , "shipping"}),
 29 
    		params = {"actionName" , "shipping"}),
25 
    @Result(name="failure", type="redirectAction",
30 
    @Result(name="failure", type="redirectAction",
26 
    		params = {"actionName" , "shipping"})
31 
    		params = {"actionName" , "shipping"})
Line 47... Line 52...
47 
	}
 52 
	}
48
53
49 
    // GET /order/ orderid
 54 
    // GET /order/ orderid
50 
    public String show() {
 55 
    public String show() {
51 
    	log.info("id=" + id);
 56 
    	log.info("id=" + id);
52 
    	if(!userinfo.isLoggedIn()){
 - 
 
53 
    		setRedirectUrl();
 - 
 
54 
    		addActionError("Please login to see order details.");
 - 
 
55 
    		return "redirect";
 - 
 
56 
    	}
 - 
 
57 
    		htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getMyaccountHeaderHtml());
 57 
    	htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getMyaccountHeaderHtml());
58 
    		htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getOrderDetailsHtml(Long.parseLong(id)));
 58 
    	htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getOrderDetailsHtml(Long.parseLong(id)));
59 
    	return "show";
 59 
    	return "show";
60 
    }
 60 
    }
61 
 
 61 
 
62 
    // POST /order/
 62 
    // POST /order/
63 
    public String create(){
 63 
    public String create(){
64 
    	if(!userinfo.isLoggedIn()){
 - 
 
65 
    		setRedirectUrl();
 - 
 
66 
    		addActionError("Please login to continue checkout.");
 - 
 
67 
    		return "redirect";
 - 
 
68 
    	}
 - 
 
69 
    	String addressIdString = this.request.getParameter("addressid");
 64 
    	String addressIdString = this.request.getParameter("addressid");
70 
    	if(addressIdString == null){
 65 
    	if(addressIdString == null){
71 
    		addActionError("Please login to continue checkout.");
 66 
    		addActionError("Please login to continue checkout.");
72 
    		return "shipping-redirect";
 67 
    		return "shipping-redirect";
73 
    	}
 68 
    	}