Subversion Repositories SmartDukaan

Rev

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

Rev 595 Rev 620
Line 1... Line 1...
1
package in.shop2020.serving.controllers;
1
package in.shop2020.serving.controllers;
2
 
2
 
3
import in.shop2020.model.v1.user.Cart;
-
 
4
import in.shop2020.model.v1.user.ShoppingCartException;
-
 
5
import in.shop2020.model.v1.user.Address;
3
import in.shop2020.model.v1.user.Address;
6
import in.shop2020.model.v1.user.AddressType;
4
import in.shop2020.model.v1.user.AddressType;
7
import in.shop2020.model.v1.user.UserContextService.Client;
5
import in.shop2020.model.v1.user.UserContextService.Client;
8
import in.shop2020.serving.controllers.BaseController;
6
import in.shop2020.serving.controllers.BaseController;
9
import in.shop2020.serving.pages.PageContentKeys;
7
import in.shop2020.serving.pages.PageContentKeys;
10
import in.shop2020.serving.pages.PageEnum;
8
import in.shop2020.serving.pages.PageEnum;
11
import in.shop2020.serving.pages.PageManager;
9
import in.shop2020.serving.pages.PageManager;
12
import in.shop2020.serving.utils.Utils;
-
 
13
import in.shop2020.thrift.clients.UserContextServiceClient;
10
import in.shop2020.thrift.clients.UserContextServiceClient;
14
 
11
 
15
import java.util.*;
12
import java.util.*;
16
 
13
 
17
import org.apache.juli.logging.Log;
14
import org.apache.juli.logging.Log;
Line 19... Line 16...
19
import org.apache.struts2.convention.annotation.Result;
16
import org.apache.struts2.convention.annotation.Result;
20
import org.apache.struts2.convention.annotation.Results;
17
import org.apache.struts2.convention.annotation.Results;
21
import org.apache.struts2.interceptor.ParameterAware;
18
import org.apache.struts2.interceptor.ParameterAware;
22
import org.apache.struts2.rest.DefaultHttpHeaders;
19
import org.apache.struts2.rest.DefaultHttpHeaders;
23
import org.apache.struts2.rest.HttpHeaders;
20
import org.apache.struts2.rest.HttpHeaders;
24
import org.apache.thrift.TException;
-
 
25
 
21
 
26
@Results({
22
@Results({
27
    @Result(name="redirect", type="redirectAction", 
23
    @Result(name="redirect", type="redirectAction", 
28
    		params = {"actionName" , "address"})
24
    		params = {"actionName" , "address"})
29
})
25
})
Line 48... Line 44...
48
		
44
		
49
		params.put(PageContentKeys.CUSTOMER_ID, userId+"");
45
		params.put(PageContentKeys.CUSTOMER_ID, userId+"");
50
		params.put(PageContentKeys.IS_LOGGED_IN, isLoggedIn+"");
46
		params.put(PageContentKeys.IS_LOGGED_IN, isLoggedIn+"");
51
		params.put(PageContentKeys.CART_ID, userinfo.getCartId()+"");
47
		params.put(PageContentKeys.CART_ID, userinfo.getCartId()+"");
52
		params.put(PageContentKeys.ITEM_COUNT, userinfo.getTotalItems()+"");
48
		params.put(PageContentKeys.ITEM_COUNT, userinfo.getTotalItems()+"");
-
 
49
		params.put(PageContentKeys.USER_NAME, userinfo.getNameOfUser());
53
 
50
 
54
		htmlSnippets = pageManager.getPageContents(PageEnum.SHIPPING_ADDRESS_PAGE, params);
51
		htmlSnippets = pageManager.getPageContents(PageEnum.SHIPPING_ADDRESS_PAGE, params);
55
		
52
		
56
    	return new DefaultHttpHeaders("index").disableCaching();
53
    	return new DefaultHttpHeaders("index").disableCaching();
57
	 }
54
	 }
Line 162... Line 159...
162
	}
159
	}
163
	
160
	
164
	public String getMyResearchSnippet(){
161
	public String getMyResearchSnippet(){
165
		return htmlSnippets.get("MY_RESEARCH");
162
		return htmlSnippets.get("MY_RESEARCH");
166
	}
163
	}
-
 
164
	
-
 
165
	public String getBrowseHistorySnippet(){
-
 
166
		return htmlSnippets.get("BROWSE_HISTORY");
167
				
167
	}
-
 
168
	
168
	public String getFooterSnippet(){
169
	public String getFooterSnippet(){
169
		return htmlSnippets.get("FOOTER");
170
		return htmlSnippets.get("FOOTER");
170
	}
171
	}
171
	
172
	
172
	public String getJsFileSnippet(){
173
	public String getJsFileSnippet(){