* Apparently department is not an option, even though FedEx docs say …

…it is and the test services allow it. Production services say its not valid.
zachhale · Aug 17, 2009 · a75f530 · a75f530
1 parent 4b226b5
commit a75f530
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+== 1.1.3 released 2009-07-17
+
+* Apparently department is not an option, even though FedEx docs say it is and the test services allow it. Production services say its not valid.
+
 == 1.1.2 released 2009-07-17
 
 * Added :department for shipper and recipient options.

diff --git a/lib/shippinglogic/fedex/rate.rb b/lib/shippinglogic/fedex/rate.rb
@@ -8,7 +8,6 @@ class FedEx
     #
     # * <tt>shipper_name</tt> - name of the shipper.
     # * <tt>shipper_title</tt> - title of the shipper.
-    # * <tt>shipper_department</tt> - department of the shipper.
     # * <tt>shipper_company_name</tt> - company name of the shipper.
     # * <tt>shipper_phone_number</tt> - phone number of the shipper.
     # * <tt>shipper_email</tt> - email of the shipper.
@@ -23,7 +22,6 @@ class FedEx
     #
     # * <tt>recipient_name</tt> - name of the recipient.
     # * <tt>recipient_title</tt> - title of the recipient.
-    # * <tt>recipient_department</tt> - department of the recipient.
     # * <tt>recipient_company_name</tt> - company name of the recipient.
     # * <tt>recipient_phone_number</tt> - phone number of the recipient.
     # * <tt>recipient_email</tt> - email of the recipient.
@@ -106,7 +104,6 @@ class Service; attr_accessor :name, :type, :saturday, :delivered_by, :speed, :ra
       # shipper options
       attribute :shipper_name,                :string
       attribute :shipper_title,               :string
-      attribute :shipper_department,          :string
       attribute :shipper_company_name,        :string
       attribute :shipper_phone_number,        :string
       attribute :shipper_email,               :string
@@ -120,7 +117,6 @@ class Service; attr_accessor :name, :type, :saturday, :delivered_by, :speed, :ra
       # recipient options
       attribute :recipient_name,              :string
       attribute :recipient_title,             :string
-      attribute :recipient_department,        :string
       attribute :recipient_company_name,      :string
       attribute :recipient_phone_number,      :string
       attribute :recipient_email,             :string

diff --git a/lib/shippinglogic/fedex/request.rb b/lib/shippinglogic/fedex/request.rb
@@ -48,10 +48,9 @@ def build_contact(b, type)
           b.Contact do
             b.PersonName send("#{type}_name") if send("#{type}_name")
             b.Title send("#{type}_title") if send("#{type}_title")
-            b.Department send("#{type}_department") if send("#{type}_department")
             b.CompanyName send("#{type}_company_name") if send("#{type}_company_name")
             b.PhoneNumber send("#{type}_phone_number") if send("#{type}_phone_number")
-            b.EmailAddress send("#{type}_email") if send("#{type}_email")
+            b.EMailAddress send("#{type}_email") if send("#{type}_email")
           end
         end
 

diff --git a/lib/shippinglogic/fedex/ship.rb b/lib/shippinglogic/fedex/ship.rb
@@ -8,7 +8,6 @@ class FedEx
     #
     # * <tt>shipper_name</tt> - name of the shipper.
     # * <tt>shipper_title</tt> - title of the shipper.
-    # * <tt>shipper_department</tt> - department of the shipper.
     # * <tt>shipper_company_name</tt> - company name of the shipper.
     # * <tt>shipper_phone_number</tt> - phone number of the shipper.
     # * <tt>shipper_email</tt> - email of the shipper.
@@ -23,7 +22,6 @@ class FedEx
     #
     # * <tt>recipient_name</tt> - name of the recipient.
     # * <tt>recipient_title</tt> - title of the recipient.
-    # * <tt>recipient_department</tt> - department of the recipient.
     # * <tt>recipient_company_name</tt> - company name of the recipient.
     # * <tt>recipient_phone_number</tt> - phone number of the recipient.
     # * <tt>recipient_email</tt> - email of the recipient.
@@ -112,7 +110,6 @@ class Shipment; attr_accessor :rate, :currency, :delivery_date, :tracking_number
       # shipper options
       attribute :shipper_name,                :string
       attribute :shipper_title,               :string
-      attribute :shipper_department,          :string
       attribute :shipper_company_name,        :string
       attribute :shipper_phone_number,        :string
       attribute :shipper_email,               :string
@@ -126,7 +123,6 @@ class Shipment; attr_accessor :rate, :currency, :delivery_date, :tracking_number
       # recipient options
       attribute :recipient_name,              :string
       attribute :recipient_title,             :string
-      attribute :recipient_department,        :string
       attribute :recipient_company_name,      :string
       attribute :recipient_phone_number,      :string
       attribute :recipient_email,             :string

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -63,6 +63,7 @@ def fedex_recipient
     {
       :recipient_name => "Name",
       :recipient_title => "Title",
+      :recipient_department => "Department",
       :recipient_company_name => "Dallas City Hall",
       :recipient_phone_number => "2222222222",
       :recipient_email => "a@a.com",