From 45fd479ade3da5eaaa82074a2660ae3a4046072a Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 31 Jul 2014 09:35:21 +1000 Subject: [PATCH] WIP: Call create_order_adjustments_for on EnterpriseFeeCalculator --- app/models/spree/order_decorator.rb | 4 +++- spec/models/spree/order_spec.rb | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 7cd5967f6e..fcc6054f3b 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -142,7 +142,9 @@ Spree::Order.class_eval do end end - order_cycle.create_order_adjustments_for self if order_cycle + if order_cycle + OpenFoodNetwork::EnterpriseFeeCalculator.new.create_order_adjustments_for self + end end def set_variant_attributes(variant, attributes) diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index e477e68e0e..085ee615c6 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -85,7 +85,7 @@ describe Spree::Order do OpenFoodNetwork::EnterpriseFeeCalculator.any_instance. should_receive(:create_line_item_adjustments_for). with(line_item) - order_cycle.stub(:create_order_adjustments_for) + OpenFoodNetwork::EnterpriseFeeCalculator.any_instance.stub(:create_order_adjustments_for) subject.stub(:order_cycle) { order_cycle } subject.update_distribution_charge! @@ -96,7 +96,10 @@ describe Spree::Order do subject.stub(:line_items) { [] } order_cycle = double(:order_cycle) - order_cycle.should_receive(:create_order_adjustments_for).with(subject) + OpenFoodNetwork::EnterpriseFeeCalculator.any_instance. + should_receive(:create_order_adjustments_for). + with(subject) + subject.stub(:order_cycle) { order_cycle } subject.update_distribution_charge!