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

do not show units fields in receive edit order article screen

Browse source
This commit is contained in:
wvengen 2014-01-03 13:54:02 +01:00
parent b800da9b9b
commit aa57cee96f
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,14 @@
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'} = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t '.title' %h3= t '.title'
.modal-body .modal-body
.fold-line - unless params[:without_units]
= form.input :units_to_order, label: 'Amount ordered', hint: '', input_html: {class: 'input-nano'} .fold-line
-#= form.input :units_billed, label: 'invoice', input_html: {class: 'input-nano'} = form.input :units_to_order, label: 'Amount ordered', hint: '', input_html: {class: 'input-nano'}
= form.input :units_received, label: 'received', input_html: {class: 'input-nano'} -#= form.input :units_billed, label: 'invoice', input_html: {class: 'input-nano'}
%p.help-block= t 'simple_form.hints.order_article.units_to_order' = form.input :units_received, label: 'received', input_html: {class: 'input-nano'}
%p.help-block= t 'simple_form.hints.order_article.units_to_order'
.foo{style: 'clear:both'} .foo{style: 'clear:both'}
= simple_fields_for :article, @order_article.article do |f| = simple_fields_for :article, @order_article.article do |f|
= f.input :name = f.input :name

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

@ -24,7 +24,7 @@
/ TODO add almost invisible text_field for entering single units / TODO add almost invisible text_field for entering single units
%td.units_delta %td.units_delta
%td %td
= link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-small' = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article, without_units: true), remote: true, class: 'btn btn-small'
- if order_article.result_manually_changed? - if order_article.result_manually_changed?
= button_tag nil, class: 'btn btn-small unlocker', title: t('.locked_to_protect_unlock_button') do = button_tag nil, class: 'btn btn-small unlocker', title: t('.locked_to_protect_unlock_button') do
%i.icon-unlock %i.icon-unlock