raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename method

Browse Source
This commit is contained in:
Rohan Mitchell
2014-02-21 15:49:10 +11:00
parent 08009d4020
commit da8a8e8a1a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/order_cycle.rb
View File

@@ -146,7 +146,7 @@ class OrderCycle < ActiveRecord::Base
# -- Fees
def fees_for(variant, distributor)
enterprise_fees_for(variant, distributor).sum do |applicator|
per_item_enterprise_fee_applicators_for(variant, distributor).sum do |applicator|
# Spree's Calculator interface accepts Orders or LineItems,
# so we meet that interface with a struct.
# Amount is faked, this is a method on LineItem
@@ -159,13 +159,13 @@ class OrderCycle < ActiveRecord::Base
variant = line_item.variant
distributor = line_item.order.distributor
enterprise_fees_for(variant, distributor).each { |applicator| applicator.create_line_item_adjustment(line_item) }
per_item_enterprise_fee_applicators_for(variant, distributor).each { |applicator| applicator.create_line_item_adjustment(line_item) }
end
private
# -- Fees
def enterprise_fees_for(variant, distributor)
def per_item_enterprise_fee_applicators_for(variant, distributor)
fees = []
exchanges_carrying(variant, distributor).each do |exchange|

4
spec/models/order_cycle_spec.rb
View File

@@ -350,7 +350,7 @@ describe OrderCycle do
it "creates adjustment for each fee" do
applicator = double(:enterprise_fee_applicator)
applicator.should_receive(:create_line_item_adjustment).with(line_item)
oc.should_receive(:enterprise_fees_for).with(variant, distributor) { [applicator] }
oc.should_receive(:per_item_enterprise_fee_applicators_for).with(variant, distributor) { [applicator] }
oc.send(:create_adjustments_for, line_item)
end
@@ -366,7 +366,7 @@ describe OrderCycle do
oc.stub(:exchanges_carrying) { [incoming_exchange, outgoing_exchange] }
oc.stub(:coordinator_fees) { [ef3] }
oc.send(:enterprise_fees_for, line_item.variant, distributor).should ==
oc.send(:per_item_enterprise_fee_applicators_for, line_item.variant, distributor).should ==
[OpenFoodNetwork::EnterpriseFeeApplicator.new(ef1, line_item.variant, 'supplier'),
OpenFoodNetwork::EnterpriseFeeApplicator.new(ef2, line_item.variant, 'distributor'),
OpenFoodNetwork::EnterpriseFeeApplicator.new(ef3, line_item.variant, 'coordinator')]