Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

proper history line

Browse source
This commit is contained in:
wvengen 2014-01-31 14:04:16 +01:00
parent 5e7925366d
commit 84e02b795c
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/helpers/orders_helper.rb
View file

@ -23,16 +23,17 @@ module OrdersHelper
if order_article.order.open?
nil
else
units_info = ''
units_info = []
[:units_to_order, :units_billed, :units_received].map do |unit|
if n = order_article.send(unit)
i18nkey = if units_info.blank? and options[:plain] then unit else "#{unit}_short" end
units_info += n.to_s + ' '
units_info += pkg_helper(order_article.price) + ' ' unless options[:plain] or n == 0
units_info += OrderArticle.human_attribute_name(i18nkey, count: n)
i18nkey = if units_info.empty? and options[:plain] then unit else "#{unit}_short" end
line = n.to_s + ' '
line += pkg_helper(order_article.price) + ' ' unless options[:plain] or n == 0
line += OrderArticle.human_attribute_name(i18nkey, count: n)
units_info << line
end
end
units_info.html_safe
units_info.join(', ').html_safe
end
end
@ -41,7 +42,7 @@ module OrdersHelper
# soft_uq: `true` to hide unit quantity specifier on small screens
# sensible in tables with multiple columns calling `pkg_helper`
def pkg_helper(article, options={})
return nil if not article or article.unit_quantity == 1
return '' if not article or article.unit_quantity == 1
uq_text = "&times; #{article.unit_quantity}".html_safe
uq_text = content_tag(:span, uq_text, class: 'hidden-phone') if options[:soft_uq]
if options[:icon].nil? or options[:icon]