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

Merge pull request #8585 from openfoodfoundation/revert-8500-8495-Variant-unit-name-shopfront

Browse Source 
Revert "Fixed inconsistency with display of unit name for products sold by item"
This commit is contained in:
Matt-Yorkley
2021-12-07 13:24:38 +00:00
committed by GitHub
parent 2233c7ae0f 290e292dea
commit 0197831246
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/variant_units/variant_and_line_item_naming.rb
View File

@@ -71,8 +71,6 @@ module VariantUnits
return variant.display_as if variant_display_as?
return product.variant_unit_name if product.variant_unit_scale.nil?
options_text
end

7
spec/models/spree/variant_spec.rb
View File

@@ -594,13 +594,6 @@ module Spree
expect(v.unit_to_display).to eq("ponies")
expect(v1.unit_to_display).to eq("ponies")
end
it "displays variant unit name if no unit scale" do
p = create(:simple_product, variant_unit: 'items', variant_unit_scale: nil, variant_unit_name: 'items_unit')
v = build_stubbed(:variant, product: p)
expect(v.unit_to_display).to eq("items_unit")
end
end
describe "setting the variant's weight from the unit value" do