Subversion Repositories SmartDukaan

Rev

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

Rev 2183 Rev 2263
Line 4... Line 4...
4 
import java.util.Collection;
 4 
import java.util.Collection;
5 
import java.util.HashMap;
 5 
import java.util.HashMap;
6 
import java.util.List;
 6 
import java.util.List;
7 
import java.util.Map;
 7 
import java.util.Map;
8 
 
 8 
 
- 
 
 9 
import in.shop2020.datalogger.EventType;
9 
import in.shop2020.model.v1.catalog.Item;
 10 
import in.shop2020.model.v1.catalog.Item;
10 
import in.shop2020.model.v1.user.Address;
 11 
import in.shop2020.model.v1.user.Address;
11 
import in.shop2020.model.v1.user.AddressType;
 12 
import in.shop2020.model.v1.user.AddressType;
12 
import in.shop2020.model.v1.user.Cart;
 13 
import in.shop2020.model.v1.user.Cart;
13 
import in.shop2020.model.v1.user.Line;
 14 
import in.shop2020.model.v1.user.Line;
Line 15... Line 16...
15 
import in.shop2020.model.v1.user.UserContextService;
 16 
import in.shop2020.model.v1.user.UserContextService;
16 
import in.shop2020.serving.controllers.BaseController;
 17 
import in.shop2020.serving.controllers.BaseController;
17 
import in.shop2020.serving.utils.DataLogger;
 18 
import in.shop2020.serving.utils.DataLogger;
18 
import in.shop2020.serving.utils.FormattingUtils;
 19 
import in.shop2020.serving.utils.FormattingUtils;
19 
import in.shop2020.serving.utils.Utils;
 20 
import in.shop2020.serving.utils.Utils;
20 
import in.shop2020.serving.utils.DataLogger.Event;
 - 
 
21 
import in.shop2020.thrift.clients.CatalogServiceClient;
 21 
import in.shop2020.thrift.clients.CatalogServiceClient;
22 
import in.shop2020.thrift.clients.UserContextServiceClient;
 22 
import in.shop2020.thrift.clients.UserContextServiceClient;
23 
 
 23 
 
24 
 
 24 
 
25 
import org.apache.log4j.Logger;
 25 
import org.apache.log4j.Logger;
Line 88... Line 88...
88 
		if(actionErrors != null && !actionErrors.isEmpty()){
 88 
		if(actionErrors != null && !actionErrors.isEmpty()){
89 
			for (String str : actionErrors) {
 89 
			for (String str : actionErrors) {
90 
			    errorMsg += "<BR/>" + str;
 90 
			    errorMsg += "<BR/>" + str;
91 
			}
 91 
			}
92 
		}
 92 
		}
93 
        DataLogger.logData(Event.SHIPPINIG_ACCESS.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(),
 93 
        DataLogger.logData(EventType.SHIPPINIG_ACCESS.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(),
94 
                Long.toString(cartId));
 94 
                Long.toString(cartId));
95
95
96 
    	return "index";
 96 
    	return "index";
97 
	 }
 97 
	 }
98 
 
 98 
 
Line 146... Line 146...
146 
						address.setEnabled(true);
 146 
						address.setEnabled(true);
147 
						address.setType(AddressType.HOME);
 147 
						address.setType(AddressType.HOME);
148 
						long addressId = userClient.addAddressForUser(userinfo.getUserId(), address, false);
 148 
						long addressId = userClient.addAddressForUser(userinfo.getUserId(), address, false);
149 
						userClient.addAddressToCart(userinfo.getCartId(), addressId);
 149 
						userClient.addAddressToCart(userinfo.getCartId(), addressId);
150 
						addActionMessage("Address added successfully.");
 150 
						addActionMessage("Address added successfully.");
151 
                        DataLogger.logData(Event.SHIPPINIG_ADD_ADDRESS.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(), address.getName(),
 151 
                        DataLogger.logData(EventType.SHIPPINIG_ADD_ADDRESS.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(), address.getName(),
152 
                                        address.getCity(), address.getPhone(), address.getPin());
 152 
                                        address.getCity(), address.getPhone(), address.getPin());
153 
					}
 153 
					}
154 
					return "redirect";
154 
					return "redirect";
155 
				}
 155 
				}
156
156
157 
				if(action.equals("change"))	{
 157 
				if(action.equals("change"))	{
158 
					addressId = Long.parseLong(this.request.getParameter("addressid"));
 158 
					addressId = Long.parseLong(this.request.getParameter("addressid"));
159 
					userClient.addAddressToCart(userinfo.getCartId(), addressId);
 159 
					userClient.addAddressToCart(userinfo.getCartId(), addressId);
160
160
161 
					errorMsg = userClient.validateCart(userinfo.getCartId());
 161 
					errorMsg = userClient.validateCart(userinfo.getCartId());
162 
                    DataLogger.logData(Event.SHIPPINIG_ADD_CHANGE.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(),
 162 
                    DataLogger.logData(EventType.SHIPPINIG_ADD_CHANGE.name(), session.getId(), Long.toString(userinfo.getUserId()), userinfo.getEmail(),
163 
                            Long.toString(userinfo.getCartId()), Long.toString(addressId));
 163 
                            Long.toString(userinfo.getCartId()), Long.toString(addressId));
164 
					return "index";
 164 
					return "index";
165 
				}
 165 
				}
166 
			}
 166 
			}
167 
		} catch (Exception e) {
 167 
		} catch (Exception e) {