From 8a420437017a675757be76c8e7b36c2340781263 Mon Sep 17 00:00:00 2001 From: "Nihal M. Kelanthodika" Date: Thu, 18 Nov 2021 12:30:30 +0530 Subject: [PATCH 1/2] Fixed inconsistency with display of unit name for products sold by item --- app/services/variant_units/variant_and_line_item_naming.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/variant_units/variant_and_line_item_naming.rb b/app/services/variant_units/variant_and_line_item_naming.rb index 9980abe083..4e4837cfa1 100644 --- a/app/services/variant_units/variant_and_line_item_naming.rb +++ b/app/services/variant_units/variant_and_line_item_naming.rb @@ -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 From aefb580023e61acf1d85b0836b8be6c53affd4b7 Mon Sep 17 00:00:00 2001 From: "Nihal M. Kelanthodika" Date: Fri, 19 Nov 2021 13:47:57 +0530 Subject: [PATCH 2/2] Update unit_to_display spec --- spec/models/spree/variant_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/models/spree/variant_spec.rb b/spec/models/spree/variant_spec.rb index 548f82e1d8..f04172c434 100644 --- a/spec/models/spree/variant_spec.rb +++ b/spec/models/spree/variant_spec.rb @@ -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