| Line 458... |
Line 458... |
| 458 |
log.info("Items added to cart Successfully");
|
458 |
log.info("Items added to cart Successfully");
|
| 459 |
//Now validate cart and provide appropriate response.
|
459 |
//Now validate cart and provide appropriate response.
|
| 460 |
String cartString = userClient.validateCartNew(id, userinfo.getPincode(), -1);
|
460 |
String cartString = userClient.validateCartNew(id, userinfo.getPincode(), -1);
|
| 461 |
JSONObject cartObj = new JSONObject(cartString);
|
461 |
JSONObject cartObj = new JSONObject(cartString);
|
| 462 |
JSONArray arr = cartObj.getJSONArray("cartItems");
|
462 |
JSONArray arr = cartObj.getJSONArray("cartItems");
|
| 463 |
int maxEstimate=0;
|
463 |
int maxEstimate=-1;
|
| 464 |
boolean allSame=true;
|
464 |
boolean allSame=true;
|
| 465 |
int cartMessagesMerged = 0;
|
- |
|
| 466 |
int removedCount = 0;
|
465 |
int removedCount = 0;
|
| 467 |
cartObj.put("cartMessagesMerged", 0);
|
466 |
cartObj.put("cartMessagesMerged", 0);
|
| 468 |
for (int j=0; j<arr.length(); j++){
|
467 |
for (int j=0; j<arr.length(); j++){
|
| 469 |
JSONObject itemObj = arr.getJSONObject(j-removedCount);
|
468 |
JSONObject itemObj = arr.getJSONObject(j-removedCount);
|
| 470 |
if(!itemsList.contains(itemObj.getInt("itemId"))){
|
469 |
if(!itemsList.contains(itemObj.getInt("itemId"))){
|
| Line 487... |
Line 486... |
| 487 |
cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
|
486 |
cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
|
| 488 |
}
|
487 |
}
|
| 489 |
}
|
488 |
}
|
| 490 |
ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
|
489 |
ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
|
| 491 |
if(allSame){
|
490 |
if(allSame){
|
| 492 |
allSame = maxEstimate==0 || maxEstimate==itemObj.getInt("estimate");
|
491 |
allSame = maxEstimate==-1 || maxEstimate==itemObj.getInt("estimate");
|
| 493 |
}
|
492 |
}
|
| 494 |
if(itemObj.getInt("estimate")>maxEstimate){
|
493 |
if(itemObj.getInt("estimate")>maxEstimate){
|
| 495 |
maxEstimate = itemObj.getInt("estimate");
|
494 |
maxEstimate = itemObj.getInt("estimate");
|
| 496 |
}
|
495 |
}
|
| 497 |
itemObj.put("imageUrl", pp.getImageUrl());
|
496 |
itemObj.put("imageUrl", pp.getImageUrl());
|
| Line 504... |
Line 503... |
| 504 |
String type="danger";
|
503 |
String type="danger";
|
| 505 |
JSONObject cartMessage=new JSONObject();
|
504 |
JSONObject cartMessage=new JSONObject();
|
| 506 |
if (message.equals("cartMessagesMerged")) {
|
505 |
if (message.equals("cartMessagesMerged")) {
|
| 507 |
type = "info";
|
506 |
type = "info";
|
| 508 |
if (count==1){
|
507 |
if (count==1){
|
| 509 |
cartMessage.put("messageText","1 item is merged from earlier cart");
|
508 |
cartMessage.put("messageText","1 item is added from earlier cart");
|
| 510 |
}else {
|
509 |
}else {
|
| 511 |
cartMessage.put("messageText","Few items are merged from earlier cart");
|
510 |
cartMessage.put("messageText","Few items are added from earlier cart");
|
| 512 |
}
|
511 |
}
|
| 513 |
} else if (message.equals("cartMessageOOS")) {
|
512 |
} else if (message.equals("cartMessageOOS")) {
|
| 514 |
if (count==1){
|
513 |
if (count==1){
|
| 515 |
cartMessage.put("messageText","One item is currently Out of Stock");
|
514 |
cartMessage.put("messageText","One item is currently Out of Stock");
|
| 516 |
}else {
|
515 |
}else {
|