Merge pull request Shopify#109 from rterbush/max-weights-master

max_weight must return weight in ounces
dotandbo · Aug 10, 2013 · c4f092e · c4f092e
2 parents 97ede8c + 9816d93
commit c4f092e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/app/models/spree/calculator/shipping/ups/base.rb b/app/models/spree/calculator/shipping/ups/base.rb
@@ -22,7 +22,7 @@ def carrier
         protected
         # weight limit in ounces http://www.ups.com/content/us/en/resources/prepare/oversize.html
         def max_weight_for_country(country)
-          150*Spree::ActiveShipping::Config[:unit_multiplier]
+          2400		# 150 lbs
         end
       end
     end

diff --git a/app/models/spree/calculator/shipping/usps/base.rb b/app/models/spree/calculator/shipping/usps/base.rb
@@ -14,7 +14,7 @@ def carrier
         protected
         # weight limit in ounces or zero (if there is no limit)
         def max_weight_for_country(country)
-          70*Spree::ActiveShipping::Config[:unit_multiplier]
+          1120	# 70 lbs
         end
       end
     end

diff --git a/app/models/spree/calculator/shipping/usps/express_mail_international.rb b/app/models/spree/calculator/shipping/usps/express_mail_international.rb
@@ -34,7 +34,7 @@ def max_weight_for_country(country)
           if limit.nil?
             raise Spree::ShippingError.new("#{I18n.t(:shipping_error)}: This shipping method isn't available for #{country.name}")
           end
-          limit*Spree::ActiveShipping::Config[:unit_multiplier]
+          limit * 16	# weights are operated on in ounces
         end
       end
     end

diff --git a/app/models/spree/calculator/shipping/usps/priority_mail_international.rb b/app/models/spree/calculator/shipping/usps/priority_mail_international.rb
@@ -37,7 +37,7 @@ def max_weight_for_country(country)
           if limit.nil?
             raise Spree::ShippingError.new("#{I18n.t(:shipping_error)}: This shipping method isn't available for #{country.name}")
           end
-          limit*Spree::ActiveShipping::Config[:unit_multiplier]
+          limit * 16	# weights are operated on in ounces
         end
       end
     end

diff --git a/app/models/spree/calculator/shipping/usps/priority_mail_international_large_flat_rate_box.rb b/app/models/spree/calculator/shipping/usps/priority_mail_international_large_flat_rate_box.rb
@@ -26,7 +26,7 @@ def self.description
         # weight limit in ounces http://pe.usps.com/text/imm/immc2_011.htm
         def max_weight_for_country(country)
           if AVAILABLE_COUNTRIES.include?(country.iso)
-            20*Spree::ActiveShipping::Config[:unit_multiplier]
+            320		# 20 lbs
           else
             # ex. AC, BO, CU, FK, KP, SO
             raise Spree::ShippingError.new("#{I18n.t(:shipping_error)}: This shipping method isn't available for #{country.name}")

diff --git a/...models/spree/calculator/shipping/usps/priority_mail_international_medium_flat_rate_box.rb b/...models/spree/calculator/shipping/usps/priority_mail_international_medium_flat_rate_box.rb
@@ -26,7 +26,7 @@ def self.description
         # weight limit in ounces http://pe.usps.com/text/imm/immc2_011.htm
         def max_weight_for_country(country)
           if AVAILABLE_COUNTRIES.include?(country.iso)
-            20*Spree::ActiveShipping::Config[:unit_multiplier]
+            320		# 20 lbs
           else
             # ex. AC, BO, CU, FK, KP, SO
             raise Spree::ShippingError.new("#{I18n.t(:shipping_error)}: This shipping method isn't available for #{country.name}")

diff --git a/app/models/spree/calculator/shipping/usps/priority_mail_international_small_flat_rate_box.rb b/app/models/spree/calculator/shipping/usps/priority_mail_international_small_flat_rate_box.rb
@@ -26,7 +26,7 @@ def self.description
         # weight limit in ounces http://pe.usps.com/text/imm/immc2_011.htm
         def max_weight_for_country(country)
           if AVAILABLE_COUNTRIES.include?(country.iso)
-            4*Spree::ActiveShipping::Config[:unit_multiplier]
+            64		# 4 lbs
           else
             # ex. North Korea, Somalia, etc.
             raise Spree::ShippingError.new("#{I18n.t(:shipping_error)}: This shipping method isn't available for #{country.name}")