Subversion Repositories SmartDukaan

Rev

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

Rev 8779 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 292... Line 294...
292
            	} else {
294
            	} else {
293
            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(ebayItem.getItemId(), 1);
295
            		List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(ebayItem.getItemId(), 1);
294
            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
296
            		fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
295
            	}
297
            	}
296
            	order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
298
            	order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
-
 
299
        		
-
 
300
				long billingWarehouseId = 0;
-
 
301
				if(fulfillmentWarehouse.getBillingWarehouseId()== 0) {
-
 
302
					inventoryClient = new InventoryClient().getClient();
-
 
303
					List<Warehouse> warehouses = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, fulfillmentWarehouse.getVendor().getId(), 0, 0);
-
 
304
					for(Warehouse warehouse : warehouses) {
-
 
305
						if(warehouse.getBillingWarehouseId()!=0) {
-
 
306
							billingWarehouseId = warehouse.getBillingWarehouseId();
-
 
307
			                break;
-
 
308
						}
-
 
309
					}
-
 
310
				}else {
-
 
311
					billingWarehouseId = fulfillmentWarehouse.getBillingWarehouseId();
-
 
312
				}
-
 
313
			        
-
 
314
				order.setWarehouse_id(billingWarehouseId);
297
        		order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
315
            	//order.setWarehouse_id(fulfillmentWarehouse.getBillingWarehouseId());
298
        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
316
        		VendorItemPricing vendorItemPricing = inventoryClient.getItemPricing(lineItem.getItem_id(), fulfillmentWarehouse.getVendor().getId());
299
        		order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
317
        		order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
300
        		order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
318
        		order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
301
			} catch (InventoryServiceException e) {
319
			} catch (InventoryServiceException e) {
302
				addActionError("Error in updating WarehouseId for row number " + rowId + 1);
320
				addActionError("Error in updating WarehouseId for row number " + rowId + 1);