| Line 68... |
Line 68... |
| 68 |
public String index() {
|
68 |
public String index() {
|
| 69 |
long cartId = userinfo.getCartId();
|
69 |
long cartId = userinfo.getCartId();
|
| 70 |
if(cartId != -1){
|
70 |
if(cartId != -1){
|
| 71 |
try {
|
71 |
try {
|
| 72 |
UserContextService.Client userClient = (new UserClient()).getClient();
|
72 |
UserContextService.Client userClient = (new UserClient()).getClient();
|
| 73 |
errorMsg = userClient.validateCart(cartId);
|
73 |
errorMsg = userClient.validateCart(cartId, sourceId);
|
| 74 |
log.info("Error Message rcvd from the service is:" + errorMsg);
|
74 |
log.info("Error Message rcvd from the service is:" + errorMsg);
|
| 75 |
|
75 |
|
| 76 |
// As per ticket #119 in trac
|
76 |
// As per ticket #119 in trac
|
| 77 |
int totalItems = userClient.getCart(cartId).getLinesSize();
|
77 |
int totalItems = userClient.getCart(cartId).getLinesSize();
|
| 78 |
userinfo.setTotalItems(totalItems);
|
78 |
userinfo.setTotalItems(totalItems);
|
| Line 116... |
Line 116... |
| 116 |
UserClient userServiceClient = new UserClient();
|
116 |
UserClient userServiceClient = new UserClient();
|
| 117 |
UserContextService.Client userClient = userServiceClient.getClient();
|
117 |
UserContextService.Client userClient = userServiceClient.getClient();
|
| 118 |
if (cartId == 0){
|
118 |
if (cartId == 0){
|
| 119 |
cartId = userClient.createCart(userId);
|
119 |
cartId = userClient.createCart(userId);
|
| 120 |
}
|
120 |
}
|
| - |
|
121 |
// If we add multiple items to cart and get some message from service,
|
| - |
|
122 |
// first message to be preserved and presented to the user.
|
| 121 |
if(cartMsg.equals("")){
|
123 |
if(cartMsg.equals("")){
|
| 122 |
cartMsg = userClient.addItemToCart(cartId, itemId, 1);
|
124 |
cartMsg = userClient.addItemToCart(cartId, itemId, 1, sourceId);
|
| 123 |
}else{
|
125 |
}else{
|
| 124 |
userClient.addItemToCart(cartId, itemId, 1);
|
126 |
userClient.addItemToCart(cartId, itemId, 1, sourceId);
|
| 125 |
}
|
127 |
}
|
| 126 |
userinfo.setCartId(cartId);
|
128 |
userinfo.setCartId(cartId);
|
| 127 |
int totalItems = userClient.getCart(cartId).getLinesSize();
|
129 |
int totalItems = userClient.getCart(cartId).getLinesSize();
|
| 128 |
userinfo.setTotalItems(totalItems);
|
130 |
userinfo.setTotalItems(totalItems);
|
| 129 |
} catch (TException e) {
|
131 |
} catch (TException e) {
|
| Line 274... |
Line 276... |
| 274 |
if(lineItems.size() != 0) {
|
276 |
if(lineItems.size() != 0) {
|
| 275 |
items = new ArrayList<Map<String,String>>();
|
277 |
items = new ArrayList<Map<String,String>>();
|
| 276 |
|
278 |
|
| 277 |
for (Line line : lineItems) {
|
279 |
for (Line line : lineItems) {
|
| 278 |
Map<String, String> itemdetail = new HashMap<String, String>();
|
280 |
Map<String, String> itemdetail = new HashMap<String, String>();
|
| - |
|
281 |
|
| 279 |
Item item = catalogClient.getItem(line.getItemId());
|
282 |
Item item = catalogClient.getItemForSource(line.getItemId(), sourceId);
|
| 280 |
|
- |
|
| - |
|
283 |
|
| 281 |
String itemName = ((item.getBrand() != null) ? item.getBrand() + " " : "")
|
284 |
String itemName = ((item.getBrand() != null) ? item.getBrand() + " " : "")
|
| 282 |
+ ((item.getModelName() != null) ? item.getModelName() + " " : "")
|
285 |
+ ((item.getModelName() != null) ? item.getModelName() + " " : "")
|
| 283 |
+ (( item.getModelNumber() != null ) ? item.getModelNumber() + " " : "" )
|
286 |
+ (( item.getModelNumber() != null ) ? item.getModelNumber() + " " : "" )
|
| 284 |
+ (( (item.getColor() != null && !item.getColor().trim().equals("NA"))) ? "("+item.getColor()+")" : "" );
|
287 |
+ (( (item.getColor() != null && !item.getColor().trim().equals("NA"))) ? "("+item.getColor()+")" : "" );
|
| 285 |
|
288 |
|