raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Rob Harrington
2015-10-08 14:50:41 +11:00
parent cdb0c2db33
commit ab7bfd10c5
25 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
View File

@@ -92,6 +92,6 @@ describe 'Cart service', ->
variant =
product_name: 'product_name'
name_to_display: 'name_to_display'
unit_text: 'unit_text'
options_text: 'options_text'
expect(Cart.extendedVariantName(variant)).toEqual "product_name - name_to_display (unit_text)"
expect(Cart.extendedVariantName(variant)).toEqual "product_name - name_to_display (options_text)"