Subversion Repositories SmartDukaan

Rev

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

Rev 19260 Rev 19263
Line 309... Line 309...
309 
							}
 309 
							}
310 
						}else{
 310 
						}else{
311 
							continue;
 311 
							continue;
312 
						}
 312 
						}
313 
					}
 313 
					}
- 
 
 314 
					categoryOrderCount = 0;
314 
					categoryOrderCount = categoryOrderCount+orders.size();
 315 
					categoryOrderCount = categoryOrderCount+orders.size();
315 
				}
 316 
				}
316
317
317 
			}
 318 
			}
318
319
Line 338... Line 339...
338 
		List<OrderStatus> statuses = getStatuses(type);
 339 
		List<OrderStatus> statuses = getStatuses(type);
339
340
340 
		int count = 0;
 341 
		int count = 0;
341 
		try{
 342 
		try{
342 
			if(type==OrderType.ALL_PENDING && orderCategory!=OrderCategory.NONE){
 343 
			if(type==OrderType.ALL_PENDING && orderCategory!=OrderCategory.NONE){
- 
 
 344 
				int orderCount = categoryOrderCount;
- 
 
 345 
				categoryOrderCount = 0;
343 
				return categoryOrderCount;
 346 
				return orderCount;
344 
			}
 347 
			}
345 
			else{
 348 
			else{
346 
				TransactionClient txnClient = new TransactionClient();
 349 
				TransactionClient txnClient = new TransactionClient();
347 
				Client client = txnClient.getClient();
 350 
				Client client = txnClient.getClient();
348 
				count += client.getOrderCount(statuses, warehouseId, source);
 351 
				count += client.getOrderCount(statuses, warehouseId, source);