Subversion Repositories SmartDukaan

Rev

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

Rev 17802 Rev 17814
Line 464... Line 464...
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
    						for (int j=0; j<arr.length(); j++){
467
    						for (int j=0; j<arr.length(); j++){
468
    							JSONObject itemObj = arr.getJSONObject(j-removedCount);
468
    							JSONObject itemObj = arr.getJSONObject(j-removedCount);
469
    							if(itemsList.contains(itemObj.getInt("itemId")) && itemObj.getInt("quantity")==0){
469
    							if(!itemsList.contains(itemObj.getInt("itemId"))){
-
 
470
    								 if(itemObj.getInt("quantity")==0){
470
    								arr.remove(j-removedCount);
471
	    								arr.remove(j-removedCount);
471
    								removedCount++;
472
	    								removedCount++;
472
    								if (itemObj.getInt("estimate")==-1){
473
	    								if (itemObj.getInt("estimate")==-1){
473
    									cartObj.put("cartMessageUndeliverable", cartObj.getInt("cartMessageUndeliverable") - 1);
474
	    									cartObj.put("cartMessageUndeliverable", cartObj.getInt("cartMessageUndeliverable") - 1);
474
    								} else {
475
	    								} else {
475
    									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
476
	    									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
476
    								}
477
	    								}
477
    								continue;
478
    									continue;
478
    							} else {
479
    								 } else {
479
    								JSONArray messagesArray = new JSONArray();
480
	    								JSONArray messagesArray = new JSONArray();
480
    								JSONObject message=new JSONObject();
481
	    								JSONObject message=new JSONObject();
481
    								message.put("type","info");
482
	    								message.put("type","info");
482
    								message.put("messageText","Merged from earlier cart");
483
	    								message.put("messageText","Merged from earlier cart");
483
    								messagesArray.put(message);
484
	    								messagesArray.put(message);
484
    								itemObj.put("cartItemMessages", messagesArray);
485
	    								itemObj.put("cartItemMessages", messagesArray);
485
    								cartObj.put("cartMessagesMerged", cartMessagesMerged + 1);
486
	    								cartObj.put("cartMessagesMerged", cartMessagesMerged + 1);
486
    								
487
    								 }
487
    							}
488
    							}
488
    							ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
489
    							ProductPojo pp = PojoPopulator.getShortContent(itemObj.getLong("catalogItemId"));
489
    							if(allSame){
490
    							if(allSame){
490
    								allSame = maxEstimate==0 || maxEstimate==itemObj.getInt("estimate");
491
    								allSame = maxEstimate==0 || maxEstimate==itemObj.getInt("estimate");
491
    							}
492
    							}