diff --git a/app/models/spree/line_item_decorator.rb b/app/models/spree/line_item_decorator.rb index 08a723956d..ee4384b460 100644 --- a/app/models/spree/line_item_decorator.rb +++ b/app/models/spree/line_item_decorator.rb @@ -76,6 +76,10 @@ Spree::LineItem.class_eval do Spree::Money.new(included_tax, { :currency => currency }) end + def display_name + variant.display_name + end + def unit_value return 0 if quantity == 0 (final_weight_volume || 0) / quantity diff --git a/lib/open_food_network/variant_and_line_item_naming.rb b/lib/open_food_network/variant_and_line_item_naming.rb index 62ff91a4c3..2bf3a87d11 100644 --- a/lib/open_food_network/variant_and_line_item_naming.rb +++ b/lib/open_food_network/variant_and_line_item_naming.rb @@ -22,15 +22,15 @@ module OpenFoodNetwork # Bread - Spelt Sourdough, 1kg # if display_name is "Spelt Sourdough, 1kg" # Bread - 1kg Spelt Sourdough # if unit_to_display is "1kg Spelt Sourdough" # Bread - Spelt Sourdough (1kg) # if display_name is "Spelt Sourdough" and unit_to_display is "1kg" - def full_name - return unit_to_display if !self.has_attribute?(:display_name) || display_name.blank? + def full_name + return unit_to_display if display_name.blank? return display_name if display_name.downcase.include? unit_to_display.downcase return unit_to_display if unit_to_display.downcase.include? display_name.downcase "#{display_name} (#{unit_to_display})" end def name_to_display - return product.name if !self.has_attribute?(:display_name) || display_name.blank? + return product.name if display_name.blank? display_name end