From e537fa34841b34e825fbb093297311644588b2a0 Mon Sep 17 00:00:00 2001 From: Randy Terbush Date: Mon, 24 Jun 2013 16:08:21 -0600 Subject: [PATCH] Allow order object to be passed in. We have shipping_method.id which is required. --- .../spree/calculator/shipping/active_shipping/base.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/spree/calculator/shipping/active_shipping/base.rb b/app/models/spree/calculator/shipping/active_shipping/base.rb index e6971c469c..d38976da9a 100644 --- a/app/models/spree/calculator/shipping/active_shipping/base.rb +++ b/app/models/spree/calculator/shipping/active_shipping/base.rb @@ -17,9 +17,15 @@ def self.service_name end def compute(object) - return nil unless object.is_a?(Spree::Shipment) || object.is_a?(Spree::Stock::Package) + return nil unless object.is_a?(Spree::Shipment) || + object.is_a?(Spree::Stock::Package) || + object.is_a?(Spree::Order) - order = object.order + if object.is_a?(Spree::Order) + order = object + else + order = object.order + end if object.is_a?(Spree::Shipment) @stock_location_id = object.stock_location_id