Subversion Repositories SmartDukaan

Rev

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

Rev 18659 Rev 19433
Line 503... Line 503...
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){
508
				FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo(warehouse.getLogisticsLocation());
508
				FedExShipAccountInfo fedexAccountInfo = FedExShipAccountInfo.getFedExInfo();
-
 
509
				List<in.shop2020.model.v1.order.Order> orders = new ArrayList<in.shop2020.model.v1.order.Order>();
-
 
510
				orders.add(t_order);
509
				ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(t_order,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress());
511
				ProcessShipmentReply  processShipmentReply = ShipWebServiceClient.getShipmentCreationReply(orders,fedexAccountInfo.getClientDetail(),fedexAccountInfo.getWad(),fedexAccountInfo.getEndPointAddress(), t_order.getLogistics_provider_id());
510
				CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();
512
				CompletedShipmentDetail completedShipmentDetails = processShipmentReply.getCompletedShipmentDetail();
511
				CompletedPackageDetail completedPackageDetails =  completedShipmentDetails.getCompletedPackageDetails(0);
513
				CompletedPackageDetail completedPackageDetails =  completedShipmentDetails.getCompletedPackageDetails(0);
512
				TrackingId  trackId= completedPackageDetails.getTrackingIds(0);
514
				TrackingId  trackId= completedPackageDetails.getTrackingIds(0);
513
				t_order = transactionClient.updateOrderAWB(t_order.getId(), trackId.getTrackingNumber());
515
				t_order = transactionClient.updateOrderAWB(t_order.getId(), trackId.getTrackingNumber());
514
				//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
516
				//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013