raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle the case where we're viewing a product from a remote distributor that we can change to

Browse Source
This commit is contained in:
Rohan Mitchell
2013-04-05 10:28:08 +11:00
parent c681750698
commit 7cc24f7340
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/spree/products/_add_to_cart.html.haml
View File

@@ -26,9 +26,12 @@
- if available_distributors.length > 1
%div Distributor for your order:
= select_tag "distributor_id", options_from_collection_for_select(available_distributors, "id", "name", current_distributor.andand.id)
- elsif !@product.distributors.include? order.distributor
= hidden_field_tag "distributor_id", available_distributors.first.id
.distributor-fixed= "Your distributor for this order will be changed to #{available_distributors.first.name} if you add this product to your cart."
- else
= hidden_field_tag "distributor_id", order.distributor.id
.distributor-fixed= "Your distributor for this order is #{order.distributor.name}"
%br
= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do
= t(:add_to_cart)
= t(:add_to_cart)

15
spec/features/consumer/browse_products_spec.rb
View File

@@ -8,15 +8,14 @@ feature %q{
include AuthenticationWorkflow
include WebHelper
context "when a distributor is selected" do
describe "selecting a distributor" do
it "displays the distributor's details" do
# Given a distributor with a product
d = create(:distributor_enterprise, :name => 'Melb Uni Co-op', :description => '<p>Hello, world!</p>')
create(:product, :distributors => [d])
# When I select the distributor
visit spree.root_path
click_link d.name
visit spree.select_distributor_order_path(d)
# Then I should see the name of the distributor that I've selected
page.should have_selector 'h2', :text => 'Melb Uni Co-op'
@@ -118,15 +117,13 @@ feature %q{
create(:product, :distributors => [distributor_no_product])
# When we select the distributor without the product and then view the product
visit spree.select_distributor_order_path(distributor_no_product)
visit spree.root_path
click_link distributor_no_product.name
visit spree.product_path(product)
# Then we should see a choice of distributor,
# with no default and no option for the distributor that the product does not belong to
page.should have_selector "select#distributor_id option", :text => distributor_product.name
page.should_not have_selector "select#distributor_id option", :text => distributor_no_product.name
page.should_not have_selector "select#distributor_id option[selected='selected']"
# Then we should be told that our distributor will be set to the one with the product
page.should_not have_selector "select#distributor_id"
page.should have_content "our distributor for this order will be changed to #{distributor_product.name} if you add this product to your cart."
end
end
end