More namespace escaping

coroutine · Feb 28, 2015 · 693a6de · 693a6de
1 parent 3c8bfed
commit 693a6de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/models/spree/calculator/shipping/ups/base.rb b/app/models/spree/calculator/shipping/ups/base.rb
@@ -16,7 +16,7 @@ def carrier
             carrier_details.merge!(:origin_account => shipper_number)
           end
 
-          ActiveShipping::UPS.new(carrier_details)
+          ::ActiveShipping::UPS.new(carrier_details)
         end
 
         protected

diff --git a/lib/spree/active_shipping/ups_override.rb b/lib/spree/active_shipping/ups_override.rb
@@ -18,12 +18,12 @@ def build_rate_request(origin, destination, packages, options={})
                pickup_type = options[:pickup_type] || :daily_pickup
 
                root_node << XmlNode.new('PickupType') do |pickup_type_node|
-                 pickup_type_node << XmlNode.new('Code', ActiveShipping::UPS::PICKUP_CODES[pickup_type])
+                 pickup_type_node << XmlNode.new('Code', ::ActiveShipping::UPS::PICKUP_CODES[pickup_type])
                  # not implemented: PickupType/PickupDetails element
                end
-               cc = options[:customer_classification] || ActiveShipping::UPS::DEFAULT_CUSTOMER_CLASSIFICATIONS[pickup_type]
+               cc = options[:customer_classification] || ::ActiveShipping::UPS::DEFAULT_CUSTOMER_CLASSIFICATIONS[pickup_type]
                root_node << XmlNode.new('CustomerClassification') do |cc_node|
-                 cc_node << XmlNode.new('Code', ActiveShipping::UPS::CUSTOMER_CLASSIFICATIONS[cc])
+                 cc_node << XmlNode.new('Code', ::ActiveShipping::UPS::CUSTOMER_CLASSIFICATIONS[cc])
                end
 
                root_node << XmlNode.new('Shipment') do |shipment|