Subversion Repositories SmartDukaan

Rev

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

Rev 17870 Rev 17901
Line 480... Line 480...
480 
									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
 480 
									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
481 
								}
 481 
								}
482 
								continue;
 482 
								continue;
483 
							 } else {
 483 
							 } else {
484 
								JSONArray messagesArray = new JSONArray();
 484 
								JSONArray messagesArray = new JSONArray();
485 
								JSONObject message=new JSONObject();
 - 
 
486 
								message.put("type","info");
 - 
 
487 
								message.put("messageText","Added from earlier cart");
 - 
 
488 
								messagesArray.put(message);
 - 
 
489 
								itemObj.put("cartItemMessages", messagesArray);
 485 
								itemObj.put("cartItemMessages", messagesArray);
- 
 
 486 
								if(itemsList.size()==0){
- 
 
 487 
									JSONObject message=new JSONObject();
- 
 
 488 
									message.put("type","info");
- 
 
 489 
									message.put("messageText","Added from earlier cart");
- 
 
 490 
									messagesArray.put(message);
490 
								cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
 491 
									cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
- 
 
 492 
								}
491 
							 }
 493 
							 }
492 
						}
 494 
						}
493 
						ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
 495 
						ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
494 
						if(allSame){
 496 
						if(allSame){
495 
							allSame = maxEstimate==-1 || maxEstimate==itemObj.getInt("estimate");
 497 
							allSame = maxEstimate==-1 || maxEstimate==itemObj.getInt("estimate");