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

Complete I18n of current receive screen

Browse source
This commit is contained in:
Julius 2014-01-08 00:06:25 +01:00
parent d7c771d10a
commit 563993fffa
5 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/orders_helper.rb
View file

@ -20,9 +20,9 @@ module OrdersHelper
if order_article.order.open?
nil
else
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?
units_info = "#{order_article.units_to_order} #{heading_helper OrderArticle, :units_to_order}"
units_info += ", #{order_article.units_billed} #{heading_helper OrderArticle, :units_billed}" unless order_article.units_billed.nil?
units_info += ", #{order_article.units_received} #{heading_helper OrderArticle, :units_received}" unless order_article.units_received.nil?
end
end

4
app/views/order_articles/_edit.html.haml
View file

@ -7,9 +7,9 @@
= hidden_field_tag :without_units, true
- else
.fold-line
= form.input :units_to_order, label: 'Amount ordered', hint: '', input_html: {class: 'input-nano'}
= form.input :units_to_order, hint: '', input_html: {class: 'input-nano'}
-#= form.input :units_billed, label: 'invoice', input_html: {class: 'input-nano'}
= form.input :units_received, label: 'received', input_html: {class: 'input-nano'}
= form.input :units_received, input_html: {class: 'input-nano'}
%p.help-block= t 'simple_form.hints.order_article.units_to_order'
.foo{style: 'clear:both'}

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

@ -73,10 +73,10 @@
%th.default-sort.sort{:data => {:sort => 'string'}}= heading_helper Article, :name
%th= heading_helper Article, :unit
%th= heading_helper Article, :price
%th= t '.members' # TODO: find term for this
%th Ordered
%th= heading_helper OrderArticle, :units_to_order, short: true
%th= heading_helper OrderArticle, :quantity, short: true
-#%th Invoice # TODO implement invoice screen
%th= heading_helper OrderArticle, :units_received
%th= heading_helper OrderArticle, :units_received, short: true
%th
%th= t 'ui.actions'
%tfoot