Subversion Repositories SmartDukaan

Rev

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

Rev 4609 Rev 4815
Line 69... Line 69...
69
69
70 
    // GET /order/ orderid
 70 
    // GET /order/ orderid
71 
    public String show() {
 71 
    public String show() {
72 
    	log.info("id=" + id);
 72 
    	log.info("id=" + id);
73 
    	htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getMyaccountHeaderHtml());
 73 
    	htmlSnippets.put("MYACCOUNT_HEADER", pageLoader.getMyaccountHeaderHtml());
74 
    	htmlSnippets.put("ORDER_DETAILS", pageLoader.getOrderDetailsHtml(Long.parseLong(id), userinfo.getUserId()));
 74 
    	htmlSnippets.put("ORDER_DETAILS", pageLoader.getOrderDetailsHtml(Long.parseLong(id), userinfo));
75 
    	return "show";
 75 
    	return "show";
76 
    }
 76 
    }
77 
 
 77 
 
78 
    // POST /order/
 78 
    // POST /order/
79 
    public String create(){
 79 
    public String create(){
Line 103... Line 103...
103 
    	long currentCartId = userinfo.getCartId();
 103 
    	long currentCartId = userinfo.getCartId();
104
104
105 
    	if(paymentOption.equals(IPaymentService.COD)){
 105 
    	if(paymentOption.equals(IPaymentService.COD)){
106 
    	    if(!verifyCaptcha()){
 106 
    	    if(!verifyCaptcha()){
107 
    	        addActionError("Invalid captcha");
 107 
    	        addActionError("Invalid captcha");
- 
 
 108 
    	        log.info("Invalid captcha error msg has been added");
108 
    	        return "proceed-to-pay-redirect";
109 
    	        return "proceed-to-pay-redirect";
109 
    	    }
 110 
    	    }
110
111
111 
    	    //Check that this address is eligible for COD shipping.
 112 
    	    //Check that this address is eligible for COD shipping.
112 
    	    UserClient userServiceClient = null;
 113 
    	    UserClient userServiceClient = null;