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

Cosmetic change

Browse Source
This commit is contained in:
Rohan Mitchell
2014-12-17 14:02:30 +11:00
parent 2ea7bdbec6
commit 23c7715929
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/spree/variant_decorator.rb
View File

@@ -9,12 +9,12 @@ Spree::Variant.class_eval do
accepts_nested_attributes_for :images
validates_presence_of :unit_value,
if: -> v { %w(weight volume).include? v.product.andand.variant_unit },
unless: :is_master
if: -> v { %w(weight volume).include? v.product.andand.variant_unit },
unless: :is_master
validates_presence_of :unit_description,
if: -> v { v.product.andand.variant_unit.present? && v.unit_value.nil? },
unless: :is_master
if: -> v { v.product.andand.variant_unit.present? && v.unit_value.nil? },
unless: :is_master
before_validation :update_weight_from_unit_value, if: -> v { v.product.present? }
after_save :update_units

1
spec/features/consumer/shopping/shopping_spec.rb
View File

@@ -119,7 +119,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
page.should have_price "$53.00"
# Product price should be listed as the lesser of these
#page.should have_selector 'tr.product > td', text: "from $43.00"
page.should have_price "$43.00"
end
end