raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not charge for distributor fees for a distributor you're not checking out with

Browse Source
This commit is contained in:
Rohan Mitchell
2013-08-19 10:06:26 +10:00
parent 7a75898b2b
commit 80d6e3b87f
3 changed files with 127 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/order_cycle.rb
View File

@@ -78,7 +78,7 @@ class OrderCycle < ActiveRecord::Base
# If there are multiple distributors with this variant, won't this mean that we get a fee charged for each of them?
# We just want the one matching line_item.order.distributor
exchanges_carrying(line_item.variant).each do |exchange|
exchanges_carrying(line_item).each do |exchange|
exchange.enterprise_fees.each do |enterprise_fee|
role = exchange.incoming? ? 'supplier' : 'distributor'
fees << {enterprise_fee: enterprise_fee,
@@ -105,7 +105,10 @@ class OrderCycle < ActiveRecord::Base
"#{line_item.variant.product.name} - #{enterprise_fee.fee_type} fee by #{role} #{enterprise_fee.enterprise.name}"
end
def exchanges_carrying(variant)
exchanges.with_variant(variant)
def exchanges_carrying(line_item)
coordinator = line_item.order.order_cycle.coordinator
distributor = line_item.order.distributor
exchanges.to_enterprises([coordinator, distributor]).with_variant(line_item.variant)
end
end

24
spec/factories.rb
View File

@@ -7,16 +7,22 @@ FactoryGirl.define do
after(:create) do |oc|
# Suppliers
ex1 = create(:exchange, :order_cycle => oc, :receiver => oc.coordinator)
ex2 = create(:exchange, :order_cycle => oc, :receiver => oc.coordinator)
ex1 = create(:exchange, :order_cycle => oc,
:sender => create(:supplier_enterprise), :receiver => oc.coordinator)
ex2 = create(:exchange, :order_cycle => oc,
:sender => create(:supplier_enterprise), :receiver => oc.coordinator)
ExchangeFee.create!(exchange: ex1,
enterprise_fee: create(:enterprise_fee, enterprise: ex1.sender))
ExchangeFee.create!(exchange: ex2,
enterprise_fee: create(:enterprise_fee, enterprise: ex2.sender))
# Distributors
ex3 = create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 0', :pickup_instructions => 'instructions 0')
ex4 = create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 1', :pickup_instructions => 'instructions 1')
ex3 = create(:exchange, :order_cycle => oc,
:sender => oc.coordinator, :receiver => create(:distributor_enterprise),
:pickup_time => 'time 0', :pickup_instructions => 'instructions 0')
ex4 = create(:exchange, :order_cycle => oc,
:sender => oc.coordinator, :receiver => create(:distributor_enterprise),
:pickup_time => 'time 1', :pickup_instructions => 'instructions 1')
ExchangeFee.create!(exchange: ex3,
enterprise_fee: create(:enterprise_fee, enterprise: ex3.receiver))
ExchangeFee.create!(exchange: ex4,
@@ -30,6 +36,11 @@ FactoryGirl.define do
exchange.variants << product.master
end
variants = [ex1, ex2].map(&:variants).flatten
[ex3, ex4].each do |exchange|
variants.each { |v| exchange.variants << v }
end
end
end
@@ -84,12 +95,13 @@ FactoryGirl.define do
is_distributor true
end
sequence(:calculator_amount)
factory :enterprise_fee, :class => EnterpriseFee do
sequence(:name) { |n| "Enterprise fee #{n}" }
sequence(:fee_type) { |n| EnterpriseFee::FEE_TYPES[n % EnterpriseFee::FEE_TYPES.count] }
enterprise { Enterprise.first || FactoryGirl.create(:supplier_enterprise) }
fee_type 'packing'
calculator { FactoryGirl.build(:weight_calculator) }
calculator { FactoryGirl.build(:calculator, preferred_amount: generate(:calculator_amount)) }
after(:create) { |ef| ef.calculator.save! }
end

106
spec/features/consumer/checkout_spec.rb
View File

@@ -18,6 +18,8 @@ feature %q{
end
background do
set_feature_toggle :order_cycles, true
@distributor = create(:distributor_enterprise, :name => 'Edible garden',
:address => create(:address,
:address1 => '12 Bungee Rd',
@@ -37,11 +39,11 @@ feature %q{
:country => Spree::Country.find_by_name('Australia')),
:pickup_times => 'Tuesday, 4 PM')
@enterprise_fee_1 = create(:enterprise_fee, :name => 'Shipping Method One', :calculator => Spree::Calculator::FlatRate.new)
@enterprise_fee_1 = create(:enterprise_fee, :name => 'Enterprise Fee One', :calculator => Spree::Calculator::FlatRate.new)
@enterprise_fee_1.calculator.set_preference :amount, 1
@enterprise_fee_1.calculator.save!
@enterprise_fee_2 = create(:enterprise_fee, :name => 'Shipping Method Two', :calculator => Spree::Calculator::FlatRate.new)
@enterprise_fee_2 = create(:enterprise_fee, :name => 'Enterprise Fee Two', :calculator => Spree::Calculator::FlatRate.new)
@enterprise_fee_2.calculator.set_preference :amount, 2
@enterprise_fee_2.calculator.save!
@@ -53,6 +55,7 @@ feature %q{
@product_2.product_distributions.create(:distributor => @distributor, :enterprise_fee => @enterprise_fee_2)
@product_2.product_distributions.create(:distributor => @distributor_alternative, :enterprise_fee => @enterprise_fee_2)
# -- Shipping
@zone = create(:zone)
c = Spree::Country.find_by_name('Australia')
Spree::ZoneMember.create(:zoneable => c, :zone => @zone)
@@ -85,7 +88,46 @@ feature %q{
page.should have_selector 'span.distribution-total', :text => '$3.00'
end
#scenario "viewing delivery fees for order cycle distribution"
scenario "viewing delivery fees for order cycle distribution" do
# Given an order cycle
make_order_cycle
# And I am logged in
login_to_consumer_section
# When I add some bananas and zucchini to my cart
click_link 'Bananas'
select @distributor_oc.name, :from => 'distributor_id'
select @order_cycle.name, :from => 'order_cycle_id'
click_button 'Add To Cart'
click_link 'Continue shopping'
click_link 'Zucchini'
click_button 'Add To Cart'
# Then I should see a breakdown of my delivery fees:
table = page.find 'tbody#cart_adjustments'
rows = table.all 'tr'
binding.pry
rows.map { |row| row.all('td').map { |cell| cell.text.strip } }.should ==
[["Bananas - packing fee by supplier Supplier 1", "$3.00", ""],
["Bananas - transport fee by supplier Supplier 1", "$4.00", ""],
["Bananas - packing fee by distributor Distributor 1", "$7.00", ""],
["Bananas - transport fee by distributor Distributor 1", "$8.00", ""],
["Bananas - admin fee by coordinator My coordinator", "$1.00", ""],
["Bananas - sales fee by coordinator My coordinator", "$2.00", ""],
["Zucchini - admin fee by supplier Supplier 2", "$5.00", ""],
["Zucchini - sales fee by supplier Supplier 2", "$6.00", ""],
["Zucchini - packing fee by distributor Distributor 1", "$7.00", ""],
["Zucchini - transport fee by distributor Distributor 1", "$8.00", ""],
["Zucchini - admin fee by coordinator My coordinator", "$1.00", ""],
["Zucchini - sales fee by coordinator My coordinator", "$2.00", ""]]
page.should have_selector 'span.distribution-total', :text => '$54.00'
end
#scenario "viewing delivery fees for mixed product and order cycle distribution"
scenario "changing distributor updates delivery fees" do
@@ -216,4 +258,62 @@ feature %q{
# page.should have_content('On Tuesday, 4 PM')
# page.should have_content('12 Bungee Rd, Carion')
end
private
def make_order_cycle
@order_cycle = oc = create(:simple_order_cycle, coordinator: create(:distributor_enterprise, name: 'My coordinator'))
# Coordinator
coordinator_fee1 = create(:enterprise_fee, enterprise: oc.coordinator, fee_type: 'admin')
coordinator_fee2 = create(:enterprise_fee, enterprise: oc.coordinator, fee_type: 'sales')
oc.coordinator_fees << coordinator_fee1
oc.coordinator_fees << coordinator_fee2
# Suppliers
supplier1 = create(:supplier_enterprise, name: 'Supplier 1')
supplier2 = create(:supplier_enterprise, name: 'Supplier 2')
supplier_fee1 = create(:enterprise_fee, enterprise: supplier1, fee_type: 'packing')
supplier_fee2 = create(:enterprise_fee, enterprise: supplier1, fee_type: 'transport')
supplier_fee3 = create(:enterprise_fee, enterprise: supplier2, fee_type: 'admin')
supplier_fee4 = create(:enterprise_fee, enterprise: supplier2, fee_type: 'sales')
ex1 = create(:exchange, order_cycle: oc, sender: supplier1, receiver: oc.coordinator)
ex2 = create(:exchange, order_cycle: oc, sender: supplier2, receiver: oc.coordinator)
ExchangeFee.create!(exchange: ex1, enterprise_fee: supplier_fee1)
ExchangeFee.create!(exchange: ex1, enterprise_fee: supplier_fee2)
ExchangeFee.create!(exchange: ex2, enterprise_fee: supplier_fee3)
ExchangeFee.create!(exchange: ex2, enterprise_fee: supplier_fee4)
# Distributors
distributor1 = create(:distributor_enterprise, name: 'Distributor 1')
distributor2 = create(:distributor_enterprise, name: 'Distributor 2')
distributor_fee1 = create(:enterprise_fee, enterprise: distributor1, fee_type: 'packing')
distributor_fee2 = create(:enterprise_fee, enterprise: distributor1, fee_type: 'transport')
distributor_fee3 = create(:enterprise_fee, enterprise: distributor2, fee_type: 'admin')
distributor_fee4 = create(:enterprise_fee, enterprise: distributor2, fee_type: 'sales')
ex3 = create(:exchange, order_cycle: oc,
sender: oc.coordinator, receiver: distributor1,
pickup_time: 'time 0', pickup_instructions: 'instructions 0')
ex4 = create(:exchange, order_cycle: oc,
sender: oc.coordinator, receiver: distributor2,
pickup_time: 'time 1', pickup_instructions: 'instructions 1')
ExchangeFee.create!(exchange: ex3, enterprise_fee: distributor_fee1)
ExchangeFee.create!(exchange: ex3, enterprise_fee: distributor_fee2)
ExchangeFee.create!(exchange: ex4, enterprise_fee: distributor_fee3)
ExchangeFee.create!(exchange: ex4, enterprise_fee: distributor_fee4)
# Products
@distributor_oc = distributor1
@product_3 = create(:simple_product, name: 'Bananas', supplier: supplier1)
ex1.variants << @product_3.master
ex3.variants << @product_3.master
ex4.variants << @product_3.master
@product_4 = create(:simple_product, name: 'Zucchini', supplier: supplier2)
ex2.variants << @product_4.master
ex3.variants << @product_4.master
ex4.variants << @product_4.master
end
end