Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fedex/services/availability_commitment_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'vacs',
'major': '4',
'major': '8',
'intermediate': '0',
'minor': '0'
}
Expand Down Expand Up @@ -58,7 +58,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Exception: binding 'ns:ValidationAvailabilityAndCommitmentServiceSoapBinding', not-found

super(FedexAvailabilityCommitmentRequest, self).__init__(
self._config_obj, 'AvailabilityAndCommitmentService_v4.wsdl', *args, **kwargs)
self._config_obj, 'ValidationAvailabilityAndCommitmentService_v8.wsdl', *args, **kwargs)

def _prepare_wsdl_objects(self):
"""
Expand Down
4 changes: 2 additions & 2 deletions fedex/services/country_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'cnty',
'major': '4',
'major': '8',
'intermediate': '0',
'minor': '0'
}
Expand All @@ -48,7 +48,7 @@ def __init__(self, config_obj, *args, **kwargs):
"""@ivar: Holds the CheckForMismatch boolean objects."""

super(FedexValidatePostalRequest, self).__init__(
self._config_obj, 'CountryService_v4.wsdl', *args, **kwargs)
self._config_obj, 'CountryService_v8.wsdl', *args, **kwargs)

def _prepare_wsdl_objects(self):
"""
Expand Down
4 changes: 2 additions & 2 deletions fedex/services/location_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'locs',
'major': '3',
'major': '9',
'intermediate': '0',
'minor': '0'
}
Expand All @@ -53,7 +53,7 @@ def __init__(self, config_obj, *args, **kwargs):
"""@ivar: Holds the LocationSortDetail WSDL object."""

super(FedexSearchLocationRequest, self).__init__(
self._config_obj, 'LocationsService_v3.wsdl', *args, **kwargs)
self._config_obj, 'LocationsService_v9.wsdl', *args, **kwargs)

def _prepare_wsdl_objects(self):
"""
Expand Down
4 changes: 2 additions & 2 deletions fedex/services/pickup_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'disp',
'major': '11',
'major': '17',
'intermediate': '0',
'minor': '0'
}
Expand All @@ -21,7 +21,7 @@ def __init__(self, config_obj, *args, **kwargs):
self.CommodityDescription = None
self.CountryRelationship = None
self.PickupServiceCategory = None
super(FedexCreatePickupRequest, self).__init__(self._config_obj, 'PickupService_v11.wsdl', *args, **kwargs)
super(FedexCreatePickupRequest, self).__init__(self._config_obj, 'PickupService_v17.wsdl', *args, **kwargs)

def _prepare_wsdl_objects(self):
self.OriginDetail = self.client.factory.create('PickupOriginDetail')
Expand Down
4 changes: 2 additions & 2 deletions fedex/services/rate_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ def __init__(self, config_obj, *args, **kwargs):
self._config_obj = config_obj

# Holds version info for the VersionId SOAP object.
self._version_info = {'service_id': 'crs', 'major': '18',
self._version_info = {'service_id': 'crs', 'major': '24',
'intermediate': '0', 'minor': '0'}

self.RequestedShipment = None
"""@ivar: Holds the RequestedShipment WSDL object including the shipper, recipient and shipt time."""
# Call the parent FedexBaseService class for basic setup work.
super(FedexRateServiceRequest, self).__init__(
self._config_obj, 'RateService_v18.wsdl', *args, **kwargs)
self._config_obj, 'RateService_v24.wsdl', *args, **kwargs)
self.ClientDetail.Region = config_obj.express_region_code
"""@ivar: Holds the express region code from the config object."""

Expand Down
8 changes: 4 additions & 4 deletions fedex/services/ship_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'ship',
'major': '17',
'major': '23',
'intermediate': '0',
'minor': '0'
}
self.RequestedShipment = None
"""@ivar: Holds the RequestedShipment WSDL object."""
# Call the parent FedexBaseService class for basic setup work.
super(FedexProcessShipmentRequest, self).__init__(
self._config_obj, 'ShipService_v17.wsdl', *args, **kwargs)
self._config_obj, 'ShipService_v23.wsdl', *args, **kwargs)

def _prepare_wsdl_objects(self):
"""
Expand Down Expand Up @@ -177,15 +177,15 @@ def __init__(self, config_obj, *args, **kwargs):
self._config_obj = config_obj

