ui update for packages display

This commit is contained in:
wvengen 2014-01-03 12:42:36 +01:00
parent 4c9e84ecc6
commit 9219d099c8
5 changed files with 29 additions and 16 deletions

View file

@ -4,7 +4,7 @@
%th= sort_link_helper Article.model_name.human, "name"
%th= sort_link_helper Article.human_attribute_name(:order_number_short), "order_number"
%th= t('.amount')
%th= heading_helper Article, :units
%th= heading_helper Article, :unit
%th= t('.net')
%th= t('.gross')
%th= heading_helper Article, :tax

View file

@ -3,10 +3,10 @@
%td= order_article.article.order_number
%td{title: units_history_line(order_article)}
= order_article.units
%i.package pkg
= pkg_helper order_article.article_price
- if s=order_article.ordered_quantities_different_from_group_orders?
%span{:style => "color:red;font-weight: bold"}= s
%td #{order_article.price.unit_quantity} × #{order_article.article.unit}
%td #{order_article.article.unit}
%td
= number_to_currency(order_article.price.price, :unit => "")
:plain

View file

@ -2,7 +2,7 @@
%thead
%tr
%th= heading_helper Article, :name
%th= heading_helper Article, :units
%th= heading_helper Article, :unit
%th= t '.prices'
- if order.stockit?
%th= t '.units_ordered'
@ -27,8 +27,10 @@
- cssclass = (units > 0 ? 'used' : (order_article.quantity > 0 ? 'unused' : 'unavailable'))
%tr{:class => cycle('even', 'odd', :name => 'articles') + ' ' + cssclass}
%td=h order_article.article.name
%td #{unit_quantity} × #{order_article.article.unit}
%td= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}"
%td= order_article.article.unit
%td
= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}"
= article_price_change_hint(order_article, gross: true)
- if order.stockit?
%td= units
- else
@ -38,7 +40,7 @@
%td= "#{order_article.quantity}"
%td{title: units_history_line(order_article)}
= units
%i.package pkg
= pkg_helper order_article.price
%p
= t '.prices_sum'
= "#{number_to_currency(total_net)} / #{number_to_currency(total_gross)}"