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

Merge price columns in receive form into one

Browse source 
Conflicts:
	app/views/orders/_edit_amount.html.haml
This commit is contained in:
Julius 2014-01-02 21:59:08 +01:00 • committed by wvengen
parent 0af8a065a1
commit f230d39055
3 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/orders_helper.rb
View file

@ -35,6 +35,11 @@ module OrdersHelper
end
end
def article_price_change_hint(order_article)
return nil if order_article.article.price == order_article.article_price.price
"<i class='icon icon-asterisk' title='#{j t('.old_price', default: 'Old price')}: #{number_to_currency order_article.article.price}'></i>".html_safe
end
def receive_input_field(form)
order_article = form.object
units_expected = (order_article.units_billed or order_article.units_to_order)