Subversion Repositories SmartDukaan

Rev

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

Rev 17814 Rev 17815
Line 462... Line 462...
462 
    						JSONArray arr = cartObj.getJSONArray("cartItems");
 462 
    						JSONArray arr = cartObj.getJSONArray("cartItems");
463 
    						int maxEstimate=0;
 463 
    						int maxEstimate=0;
464 
    						boolean allSame=true;
 464 
    						boolean allSame=true;
465 
    						int cartMessagesMerged = 0;
 465 
    						int cartMessagesMerged = 0;
466 
    						int removedCount = 0;
 466 
    						int removedCount = 0;
- 
 
 467 
    						cartObj.put("cartMessagesMerged", 0);
467 
    						for (int j=0; j<arr.length(); j++){
 468 
    						for (int j=0; j<arr.length(); j++){
468 
    							JSONObject itemObj = arr.getJSONObject(j-removedCount);
 469 
    							JSONObject itemObj = arr.getJSONObject(j-removedCount);
469 
    							if(!itemsList.contains(itemObj.getInt("itemId"))){
 470 
    							if(!itemsList.contains(itemObj.getInt("itemId"))){
470 
    								 if(itemObj.getInt("quantity")==0){
 471 
    								 if(itemObj.getInt("quantity")==0){
471 
	    								arr.remove(j-removedCount);
 472 
	    								arr.remove(j-removedCount);
Line 481... Line 482...
481 
	    								JSONObject message=new JSONObject();
 482 
	    								JSONObject message=new JSONObject();
482 
	    								message.put("type","info");
 483 
	    								message.put("type","info");
483 
	    								message.put("messageText","Merged from earlier cart");
 484 
	    								message.put("messageText","Merged from earlier cart");
484 
	    								messagesArray.put(message);
 485 
	    								messagesArray.put(message);
485 
	    								itemObj.put("cartItemMessages", messagesArray);
 486 
	    								itemObj.put("cartItemMessages", messagesArray);
486 
	    								cartObj.put("cartMessagesMerged", cartMessagesMerged + 1);
 487 
	    								cartObj.put("cartMessagesMerged", cartObj.getInt("cartMessagesMerged") + 1);
487 
    								 }
 488 
    								 }
488 
    							}
 489 
    							}
489 
    							ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
 490 
    							ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
490 
    							if(allSame){
 491 
    							if(allSame){
491 
    								allSame = maxEstimate==0 || maxEstimate==itemObj.getInt("estimate");
 492 
    								allSame = maxEstimate==0 || maxEstimate==itemObj.getInt("estimate");