Subversion Repositories SmartDukaan

Rev

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

Rev 7190 Rev 7422
Line 6... Line 6...
6 
import in.shop2020.model.v1.inventory.InventoryType;
 6 
import in.shop2020.model.v1.inventory.InventoryType;
7 
import in.shop2020.model.v1.catalog.Item;
 7 
import in.shop2020.model.v1.catalog.Item;
8 
import in.shop2020.model.v1.catalog.ItemType;
 8 
import in.shop2020.model.v1.catalog.ItemType;
9 
import in.shop2020.model.v1.inventory.Warehouse;
 9 
import in.shop2020.model.v1.inventory.Warehouse;
10 
import in.shop2020.model.v1.order.LineItem;
 10 
import in.shop2020.model.v1.order.LineItem;
- 
 
 11 
import in.shop2020.model.v1.order.OrderSource;
11 
import in.shop2020.model.v1.order.OrderStatus;
 12 
import in.shop2020.model.v1.order.OrderStatus;
12 
import in.shop2020.model.v1.order.TransactionService.Client;
 13 
import in.shop2020.model.v1.order.TransactionService.Client;
13 
import in.shop2020.thrift.clients.CatalogClient;
 14 
import in.shop2020.thrift.clients.CatalogClient;
14 
import in.shop2020.thrift.clients.InventoryClient;
 15 
import in.shop2020.thrift.clients.InventoryClient;
15 
import in.shop2020.thrift.clients.TransactionClient;
 16 
import in.shop2020.thrift.clients.TransactionClient;
Line 274... Line 275...
274 
				pickFromWarehouse,
 275 
				pickFromWarehouse,
275 
				ItemType.SERIALIZED.equals(item.getType()),
 276 
				ItemType.SERIALIZED.equals(item.getType()),
276 
				item.isHasItemNo(),
 277 
				item.isHasItemNo(),
277 
				t_order.getFulfilmentWarehouseId(),
 278 
				t_order.getFulfilmentWarehouseId(),
278 
				t_order.getPickupStoreId(),
 279 
				t_order.getPickupStoreId(),
279 
				t_order.getFreebieItemId());
 280 
				t_order.getFreebieItemId(),
- 
 
 281 
				OrderSource.findByValue((int)t_order.getSource()).toString());
280 
		return order;
 282 
		return order;
281 
	}
 283 
	}
282 
 
 284 
 
283 
	/**
 285 
	/**
284 
	 * Queries the transction server to get the list of all return orders that
 286 
	 * Queries the transction server to get the list of all return orders that