From 40416bc7d6da750e8418bc02f66068e1d6b0f568 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Wed, 5 Jun 2013 15:33:52 -0700 Subject: [PATCH] Specify class name for calculator association in calculated_adjustment Otherwise, top-level classes that include this module will have an association that looks for ::Calculator, rather than Spree::Calculator --- core/lib/spree/core/calculated_adjustments.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/spree/core/calculated_adjustments.rb b/core/lib/spree/core/calculated_adjustments.rb index ae15aa69f9f..e7e5f2634a5 100644 --- a/core/lib/spree/core/calculated_adjustments.rb +++ b/core/lib/spree/core/calculated_adjustments.rb @@ -3,7 +3,7 @@ module Core module CalculatedAdjustments def self.included(klass) klass.class_eval do - has_one :calculator, :as => :calculable, :dependent => :destroy + has_one :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy accepts_nested_attributes_for :calculator attr_accessible :calculator_type, :calculator_attributes validates :calculator, :presence => true