Subversion Repositories SmartDukaan

Rev

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

Rev 10992 Rev 10993
Line 499... Line 499...
499
					}
499
					}
500
				}
500
				}
501
				t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
501
				t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
502
				long billingWarehouseId = 0;
502
				long billingWarehouseId = 0;
503
				if(fulfillmentWarehouse.getBillingWarehouseId()== 0) {
503
				if(fulfillmentWarehouse.getBillingWarehouseId()== 0) {
504
					inventoryClient = new InventoryClient().getClient();
-
 
505
					List<Warehouse> warehouses = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, fulfillmentWarehouse.getVendor().getId(), 0, 0);
504
					List<Warehouse> warehouses = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, fulfillmentWarehouse.getVendor().getId(), 0, 0);
506
					for(Warehouse warehouse : warehouses) {
505
					for(Warehouse warehouse : warehouses) {
507
						if(warehouse.getBillingWarehouseId()!=0) {
506
						if(warehouse.getBillingWarehouseId()!=0) {
508
							billingWarehouseId = warehouse.getBillingWarehouseId();
507
							billingWarehouseId = warehouse.getBillingWarehouseId();
509
							break;
508
							break;
Line 624... Line 623...
624
			}
623
			}
625
			List<in.shop2020.model.v1.order.Order> flipkartorders = transaction.getOrders();
624
			List<in.shop2020.model.v1.order.Order> flipkartorders = transaction.getOrders();
626
			for(in.shop2020.model.v1.order.Order flipkartorder:flipkartorders){
625
			for(in.shop2020.model.v1.order.Order flipkartorder:flipkartorders){
627
				try {
626
				try {
628
					List<in.shop2020.model.v1.order.Attribute> attributeList = new ArrayList<in.shop2020.model.v1.order.Attribute>();
627
					List<in.shop2020.model.v1.order.Attribute> attributeList = new ArrayList<in.shop2020.model.v1.order.Attribute>();
629
					inventoryClient = new InventoryClient().getClient();
-
 
630
					inventoryClient.reserveItemInWarehouse(flipkartorder.getLineitems().get(0).getItem_id(), fulfillmentWarehouse.getId(), 1, 
628
					inventoryClient.reserveItemInWarehouse(flipkartorder.getLineitems().get(0).getItem_id(), fulfillmentWarehouse.getId(), 1, 
631
							flipkartorder.getId(), flipkartorder.getCreated_timestamp(), flipkartorder.getPromised_shipping_time(), flipkartorder.getLineitems().get(0).getQuantity());
629
							flipkartorder.getId(), flipkartorder.getCreated_timestamp(), flipkartorder.getPromised_shipping_time(), flipkartorder.getLineitems().get(0).getQuantity());
632
					FlipkartOrder flipkartOrder = new FlipkartOrder();
630
					FlipkartOrder flipkartOrder = new FlipkartOrder();
633
					flipkartOrder.setOrderId(flipkartorder.getId());
631
					flipkartOrder.setOrderId(flipkartorder.getId());
634
					flipkartOrder.setFlipkartOrderId(orderId);
632
					flipkartOrder.setFlipkartOrderId(orderId);