Subversion Repositories SmartDukaan

Rev

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

Rev 19433 Rev 19545
Line 502... Line 502...
502
	    		warehouse = isc.getClient().getWarehouse(t_order.getWarehouse_id());
502
	    		warehouse = isc.getClient().getWarehouse(t_order.getWarehouse_id());
503
			} catch(Exception e) {
503
			} catch(Exception e) {
504
			    log.error("Unable to get warehouse for id : " + t_order.getWarehouse_id(), e);
504
			    log.error("Unable to get warehouse for id : " + t_order.getWarehouse_id(), e);
505
			    //TODO throw e;
505
			    //TODO throw e;
506
			}
506
			}
507
			if(t_order.getLogistics_provider_id()==7L){
507
			if(t_order.getLogistics_provider_id()==7L || t_order.getLogistics_provider_id()==46L){
508
				FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo();
508
				FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo();
509
				List<in.shop2020.model.v1.order.Order> orders = new ArrayList<in.shop2020.model.v1.order.Order>();
509
				List<in.shop2020.model.v1.order.Order> orders = new ArrayList<in.shop2020.model.v1.order.Order>();
510
				orders.add(t_order);
510
				orders.add(t_order);
511
				ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(orders,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress(), t_order.getLogistics_provider_id());
511
				ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(orders,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress(), t_order.getLogistics_provider_id());
512
				CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();
512
				CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();