added rate service v18, added test

Author: radzhome

examples/freight_rate_request.py

@@ -29,15 +29,31 @@
 
 rate_request.RequestedShipment.FreightShipmentDetail.FedExFreightAccountNumber = CONFIG_OBJ.freight_account_number
 
-rate_request.RequestedShipment.Shipper.Address.PostalCode = '72601'
-rate_request.RequestedShipment.Shipper.Address.CountryCode = 'US'
+
+# Shipper
+rate_request.RequestedShipment.Shipper.AccountNumber = CONFIG_OBJ.freight_account_number
+rate_request.RequestedShipment.Shipper.Contact.PersonName = 'Sender Name'
+rate_request.RequestedShipment.Shipper.Contact.CompanyName = 'Some Company'
+rate_request.RequestedShipment.Shipper.Contact.PhoneNumber = '9012638716'
+rate_request.RequestedShipment.Shipper.Address.StreetLines = ['2000 Freight LTL Testing']
 rate_request.RequestedShipment.Shipper.Address.City = 'Harrison'
 rate_request.RequestedShipment.Shipper.Address.StateOrProvinceCode = 'AR'
+rate_request.RequestedShipment.Shipper.Address.PostalCode = '72601'
+rate_request.RequestedShipment.Shipper.Address.CountryCode = 'US'
 rate_request.RequestedShipment.Shipper.Address.Residential = False
+
+# Recipient
+rate_request.RequestedShipment.Recipient.Address.City = 'Harrison'
+rate_request.RequestedShipment.Recipient.Address.StateOrProvinceCode = 'AR'
 rate_request.RequestedShipment.Recipient.Address.PostalCode = '72601'
 rate_request.RequestedShipment.Recipient.Address.CountryCode = 'US'
-rate_request.RequestedShipment.Recipient.Address.StateOrProvinceCode = 'AR'
-rate_request.RequestedShipment.Recipient.Address.City = 'Harrison'
+rate_request.RequestedShipment.Shipper.Address.Residential = False
+
+# Payment
+payment = rate_request.create_wsdl_object_of_type('Payment')
+payment.PaymentType = "SENDER"
+payment.Payor.ResponsibleParty = rate_request.RequestedShipment.Shipper
+rate_request.RequestedShipment.ShippingChargesPayment = payment
 
 #include estimated duties and taxes in rate quote, can be ALL or NONE
 rate_request.RequestedShipment.EdtRequestType = 'NONE'
@@ -92,11 +108,13 @@
 
 # Fires off the request, sets the 'response' attribute on the object.
 rate_request.send_request()
+#print rate_request.client.last_received()
 
 # This will show the reply to your rate_request being sent. You can access the
 # attributes through the response attribute on the request object. This is
 # good to un-comment to see the variables returned by the FedEx reply.
-#print rate_request.response
+print rate_request.response
+#print rate_request.client.last_sent()
 
 # Here is the overall end result of the query.
 print "HighestSeverity:", rate_request.response.HighestSeverity

examples/rate_request.py

@@ -15,9 +15,11 @@
 # Set this to the INFO level to see the response from Fedex printed in stdout.
 logging.basicConfig(level=logging.INFO)
 
+
 # This is the object that will be handling our tracking request.
 # We're using the FedexConfig object from example_config.py in this dir.
-rate_request = FedexRateServiceRequest(CONFIG_OBJ)
+customer_transaction_id = "*** RateService Request v18 using Python ***"  # Optional transaction_id
+rate_request = FedexRateServiceRequest(CONFIG_OBJ, customer_transaction_id=customer_transaction_id)
 
 # If you wish to have transit data returned with your request you
 # need to uncomment the following
@@ -94,6 +96,11 @@
 # attributes through the response attribute on the request object. This is
 # good to un-comment to see the variables returned by the FedEx reply.
 #print rate_request.response
+#print rate_request.client.last_received()
+
+# See the response printed out.
+#print rate_request.client.last_sent()
+
 
 # Here is the overall end result of the query.
 print "HighestSeverity:", rate_request.response.HighestSeverity
@@ -107,5 +114,5 @@
 
     for rate_detail in service.RatedShipmentDetails:
         print "%s: Net FedEx Charge %s %s" % (service.ServiceType, rate_detail.ShipmentRateDetail.TotalNetFedExCharge.Currency,
-                rate_detail.ShipmentRateDetail.TotalNetFedExCharge.Amount)
+                                              rate_detail.ShipmentRateDetail.TotalNetFedExCharge.Amount)
 

fedex/services/rate_service.py

