From 202f95a8fc33606eddc238f4dad8897b29690d9a Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 6 Feb 2014 17:14:14 +1100 Subject: [PATCH] Fix for broken percentage Enterprise Fees in place, no test yet --- app/models/order_cycle.rb | 4 ++-- spec/models/order_cycle_spec.rb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 39fed33674..d710befc10 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -147,7 +147,8 @@ class OrderCycle < ActiveRecord::Base enterprise_fees_for(variant, distributor).sum do |fee| # Spree's Calculator interface accepts Orders or LineItems, # so we meet that interface with a struct. - line_item = OpenStruct.new variant: variant, quantity: 1 + # Amount is faked, this is a method on LineItem + line_item = OpenStruct.new variant: variant, quantity: 1, amount: (variant.price) fee[:enterprise_fee].compute_amount(line_item) end end @@ -159,7 +160,6 @@ class OrderCycle < ActiveRecord::Base enterprise_fees_for(variant, distributor).each { |fee| create_adjustment_for_fee line_item, fee[:enterprise_fee], fee[:label], fee[:role] } end - private # -- Fees diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb index d5ee190efa..20b6da2feb 100644 --- a/spec/models/order_cycle_spec.rb +++ b/spec/models/order_cycle_spec.rb @@ -323,6 +323,9 @@ describe OrderCycle do order_cycle.fees_for(product.master, distributor).should == 23 end + + + it "sums percentage fees for the variant" end describe "creating adjustments for a line item" do