proper history line
This commit is contained in:
parent
5e7925366d
commit
84e02b795c
1 changed files with 8 additions and 7 deletions
|
@ -23,16 +23,17 @@ module OrdersHelper
|
||||||
if order_article.order.open?
|
if order_article.order.open?
|
||||||
nil
|
nil
|
||||||
else
|
else
|
||||||
units_info = ''
|
units_info = []
|
||||||
[:units_to_order, :units_billed, :units_received].map do |unit|
|
[:units_to_order, :units_billed, :units_received].map do |unit|
|
||||||
if n = order_article.send(unit)
|
if n = order_article.send(unit)
|
||||||
i18nkey = if units_info.blank? and options[:plain] then unit else "#{unit}_short" end
|
i18nkey = if units_info.empty? and options[:plain] then unit else "#{unit}_short" end
|
||||||
units_info += n.to_s + ' '
|
line = n.to_s + ' '
|
||||||
units_info += pkg_helper(order_article.price) + ' ' unless options[:plain] or n == 0
|
line += pkg_helper(order_article.price) + ' ' unless options[:plain] or n == 0
|
||||||
units_info += OrderArticle.human_attribute_name(i18nkey, count: n)
|
line += OrderArticle.human_attribute_name(i18nkey, count: n)
|
||||||
|
units_info << line
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
units_info.html_safe
|
units_info.join(', ').html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -41,7 +42,7 @@ module OrdersHelper
|
||||||
# soft_uq: `true` to hide unit quantity specifier on small screens
|
# soft_uq: `true` to hide unit quantity specifier on small screens
|
||||||
# sensible in tables with multiple columns calling `pkg_helper`
|
# sensible in tables with multiple columns calling `pkg_helper`
|
||||||
def pkg_helper(article, options={})
|
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 = "× #{article.unit_quantity}".html_safe
|
uq_text = "× #{article.unit_quantity}".html_safe
|
||||||
uq_text = content_tag(:span, uq_text, class: 'hidden-phone') if options[:soft_uq]
|
uq_text = content_tag(:span, uq_text, class: 'hidden-phone') if options[:soft_uq]
|
||||||
if options[:icon].nil? or options[:icon]
|
if options[:icon].nil? or options[:icon]
|
||||||
|
|
Loading…
Reference in a new issue