adds freight acct # to config obj

Author: Brent Sanders

examples/create_freight_shipment.py

@@ -22,7 +22,7 @@
 shipment.RequestedShipment.ServiceType = 'FEDEX_FREIGHT_ECONOMY'
 shipment.RequestedShipment.PackagingType = 'YOUR_PACKAGING'
 
-shipment.RequestedShipment.FreightShipmentDetail.FedExFreightAccountNumber = 'xxxxxxxxx' #freight account number
+shipment.RequestedShipment.FreightShipmentDetail.FedExFreightAccountNumber = CONFIG_OBJ.freight_account_number
 
 # Shipper contact info.
 shipment.RequestedShipment.Shipper.Contact.PersonName = 'Sender Name'
@@ -48,9 +48,11 @@
 shipment.RequestedShipment.Recipient.Address.StateOrProvinceCode = 'AR'
 shipment.RequestedShipment.Recipient.Address.PostalCode = '72601'
 shipment.RequestedShipment.Recipient.Address.CountryCode = 'US'
+
 # This is needed to ensure an accurate rate quote with the response.
 shipment.RequestedShipment.Recipient.Address.Residential = False
 shipment.RequestedShipment.FreightShipmentDetail.TotalHandlingUnits = 1  
+shipment.RequestedShipment.ShippingChargesPayment.Payor.ResponsibleParty.AccountNumber = CONFIG_OBJ.freight_account_number
 
 shipment.RequestedShipment.FreightShipmentDetail.FedExFreightBillingContactAndAddress.Contact.PersonName = 'Sender Name'
 shipment.RequestedShipment.FreightShipmentDetail.FedExFreightBillingContactAndAddress.Contact.CompanyName = 'Some Company'

examples/create_shipment.py

@@ -59,6 +59,7 @@
 shipment.RequestedShipment.Recipient.Address.Residential = True
 shipment.RequestedShipment.EdtRequestType = 'NONE'
 
+shipment.RequestedShipment.ShippingChargesPayment.Payor.ResponsibleParty.AccountNumber = CONFIG_OBJ.account_number
 # Who pays for the shipment?
 # RECIPIENT, SENDER or THIRD_PARTY
 shipment.RequestedShipment.ShippingChargesPayment.PaymentType = 'SENDER' 

examples/freight_rate_request.py

@@ -27,7 +27,7 @@
 
 rate_request.RequestedShipment.FreightShipmentDetail.TotalHandlingUnits = 1
 
-rate_request.RequestedShipment.FreightShipmentDetail.FedExFreightAccountNumber = 'xxxxxxxx' #freight account number
+rate_request.RequestedShipment.FreightShipmentDetail.FedExFreightAccountNumber = CONFIG_OBJ.freight_account_number
 
 rate_request.RequestedShipment.Shipper.Address.PostalCode = '72601'
 rate_request.RequestedShipment.Shipper.Address.CountryCode = 'US'

examples/rate_request.py

@@ -56,7 +56,7 @@
 # Who pays for the rate_request?
 # RECIPIENT, SENDER or THIRD_PARTY
 rate_request.RequestedShipment.ShippingChargesPayment.PaymentType = 'SENDER' 
-
+rate_request.RequestedShipment.ShippingChargesPayment.Payor.AccountNumber = CONFIG_OBJ.account_number
 package1_weight = rate_request.create_wsdl_object_of_type('Weight')
 # Weight, in LB.
 package1_weight.Value = 1.0

fedex/config.py

@@ -19,7 +19,7 @@ class FedexConfig(object):
     C{password} arguments and set the instance variables documented below
     at a later time if you must.
     """
-    def __init__(self, key, password, account_number=None, meter_number=None,
+    def __init__(self, key, password, account_number=None, meter_number=None, freight_account_number=None,
                  integrator_id=None, wsdl_path=None, express_region_code=None, use_test_server=False):
         """
         @type key: L{str}
@@ -33,6 +33,9 @@ def __init__(self, key, password, account_number=None, meter_number=None,
         @type meter_number: L{str}
         @keyword meter_number: The meter number sent to you by Fedex after
             registering for Web Services.
+        @type freight_account_number: L{str}
+        @keyword freight_account_number: The freight account number sent to you
+            by Fedex after registering for Web Services.
         @type integrator_id: L{str}
         @keyword integrator_id: The integrator string sent to you by Fedex after
             registering for Web Services.
@@ -53,6 +56,8 @@ def __init__(self, key, password, account_number=None, meter_number=None,
         """@ivar: Web Services account number."""
         self.meter_number = meter_number
         """@ivar: Web services meter number."""
+        self.freight_account_number = freight_account_number
+        """@ivar: Web Services freight accountnumber."""
         self.integrator_id = integrator_id
         """@ivar: Web services integrator ID."""
         self.express_region_code = express_region_code

fedex/services/ship_service.py

@@ -72,7 +72,6 @@ def _prepare_wsdl_objects(self):
 
         Payor = self.client.factory.create('Payor')
         # Grab the account number from the FedexConfig object by default.
-        Payor.ResponsibleParty.AccountNumber = 'xxxxxxxx' #freight account number!
         # Assume US.
         Payor.ResponsibleParty.Address.CountryCode = 'US'