Subversion Repositories SmartDukaan

Rev

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

Rev 17797 Rev 17800
Line 461... Line 461...
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=0;
464 
    						boolean allSame=true;
 464 
    						boolean allSame=true;
465 
    						int cartMessagesMerged = 0;
 465 
    						int cartMessagesMerged = 0;
- 
 
 466 
    						int removedCount = 0;
466 
    						for (int j=0; j<arr.length(); j++){
 467 
    						for (int j=0; j<arr.length(); j++){
467 
    							JSONObject itemObj = arr.getJSONObject(j);
 468 
    							JSONObject itemObj = arr.getJSONObject(j-removedCount);
468 
    							if(itemsList.contains(itemObj.getInt("itemId")) && itemObj.getInt("quantity")==0){
 469 
    							if(itemsList.contains(itemObj.getInt("itemId")) && itemObj.getInt("quantity")==0){
469 
    								arr.remove(j);
 470 
    								arr.remove(j-removedCount);
- 
 
 471 
    								removedCount++;
470 
    								if (itemObj.getInt("estimate")==-1){
 472 
    								if (itemObj.getInt("estimate")==-1){
471 
    									cartObj.put("cartMessageUndeliverable", cartObj.getInt("cartMessageUndeliverable") - 1);
 473 
    									cartObj.put("cartMessageUndeliverable", cartObj.getInt("cartMessageUndeliverable") - 1);
472 
    								} else {
 474 
    								} else {
473 
    									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
 475 
    									cartObj.put("cartMessageOOS", cartObj.getInt("cartMessageOOS") - 1);
474 
    								}
 476 
    								}