Subversion Repositories SmartDukaan

Rev

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

Rev 8574 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;
-
 
26
import in.shop2020.model.v1.inventory.WarehouseType;
25
import in.shop2020.model.v1.order.EbayOrder;
27
import in.shop2020.model.v1.order.EbayOrder;
26
import in.shop2020.model.v1.order.LineItem;
28
import in.shop2020.model.v1.order.LineItem;
27
import in.shop2020.model.v1.order.Order;
29
import in.shop2020.model.v1.order.Order;
28
import in.shop2020.model.v1.order.OrderSource;
30
import in.shop2020.model.v1.order.OrderSource;
29
import in.shop2020.model.v1.order.OrderStatus;
31
import in.shop2020.model.v1.order.OrderStatus;
Line 268... Line 270...
268
	            	} else {
270
	            	} else {
269
	            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(ebayItem.getItemId(), 1);
271
	            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(ebayItem.getItemId(), 1);
270
	            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
272
	            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
271
	            	}
273
	            	}
272
	            	t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
274
	            	t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
-
 
275
					long billingWarehouseId = 0;
-
 
276
					if(fulfillmentWarehouse.getBillingWarehouseId()== 0) {
-
 
277
						inventoryClient = new InventoryClient().getClient();
-
 
278
						List<Warehouse> warehouses = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, fulfillmentWarehouse.getVendor().getId(), 0, 0);
-
 
279
						for(Warehouse warehouse : warehouses) {
-
 
280
							if(warehouse.getBillingWarehouseId()!=0) {
-
 
281
								billingWarehouseId = warehouse.getBillingWarehouseId();
-
 
282
				                break;
-
 
283
							}
-
 
284
						}
-
 
285
					}else {
273
	        		t_order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
286
						billingWarehouseId = fulfillmentWarehouse.getBillingWarehouseId();
-
 
287
					}
274
	        		
288
				        
-
 
289
					t_order.setWarehouse_id(billingWarehouseId);
-
 
290
	        		//t_order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
275
	        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
291
	        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
276
	        		t_order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
292
	        		t_order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
277
	        		t_order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
293
	        		t_order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
278
				} catch (InventoryServiceException e) {
294
				} catch (InventoryServiceException e) {
279
					addActionError("Error in updating WarehouseId for row number " + rowId);
295
					addActionError("Error in updating WarehouseId for row number " + rowId);