Subversion Repositories SmartDukaan

Rev

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

Rev 1623 Rev 1625
Line 126... Line 126...
126 
		user = userClient.createUser(user);
 126 
		user = userClient.createUser(user);
127 
		long userId = user.getUserId();
 127 
		long userId = user.getUserId();
128 
		userClient.setUserAsLoggedIn(userId, (new Date()).getTime());
 128 
		userClient.setUserAsLoggedIn(userId, (new Date()).getTime());
129 
		String pincode = userClient.getDefaultPincode(user.getUserId());
 129 
		String pincode = userClient.getDefaultPincode(user.getUserId());
130
130
131 
		userinfo.setUserId(userId);
 - 
 
132 
		userinfo.setNameOfUser(userName);
 - 
 
133 
		userinfo.setEmail(email);
 - 
 
134 
		userinfo.setLoggedIn(true);
 - 
 
135 
		userinfo.setPincode(pincode);
 - 
 
136 
		// TODO: setTotalItems shouldn't be a method on userinfo. This allows
 131 
		// TODO: setTotalItems shouldn't be a method on userinfo. This allows
137 
		// for potentially updating the item count wrongly. The method setCartId
 132 
		// for potentially updating the item count wrongly. The method setCartId
138 
		// should update the item count as well. Also, there can be a method
 133 
		// should update the item count as well. Also, there can be a method
139 
		// called refreshItemCount() that automatically updates the number of
 134 
		// called refreshItemCount() that automatically updates the number of
140 
		// items currently in the cart.
 135 
		// items currently in the cart.
141 
		if(userinfo.getCartId() != -1){
 136 
		if(userinfo.getUserId() != -1){
142 
			userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
 137 
			userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
143
138
144 
			Widget browseHistory = userClient.getBrowseHistory(userinfo.getCartId());
 139 
			Widget browseHistory = userClient.getBrowseHistory(userinfo.getUserId());
145 
			if(browseHistory != null){
 140 
			if(browseHistory != null){
146 
				List<WidgetItem> items =  browseHistory.getItems();
 141 
				List<WidgetItem> items =  browseHistory.getItems();
147 
				if(items != null){
 142 
				if(items != null){
148 
					for(WidgetItem item: items){
 143 
					for(WidgetItem item: items){
149 
						userClient.updateBrowseHistory(user.getUserId(), item.getItem_id());
 144 
						userClient.updateBrowseHistory(user.getUserId(), item.getItem_id());
150 
					}
 145 
					}
151 
				}
 146 
				}
152 
			}
 147 
			}
- 
 
 148
- 
 
 149 
			Widget myResearch = userClient.getMyResearch(userinfo.getUserId());
- 
 
 150 
			if(myResearch != null){
- 
 
 151 
				List<WidgetItem> items =  browseHistory.getItems();
- 
 
 152 
				if(items != null){
- 
 
 153 
					for(WidgetItem item: items){
- 
 
 154 
						userClient.updateMyResearch(user.getUserId(), item.getItem_id());
- 
 
 155 
					}
- 
 
 156 
				}
- 
 
 157 
			}
153 
		}
 158 
		}
154
159
- 
 
 160 
		userinfo.setUserId(userId);
- 
 
 161 
		userinfo.setNameOfUser(userName);
- 
 
 162 
		userinfo.setEmail(email);
- 
 
 163 
		userinfo.setLoggedIn(true);
- 
 
 164 
		userinfo.setPincode(pincode);
155 
		userinfo.setCartId(user.getActiveCartId());
 165 
		userinfo.setCartId(user.getActiveCartId());
156 
		int totalItems = userClient.getCart(userinfo.getCartId()).getLinesSize();
 166 
		int totalItems = userClient.getCart(userinfo.getCartId()).getLinesSize();
157 
		userinfo.setTotalItems(totalItems);
 167 
		userinfo.setTotalItems(totalItems);
158 
 
 168 
 
159 
		return true;
 169 
		return true;