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

Do not add the product to cart if the chosen distributor is different from the order's distributor

Browse Source
This commit is contained in:
Rohan Mitchell
2012-06-24 20:14:07 +10:00
parent 4481ca83f9
commit df831a9128
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/orders_controller_decorator.rb
View File

@@ -2,7 +2,7 @@ Spree::OrdersController.class_eval do
before_filter :populate_order_distributor, :only => :populate
def populate_order_distributor
@distributor = Spree::Distributor.find params[:distributor_id]
@distributor = params.key?(:distributor_id) ? Spree::Distributor.find(params[:distributor_id]) : nil
if populate_valid? @distributor
order = current_order(true)

25
spec/controllers/orders_controller_spec.rb
View File

@@ -45,8 +45,8 @@ describe Spree::OrdersController do
# And the product is in the cart
spree_put :populate, :variants => {@product.id => 1}, :distributor_id => @distributor.id
current_order(false).line_items.map { |li| li.product }.should == [@product]
current_order(false).distributor.should == @distributor
current_order(false).line_items.reload.map { |li| li.product }.should == [@product]
current_order(false).distributor.reload.should == @distributor
end
it "does not add the product if the product is not available at the order's distributor" do
@@ -58,8 +58,8 @@ describe Spree::OrdersController do
spree_put :populate, :variants => {p2.id => 1}, :distributor_id => d2.id
# Then the product should not be added to the cart
current_order(false).line_items.map { |li| li.product }.should == [@product]
current_order(false).distributor.should == @distributor
current_order(false).line_items.reload.map { |li| li.product }.should == [@product]
current_order(false).distributor.reload.should == @distributor
end
it "does not add the product if the product is not available at the given distributor" do
@@ -71,10 +71,21 @@ describe Spree::OrdersController do
spree_put :populate, :variants => {p2.id => 1}, :distributor_id => @distributor.id
# Then the product should not be added to the cart
current_order(false).line_items.map { |li| li.product }.should == [@product]
current_order(false).distributor.should == @distributor
current_order(false).line_items.reload.map { |li| li.product }.should == [@product]
current_order(false).distributor.reload.should == @distributor
end
it "does not add the product if the chosen distributor is different from the order's distributor"
it "does not add the product if the chosen distributor is different from the order's distributor" do
# Given a product that's available at the chosen distributor and another distributor
d2 = create(:distributor)
p2 = create(:product, :distributors => [@distributor, d2])
# When I attempt to add the product to the cart with the alternate distributor
spree_put :populate, :variants => {p2.id => 1}, :distributor_id => d2
# Then the product should not be added to the cart
current_order(false).line_items.reload.map { |li| li.product }.should == [@product]
current_order(false).distributor.reload.should == @distributor
end
end
end