Subversion Repositories SmartDukaan

Rev

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

Rev 8802 Rev 8892
Line 18... Line 18...
18
import in.shop2020.model.v1.catalog.CatalogServiceException;
18
import in.shop2020.model.v1.catalog.CatalogServiceException;
19
import in.shop2020.model.v1.catalog.EbayItem;
19
import in.shop2020.model.v1.catalog.EbayItem;
20
import in.shop2020.model.v1.catalog.Item;
20
import in.shop2020.model.v1.catalog.Item;
21
import in.shop2020.model.v1.inventory.InventoryService;
21
import in.shop2020.model.v1.inventory.InventoryService;
22
import in.shop2020.model.v1.inventory.InventoryServiceException;
22
import in.shop2020.model.v1.inventory.InventoryServiceException;
-
 
23
import in.shop2020.model.v1.inventory.InventoryType;
23
import in.shop2020.model.v1.inventory.VendorItemPricing;
24
import in.shop2020.model.v1.inventory.VendorItemPricing;
24
import in.shop2020.model.v1.inventory.Warehouse;
25
import in.shop2020.model.v1.inventory.Warehouse;
25
import in.shop2020.model.v1.order.EbayOrder;
26
import in.shop2020.model.v1.inventory.WarehouseType;
26
import in.shop2020.model.v1.order.LineItem;
27
import in.shop2020.model.v1.order.LineItem;
27
import in.shop2020.model.v1.order.Order;
28
import in.shop2020.model.v1.order.Order;
28
import in.shop2020.model.v1.order.OrderSource;
29
import in.shop2020.model.v1.order.OrderSource;
29
import in.shop2020.model.v1.order.OrderStatus;
30
import in.shop2020.model.v1.order.OrderStatus;
30
import in.shop2020.model.v1.order.OrderType;
31
import in.shop2020.model.v1.order.OrderType;
Line 252... Line 253...
252
	            	} else {
253
	            	} else {
253
	            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(itemId, 1);
254
	            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(itemId, 1);
254
	            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
255
	            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
255
	            	}
256
	            	}
256
	            	t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
257
	            	t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
-
 
258
	            	
-
 
259
					long billingWarehouseId = 0;
-
 
260
					if(fulfillmentWarehouse.getBillingWarehouseId()== 0) {
-
 
261
						inventoryClient = new InventoryClient().getClient();
-
 
262
						List<Warehouse> warehouses = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, fulfillmentWarehouse.getVendor().getId(), 0, 0);
-
 
263
						for(Warehouse warehouse : warehouses) {
-
 
264
							if(warehouse.getBillingWarehouseId()!=0) {
-
 
265
								billingWarehouseId = warehouse.getBillingWarehouseId();
-
 
266
				                break;
-
 
267
							}
-
 
268
						}
-
 
269
					} else {
257
	        		t_order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
270
						billingWarehouseId = fulfillmentWarehouse.getBillingWarehouseId();
-
 
271
					}
258
	        		
272
				        
-
 
273
					t_order.setWarehouse_id(billingWarehouseId);
-
 
274
					//t_order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
259
	        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
275
	        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
260
	        		t_order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
276
	        		t_order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
261
	        		t_order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
277
	        		t_order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
262
				} catch (InventoryServiceException e) {
278
				} catch (InventoryServiceException e) {
263
					addActionError("Error in updating WarehouseId for row number " + rowId);
279
					addActionError("Error in updating WarehouseId for row number " + rowId);