Subversion Repositories SmartDukaan

Rev

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

Rev 19196 Rev 19208
Line 96... Line 96...
96
			Client client = txnClient.getClient();
96
			Client client = txnClient.getClient();
97
			
97
			
98
			List<in.shop2020.model.v1.order.Order> t_orders = new ArrayList<in.shop2020.model.v1.order.Order>();
98
			List<in.shop2020.model.v1.order.Order> t_orders = new ArrayList<in.shop2020.model.v1.order.Order>();
99
			if(type==OrderType.NEW || type==OrderType.ALL_PENDING || type ==OrderType.LOW_INVENTORY || type == OrderType.PO_RAISED
99
			if(type==OrderType.NEW || type==OrderType.ALL_PENDING || type ==OrderType.LOW_INVENTORY || type == OrderType.PO_RAISED
100
					|| type == OrderType.REVERSAL_INITIATED || type == OrderType.NOT_AVAILABLE){
100
					|| type == OrderType.REVERSAL_INITIATED || type == OrderType.NOT_AVAILABLE){
101
				t_orders.addAll(client.getOrdersInBatchAsPromisedShipping(statuses, offset, limit, warehouseId, source));
101
				t_orders.addAll(client.getOrdersInBatchAsPromisedShipping(statuses, 0, 0, warehouseId, source));
102
			}else{
102
			}else{
103
				t_orders.addAll(client.getOrdersInBatch(statuses, offset, limit, warehouseId, source));
103
				t_orders.addAll(client.getOrdersInBatch(statuses, offset, limit, warehouseId, source));
104
			}
104
			}
105
			
105
			
106
			for (in.shop2020.model.v1.order.Order t_order: t_orders){
106
			for (in.shop2020.model.v1.order.Order t_order: t_orders){