diff --git a/app/views/ordering/order.rhtml b/app/views/ordering/order.rhtml index aa8d3b1f..aba5d960 100644 --- a/app/views/ordering/order.rhtml +++ b/app/views/ordering/order.rhtml @@ -12,7 +12,8 @@ Name Preis - Fehlende Einheiten + Einheit + Fehlende Einheiten Menge <% if not @order.stockit? -%> Toleranz @@ -43,12 +44,17 @@ <%= order_article.article.name %> <%=h order_article.article.origin %> <%= number_to_currency(@price[i]) %> - <%= if @order.stockit? + <%= order_article.article.unit %> + + + <%= if @order.stockit? order_article.article.quantity_available else missing_units = @unit[i] - (((@quantity[i] + @others_quantity[i]) % @unit[i]) + @tolerance[i] + @others_tolerance[i]) missing_units < 0 ? 0 : missing_units - end%> + end %> + + " value="<%= @quantity[i] %>" size="2" /> <%= @used_quantity[i] %> + diff --git a/app/views/ordering/stock_order.html.haml b/app/views/ordering/stock_order.html.haml index dc0ba3fd..4f70b45b 100644 --- a/app/views/ordering/stock_order.html.haml +++ b/app/views/ordering/stock_order.html.haml @@ -1,6 +1,6 @@ = render :partial => 'order_head' -.single_column{:style => 'clear:both'} +.single_column{:style => 'clear:both;margin-bottom:7em;'} - form_tag(:action => 'saveOrder', :id => @order) do .box_title %h2 Anderer Bestellungen diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 2707e4fc..6f073a50 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -401,7 +401,7 @@ table#order { -webkit-border-radius: 3px; padding: 0; } table#order th#col_required, table#order th#col_tolerance { - width: 165px; } + width: 140px; } table#order th#col_packages, table#order th#col_left_units { width: 50px; } table#order td.quantity, table#order td.tolerance { @@ -455,6 +455,10 @@ table#order { margin: 0; margin-bottom: 5px; width: 100%; } + .article-info .right { + width: 35%; } + .article-info .left { + width: 60%; } tr.order-article .article-info { display: none; } diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index c28cbad2..acafac47 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -401,7 +401,7 @@ table#order { -webkit-border-radius: 3px; padding: 0; } table#order th#col_required, table#order th#col_tolerance { - width: 165px; } + width: 140px; } table#order th#col_packages, table#order th#col_left_units { width: 50px; } table#order td.quantity, table#order td.tolerance { @@ -455,6 +455,10 @@ table#order { margin: 0; margin-bottom: 5px; width: 100%; } + .article-info .right { + width: 35%; } + .article-info .left { + width: 60%; } tr.order-article .article-info { display: none; } diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index 29de72d5..cf223be7 100644 --- a/public/stylesheets/sass/main.sass +++ b/public/stylesheets/sass/main.sass @@ -439,7 +439,7 @@ table#order -webkit-border-radius: 3px padding: 0 th#col_required, th#col_tolerance - :width 165px + :width 140px th#col_packages, th#col_left_units :width 50px td.quantity, td.tolerance @@ -492,6 +492,10 @@ table#order margin: 0 margin-bottom: 5px width: 100% + .right + width: 35% + .left + width: 60% tr.order-article .article-info display: none tr.order-article:hover .article-info