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

update balancing screen

Browse source
This commit is contained in:
wvengen 2013-12-18 22:08:02 +01:00
parent 873a1ff108
commit 84fe791078
7 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/orders/_articles.html.haml
View file

@ -36,11 +36,7 @@
%td= "#{order_article.quantity} + #{order_article.tolerance}"
- else
%td= "#{order_article.quantity}"
- unless order.open?
- units_info = "#{order_article.units_to_order} ordered"
- units_info += ", #{order_article.units_billed} billed" unless order_article.units_billed.nil?
- units_info += ", #{order_article.units_received} received" unless order_article.units_received.nil?
%td{title: units_info}
%td{title: units_history_line(order_article)}
= units
%i.package pkg
%p

2
app/views/orders/index.html.haml
View file

@ -54,7 +54,7 @@
%td= truncate(order.note)
%td
-# TODO btn-success class only if not received before
= link_to t('.receive'), receive_order_path(order), class: 'btn btn-small btn-success'
= link_to t('.action_receive'), receive_order_path(order), class: 'btn btn-small btn-success'
%td
= link_to t('ui.edit'), '#', class: 'btn btn-small disabled'

2
app/views/orders/show.html.haml
View file

@ -33,7 +33,7 @@
confirm: t('.confirm_end', order: @order.name)
- elsif not @order.closed?
-# TODO btn-success class only if not received before
= link_to t('orders.index.receive'), receive_order_path(@order), class: 'btn btn-success'
= link_to t('orders.index.action_receive'), receive_order_path(@order), class: 'btn btn-success'
- unless @order.closed?
= link_to t('ui.delete'), @order, confirm: t('.confirm_delete'), method: :delete,
class: 'btn btn-danger'