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

Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront

Browse Source
This commit is contained in:
Nihal M. Kelanthodika
2021-11-25 16:06:06 +05:30
committed by GitHub
parent 2f3d2952d0 aefb580023
commit 74b87adee3
2 changed files with 9 additions and 0 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,6 +71,8 @@ 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,6 +594,13 @@ 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