@@ -7,7 +7,7 @@
 """
 
 from datetime import datetime
-from .. base_service import FedexBaseService
+from ..base_service import FedexBaseService
 
 
 class FedexRateServiceRequest(FedexBaseService):
@@ -27,19 +27,19 @@ 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': '16', 
-                             'intermediate': '0', 'minor': '0'}
-        
+        self._version_info = {'service_id': 'crs', 'major': '18',
+                              'intermediate': '0', 'minor': '0'}
+
         self.RequestedShipment = None
         """@ivar: Holds the RequestedShipment WSDL object."""
         # Call the parent FedexBaseService class for basic setup work.
-        super(FedexRateServiceRequest, self).__init__(self._config_obj, 
-                                                         'RateService_v16.wsdl',
-                                                         *args, **kwargs)
+        super(FedexRateServiceRequest, self).__init__(self._config_obj,
+                                                      'RateService_v18.wsdl',
+                                                      *args, **kwargs)
         self.ClientDetail.Region = config_obj.express_region_code
-        
+
     def _prepare_wsdl_objects(self):
         """
         This is the data that will be used to create your shipment. Create
@@ -52,7 +52,7 @@ def _prepare_wsdl_objects(self):
         # This is the primary data structure for processShipment requests.
         self.RequestedShipment = self.client.factory.create('RequestedShipment')
         self.RequestedShipment.ShipTimestamp = datetime.now()
-        
+
         TotalWeight = self.client.factory.create('Weight')
         # Start at nothing.
         TotalWeight.Value = 0.0
@@ -61,33 +61,33 @@ def _prepare_wsdl_objects(self):
         # This is the total weight of the entire shipment. Shipments may
         # contain more than one package.
         self.RequestedShipment.TotalWeight = TotalWeight
-            
+
         # This is the top level data structure for Shipper information.
         ShipperParty = self.client.factory.create('Party')
         ShipperParty.Address = self.client.factory.create('Address')
         ShipperParty.Contact = self.client.factory.create('Contact')
-        
+
         # Link the ShipperParty to our master data structure.
         self.RequestedShipment.Shipper = ShipperParty
 
         # This is the top level data structure for Recipient information.
         RecipientParty = self.client.factory.create('Party')
         RecipientParty.Contact = self.client.factory.create('Contact')
         RecipientParty.Address = self.client.factory.create('Address')
-        
+
         # Link the RecipientParty object to our master data structure.
         self.RequestedShipment.Recipient = RecipientParty
-                
+
         Payor = self.client.factory.create('Payor')
         # Grab the account number from the FedexConfig object by default.
         Payor.AccountNumber = self._config_obj.account_number
         # Assume US.
         Payor.CountryCode = 'US'
-        
+
         # Start with no packages, user must add them.
         self.RequestedShipment.PackageCount = 0
         self.RequestedShipment.RequestedPackageLineItems = []
-                
+
         # This is good to review if you'd like to see what the data structure
         # looks like.
         self.logger.debug(self.RequestedShipment)
@@ -108,7 +108,7 @@ def _assemble_and_send_request(self):
             Version=self.VersionId,
             RequestedShipment=self.RequestedShipment,
             ReturnTransitAndCommit=self.ReturnTransitAndCommit)
-    
+
     def add_package(self, package_item):
         """
         Adds a package to the ship request.

tests/test_rate_service.py

@@ -0,0 +1,54 @@
+"""
+Test module for the Fedex RateService WSDL.
+"""
+
+import unittest
+
+import sys
+sys.path.insert(0, '..')
+from fedex.services.rate_service import FedexRateServiceRequest
+
+# Common global config object for testing.
+from common import get_test_config
+CONFIG_OBJ = get_test_config()
+
+
+class RateServiceTests(unittest.TestCase):
+    """
+    These tests verify that the rate service WSDL is in good shape.
+    """
+    def test_rate(self):
+
+        rate = FedexRateServiceRequest(CONFIG_OBJ)
+
+        rate.RequestedShipment.DropoffType = 'REGULAR_PICKUP'
+        rate.RequestedShipment.ServiceType = 'FEDEX_GROUND'
+        rate.RequestedShipment.PackagingType = 'YOUR_PACKAGING'
+
+        rate.RequestedShipment.Shipper.Address.StateOrProvinceCode = 'SC'
+        rate.RequestedShipment.Shipper.Address.PostalCode = '29631'
+        rate.RequestedShipment.Shipper.Address.CountryCode = 'US'
+
+        rate.RequestedShipment.Recipient.Address.StateOrProvinceCode = 'NC'
+        rate.RequestedShipment.Recipient.Address.PostalCode = '27577'
+        rate.RequestedShipment.Recipient.Address.CountryCode = 'US'
+
+        rate.RequestedShipment.EdtRequestType = 'NONE'
+        rate.RequestedShipment.ShippingChargesPayment.PaymentType = 'SENDER'
+
+        package1_weight = rate.create_wsdl_object_of_type('Weight')
+        package1_weight.Value = 1.0
+        package1_weight.Units = "LB"
+        package1 = rate.create_wsdl_object_of_type('RequestedPackageLineItem')
+        package1.Weight = package1_weight
+        package1.PhysicalPackaging = 'BOX'
+        package1.GroupPackageCount = 1
+        rate.add_package(package1)
+
+        rate.send_request()
+
+        assert rate.response.HighestSeverity == 'SUCCESS'
+
+if __name__ == "__main__":
+
+    unittest.main()