From 0d4c4f20df985799c4c3810ea2f58f3a7c35061e Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 13 May 2016 12:30:10 +1000 Subject: [PATCH] Fix missing EnterpriseFee::Calculator error Conflicts: app/models/enterprise_fee.rb --- app/models/enterprise_fee.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb index d1d0816340..0fc44ac496 100644 --- a/app/models/enterprise_fee.rb +++ b/app/models/enterprise_fee.rb @@ -16,6 +16,10 @@ class EnterpriseFee < ActiveRecord::Base calculated_adjustments + # Class name is mis-inferred outside of Spree namespace + has_one :calculator, as: :calculable, dependent: :destroy, class_name: 'Spree::Calculator' + + attr_accessible :enterprise_id, :fee_type, :name, :tax_category_id, :calculator_type, :inherits_tax_category FEE_TYPES = %w(packing transport admin sales fundraising)