Merge pull request #108 from 3drobotics/2-0-stable

use package stock_location rather than global origin for rates

app/models/spree/calculator/shipping/active_shipping/base.rb

@@ -17,11 +17,13 @@ def self.service_name
 
         def compute(package)
           order = package.order
+          stock_location = package.stock_location
+
+          origin= Location.new(:country => stock_location.country.iso,
+                               :city => stock_location.city,
+                               :state => stock_location.state_name || stock_location.state.name,
+                               :zip => stock_location.zipcode)
 
-          origin= Location.new(:country => Spree::ActiveShipping::Config[:origin_country],
-                               :city => Spree::ActiveShipping::Config[:origin_city],
-                               :state => Spree::ActiveShipping::Config[:origin_state],
-                               :zip => Spree::ActiveShipping::Config[:origin_zip])
           addr = order.ship_address
 
           destination = Location.new(:country => addr.country.iso,

app/models/spree/stock_location_decorator.rb

@@ -0,0 +1,10 @@
+Spree::StockLocation.class_eval do
+  validates_presence_of :address1, :city, :zipcode, :country_id
+  validate :state_id_or_state_name_is_present
+
+  def state_id_or_state_name_is_present
+    if state_id.nil? && state_name.nil?
+        errors.add(:state_name, "can't be blank")
+    end
+  end
+end