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

fix order article add + test

Browse source
This commit is contained in:
wvengen 2014-02-24 11:37:06 +01:00
parent 775137f7c0
commit f8fca4d630
4 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/helpers/order_articles_helper.rb
View file

@ -1,19 +1,8 @@
module OrderArticlesHelper
def new_order_articles_collection(&block)
if @order.stockit?
articles = StockArticle.undeleted.reorder('articles.name')
else
articles = @order.supplier.articles.undeleted.reorder('articles.name')
end
unless block_given?
block = Proc.new do |a|
pkg_info = pkg_helper(a, plain: true)
a.name + ' ' +
"(#{a.unit}" +
(pkg_info.blank? ? '' : " #{pkg_info}") + ")"
end
end
articles.map {|a| block.call(a)}
def article_label_with_unit(article)
pkg_info = pkg_helper(article, plain: true)
"#{article.name} (#{[article.unit, pkg_info].reject(&:blank?).join(' ')})"
end
end