Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

This reverts commit e86e08b72e939fee61eddd41d56081395666a877.

Conflicts:
	lib/open_food_network/order_and_distributor_report.rb
	spec/features/admin/variants_spec.rb
	spec/lib/open_food_network/order_and_distributor_report_spec.rb

lib/open_food_network/group_buy_report.rb

@@ -2,7 +2,7 @@ module OpenFoodNetwork
 
   GroupBuyVariantRow = Struct.new(:variant, :sum_quantities, :sum_max_quantities) do
     def to_row
-      [variant.product.supplier.name, variant.product.name, "UNITSIZE", variant.unit_text, variant.weight, sum_quantities, sum_max_quantities]
+      [variant.product.supplier.name, variant.product.name, "UNITSIZE", variant.options_text, variant.weight, sum_quantities, sum_max_quantities]
     end
   end
 
@@ -33,7 +33,7 @@ module OpenFoodNetwork
           variant_groups = line_items_by_product.group_by { |li| li.variant }
           variant_groups.each do |variant, line_items_by_variant|
             sum_quantities = line_items_by_variant.sum { |li| li.quantity }
-            sum_max_quantities = line_items_by_variant.sum { |li| li.max_quantity || 0 }
+            sum_max_quantities = line_items_by_variant.sum { |li| li.max_quantity || 0 } 
             variants_and_quantities << GroupBuyVariantRow.new(variant, sum_quantities, sum_max_quantities)
           end
 

lib/open_food_network/order_and_distributor_report.rb

@@ -20,7 +20,7 @@ module OpenFoodNetwork
         order.line_items.each do |line_item|
           order_and_distributor_details << [order.created_at, order.id,
             order.bill_address.full_name, order.email, order.bill_address.phone, order.bill_address.city,
-            line_item.product.sku, line_item.product.name, line_item.unit_text, line_item.quantity, line_item.max_quantity, line_item.price * line_item.quantity, line_item.distribution_fee,
+            line_item.product.sku, line_item.product.name, line_item.options_text, line_item.quantity, line_item.max_quantity, line_item.price * line_item.quantity, line_item.distribution_fee,
             order.payments.first.andand.payment_method.andand.name,
             order.distributor.andand.name, order.distributor.address.address1, order.distributor.address.city, order.distributor.address.zipcode, order.special_instructions ]
         end

lib/open_food_network/variant_and_line_item_naming.rb

@@ -8,7 +8,7 @@ module OpenFoodNetwork
   module VariantAndLineItemNaming
 
     # Copied and modified from Spree::Variant
-    def unit_text
+    def options_text
       values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
 
       values.map! &:presentation    # This line changed
@@ -35,7 +35,7 @@ module OpenFoodNetwork
     end
 
     def unit_to_display
-      return unit_text if !self.has_attribute?(:display_as) || display_as.blank?
+      return options_text if !self.has_attribute?(:display_as) || display_as.blank?
       display_as
     end