# Holds version info for the VersionId SOAP object.
self._version_info = {'service_id': 'ship', 'major': '17',
self._version_info = {'service_id': 'ship', 'major': '23',
'intermediate': '0', 'minor': '0'}
self.DeletionControlType = None
"""@ivar: Holds the DeletrionControlType WSDL object."""
self.TrackingId = None
"""@ivar: Holds the TrackingId WSDL object."""
# Call the parent FedexBaseService class for basic setup work.
super(FedexDeleteShipmentRequest, self).__init__(self._config_obj,
'ShipService_v17.wsdl',
'ShipService_v23.wsdl',
*args, **kwargs)

def _prepare_wsdl_objects(self):
Expand Down
4 changes: 2 additions & 2 deletions fedex/services/track_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self, config_obj, *args, **kwargs):
# Holds version info for the VersionId SOAP object.
self._version_info = {
'service_id': 'trck',
'major': '10',
'major': '16',
'intermediate': '0',
'minor': '0'
}
Expand All @@ -54,7 +54,7 @@ def __init__(self, config_obj, *args, **kwargs):

# Call the parent FedexBaseService class for basic setup work.
super(FedexTrackRequest, self).__init__(
self._config_obj, 'TrackService_v10.wsdl', *args, **kwargs)
self._config_obj, 'TrackService_v16.wsdl', *args, **kwargs)
self.IncludeDetailedScans = False

def _prepare_wsdl_objects(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/cnty/v4" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/cnty/v4" name="CountryServiceDefinitions">
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/cnty/v8" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/cnty/v8" name="CountryServiceDefinitions">
<types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/cnty/v4">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/cnty/v8">
<xs:element name="ValidatePostalReply" type="ns:ValidatePostalReply"/>
<xs:element name="ValidatePostalRequest" type="ns:ValidatePostalRequest"/>
<xs:complexType name="Address">
Expand Down Expand Up @@ -48,6 +48,11 @@
<xs:documentation>Indicates whether this address residential (as opposed to commercial).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="GeographicCoordinates" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>The geographic coordinates cooresponding to this address.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="CarrierCodeType">
Expand Down Expand Up @@ -179,7 +184,7 @@
</xs:element>
<xs:element name="MessageParameters" type="ns:NotificationParameter" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>A collection of name/value pairs that provide specific data to help the client determine the nature of an error (or warning, etc.) witout having to parse the message string.</xs:documentation>
<xs:documentation>A collection of name/value pairs that provide specific data to help the client determine the nature of an error (or warning, etc.) without having to parse the message string.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -222,6 +227,7 @@
</xs:simpleType>
<xs:complexType name="PostalDetail">
<xs:sequence>
<xs:element name="CountryCode" type="xs:string" minOccurs="0"/>
<xs:element name="StateOrProvinceCode" type="xs:string" minOccurs="0"/>
<xs:element name="CityFirstInitials" type="xs:string" minOccurs="0"/>
<xs:element name="CleanedPostalCode" type="xs:string" minOccurs="0"/>
Expand All @@ -245,7 +251,8 @@
<xs:enumeration value="DRY_ICE"/>
<xs:enumeration value="EAST_COAST_SPECIAL"/>
<xs:enumeration value="ELECTRONIC_TRADE_DOCUMENTS"/>
<xs:enumeration value="EMAIL_NOTIFICATION"/>
<xs:enumeration value="EVENT_NOTIFICATION"/>
<xs:enumeration value="EXCLUDE_FROM_CONSOLIDATION"/>
<xs:enumeration value="EXCLUSIVE_USE"/>
<xs:enumeration value="EXHIBITION_DELIVERY"/>
<xs:enumeration value="EXHIBITION_PICKUP"/>
Expand Down Expand Up @@ -276,6 +283,7 @@
<xs:enumeration value="LIMITED_ACCESS_PICKUP"/>
<xs:enumeration value="MARKING_OR_TAGGING"/>
<xs:enumeration value="NON_BUSINESS_TIME"/>
<xs:enumeration value="OVER_LENGTH"/>
<xs:enumeration value="PALLETS_PROVIDED"/>
<xs:enumeration value="PALLET_SHRINKWRAP"/>
<xs:enumeration value="PALLET_WEIGHT_ALLOWANCE"/>
Expand Down Expand Up @@ -394,7 +402,7 @@
<xs:documentation>Identifies a system or sub-system which performs an operation.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Major" type="xs:int" fixed="4" minOccurs="1">
<xs:element name="Major" type="xs:int" fixed="8" minOccurs="1">
<xs:annotation>
<xs:documentation>Identifies the service business level.</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -428,7 +436,7 @@
<binding name="CountryServiceSoapBinding" type="ns:CountryPortType">
<s1:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="validatePostal">
<s1:operation soapAction="http://fedex.com/ws/cnty/v4/validatePostal" style="document"/>
<s1:operation soapAction="http://fedex.com/ws/cnty/v8/validatePostal" style="document"/>
<input>
<s1:body use="literal"/>
</input>
Expand All @@ -439,7 +447,7 @@
</binding>
<service name="CountryService">
<port name="CountryServicePort" binding="ns:CountryServiceSoapBinding">
<s1:address location="https://beta.fedex.com:443/web-services/cnty"/>
<s1:address location="https://ws.fedex.com:443/web-services/cnty"/>
</port>
</service>
</definitions>
Loading