Subversion Repositories SmartDukaan

Rev

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

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