Add ordergroup_name to GroupOrder

This commit is contained in:
Patrick Gansterer 2016-02-25 02:08:04 +01:00 committed by wvengen
parent 9c4d9d5c20
commit b8010fedca
7 changed files with 9 additions and 9 deletions

View file

@ -17,7 +17,7 @@ class OrderByArticles < OrderPdf
rows = []
dimrows = []
for goa in order_article.group_order_articles.ordered
rows << [goa.group_order.ordergroup.name,
rows << [goa.group_order.ordergroup_name,
"#{goa.quantity} + #{goa.tolerance}",
goa.result,
number_to_currency(goa.total_price(order_article))]

View file

@ -2,7 +2,7 @@
class OrderMatrix < OrderPdf
MAX_ARTICLES_PER_PAGE = 16 # How many order_articles shoud written on a page
def filename
I18n.t('documents.order_matrix.filename', :name => @order.name, :date => @order.ends.to_date) + '.pdf'
end
@ -62,7 +62,7 @@ class OrderMatrix < OrderPdf
@order.group_orders.includes(:ordergroup).each do |group_order|
group_result = [group_order.ordergroup.name.truncate(20)]
group_result = [group_order.ordergroup_name.truncate(20)]
for order_article in current_order_articles
# get the Ordergroup result for this order_article