From 8fe355b6da110d4b7c81b09ab70595b8e7d9c4bb Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 31 Jul 2014 09:27:36 +1000 Subject: [PATCH] WIP: Call create_line_item_adjustments_for on EnterpriseFeeCalculator --- app/models/spree/order_decorator.rb | 5 +++-- spec/models/spree/order_spec.rb | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 4f2be99fa8..7cd5967f6e 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -1,5 +1,6 @@ -require 'open_food_network/feature_toggle' +require 'open_food_network/enterprise_fee_calculator' require 'open_food_network/distribution_change_validator' +require 'open_food_network/feature_toggle' ActiveSupport::Notifications.subscribe('spree.order.contents_changed') do |name, start, finish, id, payload| payload[:order].reload.update_distribution_charge! @@ -133,7 +134,7 @@ Spree::Order.class_eval do line_items.each do |line_item| if provided_by_order_cycle? line_item - order_cycle.create_line_item_adjustments_for line_item + OpenFoodNetwork::EnterpriseFeeCalculator.new.create_line_item_adjustments_for line_item else pd = product_distribution_for line_item diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 898a08d075..e477e68e0e 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -82,7 +82,9 @@ describe Spree::Order do subject.stub(:provided_by_order_cycle?) { true } order_cycle = double(:order_cycle) - order_cycle.should_receive(:create_line_item_adjustments_for).with(line_item) + OpenFoodNetwork::EnterpriseFeeCalculator.any_instance. + should_receive(:create_line_item_adjustments_for). + with(line_item) order_cycle.stub(:create_order_adjustments_for) subject.stub(:order_cycle) { order_cycle }