bcarpenter-active_shipping 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/active_shipping/shipping/carriers/fedex.rb

@@ -279,7 +279,8 @@ module ActiveMerchant
             time = Time.parse("#{event.get_text('Timestamp').to_s}")
             zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
             
-            shipment_events << ShipmentEvent.new(description, zoneless_time, location)
+            status_code = event.get_text('EventType').to_s
+            shipment_events << ShipmentEvent.new(description, zoneless_time, location, status_code)
           end
           shipment_events = shipment_events.sort_by(&:time)
         end

data/lib/active_shipping/shipping/carriers/ups.rb

@@ -284,6 +284,7 @@ module ActiveMerchant
           activities = first_package.get_elements('Activity')
           unless activities.empty?
             shipment_events = activities.map do |activity|
+              status_code = activity.get_text('Status/StatusType/Code').to_s
               description = activity.get_text('Status/StatusType/Description').to_s
               zoneless_time = if (time = activity.get_text('Time')) &&
                                  (date = activity.get_text('Date'))
@@ -293,7 +294,9 @@ module ActiveMerchant
                 Time.utc(year, month, day, hour, minute, second)
               end
               location = location_from_address_node(activity.elements['ActivityLocation/Address'])
-              ShipmentEvent.new(description, zoneless_time, location)
+
+              
+              ShipmentEvent.new(description, zoneless_time, location, status_code)
             end
             
             shipment_events = shipment_events.sort_by(&:time)

data/lib/active_shipping/shipping/shipment_event.rb

@@ -2,10 +2,10 @@ module ActiveMerchant #:nodoc:
   module Shipping
       
     class ShipmentEvent
-      attr_reader :name, :time, :location, :message
+      attr_reader :name, :time, :location, :status_code, :message
       
-      def initialize(name, time, location, message=nil)
-        @name, @time, @location, @message = name, time, location, message
+      def initialize(name, time, location, status_code=nil, message=nil)
+        @name, @time, @location, @status_code, @message = name, time, location, status_code, message
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcarpenter-active_shipping
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Shopify