Fix current_order PDFs and update article/group PDFs too
This commit is contained in:
parent
dc731ee40d
commit
cb000a0438
4 changed files with 52 additions and 67 deletions
|
@ -20,13 +20,13 @@ class OrderByArticles < OrderPdf
|
|||
rows << [goa.group_order.ordergroup.name,
|
||||
"#{goa.quantity} + #{goa.tolerance}",
|
||||
goa.result,
|
||||
number_with_precision(order_article.price.fc_price * goa.result, precision: 2)]
|
||||
number_to_currency(goa.total_price(order_article))]
|
||||
dimrows << rows.length if goa.result == 0
|
||||
end
|
||||
next if rows.length == 0
|
||||
rows.unshift I18n.t('documents.order_by_articles.rows') # table header
|
||||
|
||||
text "#{order_article.article.name} (#{order_article.article.unit} | #{order_article.price.unit_quantity.to_s} | #{number_with_precision(order_article.price.fc_price, precision: 2)})",
|
||||
text "#{order_article.article.name} (#{order_article.article.unit} | #{order_article.price.unit_quantity.to_s} | #{number_to_currency(order_article.price.fc_price)})",
|
||||
style: :bold, size: fontsize(10)
|
||||
table rows, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
||||
table.column(0).width = 200
|
||||
|
@ -36,7 +36,10 @@ class OrderByArticles < OrderPdf
|
|||
table.cells.border_color = '666666'
|
||||
table.rows(0).border_bottom_width = 2
|
||||
# dim rows which were ordered but not received
|
||||
dimrows.each { |ri| table.row(ri).text_color = '999999' }
|
||||
dimrows.each do |ri|
|
||||
table.row(ri).text_color = '999999'
|
||||
table.row(ri).columns(0..-1).font_style = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -25,26 +25,30 @@ class OrderByGroups < OrderPdf
|
|||
sub_total = price * goa.result
|
||||
total += sub_total
|
||||
rows << [goa.order_article.article.name,
|
||||
"#{goa.quantity} + #{goa.tolerance}",
|
||||
goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : goa.quantity,
|
||||
goa.result,
|
||||
number_with_precision(price, precision: 2),
|
||||
number_to_currency(price),
|
||||
goa.order_article.price.unit_quantity,
|
||||
goa.order_article.article.unit,
|
||||
number_with_precision(sub_total, precision: 2)]
|
||||
number_to_currency(sub_total)]
|
||||
dimrows << rows.length if goa.result == 0
|
||||
end
|
||||
next if rows.length == 0
|
||||
rows << [ I18n.t('documents.order_by_groups.sum'), nil, nil, nil, nil, nil, number_with_precision(total, precision: 2)]
|
||||
rows << [ I18n.t('documents.order_by_groups.sum'), nil, nil, nil, nil, nil, number_to_currency(total)]
|
||||
rows.unshift I18n.t('documents.order_by_groups.rows') # Table Header
|
||||
|
||||
text group_order.ordergroup.name, size: fontsize(9), style: :bold
|
||||
table rows, width: 500, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
||||
# borders
|
||||
table.cells.borders = []
|
||||
table.row(0).borders = [:bottom]
|
||||
table.row(group_order_articles.size).borders = [:bottom]
|
||||
table.cells.border_width = 1
|
||||
table.cells.border_color = '666666'
|
||||
table.cells.borders = [:bottom]
|
||||
table.cells.border_width = 0.02
|
||||
table.cells.border_color = 'dddddd'
|
||||
table.rows(0).border_width = 1
|
||||
table.rows(0).border_color = '666666'
|
||||
table.rows(0).column(5).font_style = :bold
|
||||
table.row(rows.length-2).border_width = 1
|
||||
table.row(rows.length-2).border_color = '666666'
|
||||
table.row(rows.length-1).borders = []
|
||||
|
||||
table.column(0).width = 240
|
||||
table.column(2).font_style = :bold
|
||||
|
@ -53,7 +57,10 @@ class OrderByGroups < OrderPdf
|
|||
table.column(6).font_style = :bold
|
||||
|
||||
# dim rows which were ordered but not received
|
||||
dimrows.each { |ri| table.row(ri).text_color = '999999' }
|
||||
dimrows.each do |ri|
|
||||
table.row(ri).text_color = '999999'
|
||||
table.row(ri).columns(0..-1).font_style = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ class MultipleOrdersByArticles < OrderPdf
|
|||
@order_articles ||= OrderArticle.joins(:order, :article).where(:orders => {:id => @order}).ordered.reorder('orders.id, articles.name')
|
||||
end
|
||||
|
||||
# @todo refactor to reduce common code with order_by_articles
|
||||
def body
|
||||
order_articles.each do |order_article|
|
||||
down_or_page
|
||||
|
@ -22,31 +23,25 @@ class MultipleOrdersByArticles < OrderPdf
|
|||
dimrows = []
|
||||
has_units_str = ''
|
||||
for goa in order_article.group_order_articles.ordered
|
||||
units = result_in_units(goa, order_article.article)
|
||||
rows << [goa.group_order.ordergroup.name,
|
||||
goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : goa.quantity,
|
||||
goa.result,
|
||||
units,
|
||||
number_to_currency(goa.total_price(order_article))]
|
||||
dimrows << rows.length if goa.result == 0
|
||||
has_units_str = units.to_s if units.to_s.length > has_units_str.length # hack for prawn line-breaking units cell
|
||||
end
|
||||
next if rows.length == 0
|
||||
sum = order_article.group_orders_sum
|
||||
rows.unshift I18n.t('documents.order_by_articles.rows').dup # table header
|
||||
rows[0][2] = {content: rows[0][2], colspan: 2}
|
||||
|
||||
rows << [I18n.t('documents.order_by_groups.sum'),
|
||||
order_article.tolerance > 0 ? "#{order_article.quantity} + #{order_article.tolerance}" : order_article.quantity,
|
||||
sum[:quantity],
|
||||
result_in_units(sum[:quantity], order_article.article),
|
||||
nil] #number_to_currency(sum[:price])]
|
||||
|
||||
text "<b>#{order_article.article.name}</b> " +
|
||||
"(#{order_article.article.unit}; #{number_to_currency order_article.price.fc_price}; " +
|
||||
units_history_line(order_article, nil, plain: true) + ')',
|
||||
units_history_line(order_article, plain: true) + ')',
|
||||
size: fontsize(10), inline_format: true
|
||||
s = ::OrderByArticles.article_info(order_article.article) and text s, size: fontsize(8), inline_format: true
|
||||
table rows, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
||||
# borders
|
||||
table.cells.borders = [:bottom]
|
||||
|
@ -60,9 +55,8 @@ class MultipleOrdersByArticles < OrderPdf
|
|||
|
||||
table.column(0).width = 200
|
||||
table.columns(1..2).align = :center
|
||||
table.column(2..3).font_style = :bold
|
||||
table.columns(3).width = width_of(has_units_str)
|
||||
table.columns(3..4).align = :right
|
||||
table.column(2).font_style = :bold
|
||||
table.columns(3).align = :right
|
||||
|
||||
# dim rows which were ordered but not received
|
||||
dimrows.each { |ri| table.row(ri).text_color = '999999' }
|
||||
|
|
|
@ -18,12 +18,13 @@ class MultipleOrdersByGroups < OrderPdf
|
|||
@ordergroups
|
||||
end
|
||||
|
||||
# @todo refactor to reduce common code with order_by_groups
|
||||
def body
|
||||
# Start rendering
|
||||
ordergroups.each do |ordergroup|
|
||||
down_or_page 15
|
||||
|
||||
totals = {net_price: 0, deposit: 0, gross_price: 0, fc_price: 0, fc_markup_price: 0}
|
||||
total = 0
|
||||
taxes = Hash.new {0}
|
||||
rows = []
|
||||
dimrows = []
|
||||
|
@ -31,48 +32,35 @@ class MultipleOrdersByGroups < OrderPdf
|
|||
has_tolerance = group_order_articles.where('article_prices.unit_quantity > 1').any?
|
||||
|
||||
group_order_articles.each do |goa|
|
||||
price = goa.order_article.price
|
||||
goa_totals = goa.total_prices
|
||||
totals[:net_price] += goa_totals[:net_price]
|
||||
totals[:deposit] += goa_totals[:deposit]
|
||||
totals[:gross_price] += goa_totals[:gross_price]
|
||||
totals[:fc_price] += goa_totals[:price]
|
||||
totals[:fc_markup_price] += goa_totals[:fc_markup_price]
|
||||
taxes[goa.order_article.price.tax.to_f.round(2)] += goa_totals[:fc_tax_price]
|
||||
price = goa.order_article.price.fc_price
|
||||
sub_total = goa.total_price
|
||||
total += sub_total
|
||||
rows << [goa.order_article.article.name,
|
||||
goa.group_order.order.name.truncate(10, omission: ''),
|
||||
number_to_currency(price.fc_price(goa.group_order.ordergroup)),
|
||||
number_to_currency(price),
|
||||
goa.order_article.article.unit,
|
||||
goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : goa.quantity,
|
||||
goa.result,
|
||||
result_in_units(goa),
|
||||
number_to_currency(goa_totals[:price]),
|
||||
number_to_currency(sub_total),
|
||||
(goa.order_article.price.unit_quantity if has_tolerance)]
|
||||
dimrows << rows.length if goa.result == 0
|
||||
end
|
||||
next if rows.length == 0
|
||||
|
||||
# total
|
||||
rows << [{content: I18n.t('documents.order_by_groups.sum'), colspan: 7}, number_to_currency(totals[:fc_price]), nil]
|
||||
# price details
|
||||
price_details = []
|
||||
price_details << "#{Article.human_attribute_name :price} #{number_to_currency totals[:net_price]}" if totals[:net_price] > 0
|
||||
price_details << "#{Article.human_attribute_name :deposit} #{number_to_currency totals[:deposit]}" if totals[:deposit] > 0
|
||||
taxes.each do |tax, tax_price|
|
||||
price_details << "#{Article.human_attribute_name :tax} #{number_to_percentage tax} #{number_to_currency tax_price}" if tax_price > 0
|
||||
end
|
||||
price_details << "#{Article.human_attribute_name :fc_share_short} #{number_to_percentage ordergroup.markup_pct} #{number_to_currency totals[:fc_markup_price]}"
|
||||
rows << [{content: (' ' + price_details.join('; ') if totals[:fc_price] > 0), colspan: 8}]
|
||||
rows << [{content: I18n.t('documents.order_by_groups.sum'), colspan: 6}, number_to_currency(total), nil]
|
||||
|
||||
# table header
|
||||
rows.unshift I18n.t('documents.order_by_groups.rows').dup
|
||||
rows.first.insert(1, Article.human_attribute_name(:supplier))
|
||||
rows.first[5] = {content: rows.first[5], colspan: 2}
|
||||
if has_tolerance
|
||||
rows.first[-1] = {image: "#{Rails.root}/app/assets/images/package-bg.png", scale: 0.6, position: :center}
|
||||
else
|
||||
rows.first[-1] = nil
|
||||
end
|
||||
rows.unshift [
|
||||
OrderArticle.human_attribute_name(:article),
|
||||
Article.human_attribute_name(:supplier),
|
||||
I18n.t('documents.order_by_groups.rows')[3],
|
||||
Article.human_attribute_name(:unit),
|
||||
I18n.t('shared.articles.ordered'),
|
||||
I18n.t('shared.articles.received'),
|
||||
I18n.t('shared.articles_by.price_sum'),
|
||||
has_tolerance ? {image: "#{Rails.root}/app/assets/images/package-bg.png", scale: 0.6, position: :center} : nil
|
||||
]
|
||||
|
||||
text ordergroup.name, size: fontsize(13), style: :bold
|
||||
table rows, width: bounds.width, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
||||
|
@ -83,27 +71,20 @@ class MultipleOrdersByGroups < OrderPdf
|
|||
table.rows(0).border_width = 1
|
||||
table.rows(0).border_color = '666666'
|
||||
table.rows(0).column(5).font_style = :bold
|
||||
table.row(rows.length-3).border_width = 1
|
||||
table.row(rows.length-3).border_color = '666666'
|
||||
table.row(rows.length-2).borders = []
|
||||
table.row(rows.length-2).border_width = 1
|
||||
table.row(rows.length-2).border_color = '666666'
|
||||
table.row(rows.length-1).borders = []
|
||||
|
||||
# bottom row with price details
|
||||
table.row(rows.length-1).text_color = '999999'
|
||||
table.row(rows.length-1).size = fontsize(7)
|
||||
table.row(rows.length-1).padding = [0, 5, 0, 5]
|
||||
table.row(rows.length-1).height = 0 if totals[:fc_price] == 0
|
||||
|
||||
table.column(0).width = 150 # @todo would like to set minimum width here
|
||||
table.column(0).width = 180 # @todo would like to set minimum width here
|
||||
table.column(1).width = 62
|
||||
table.column(2).align = :right
|
||||
table.column(5..7).font_style = :bold
|
||||
table.column(5..6).font_style = :bold
|
||||
table.columns(3..5).align = :center
|
||||
table.column(6..7).align = :right
|
||||
table.column(8).align = :center
|
||||
table.column(6).align = :right
|
||||
table.column(7).align = :center
|
||||
# dim rows not relevant for members
|
||||
table.column(4).text_color = '999999'
|
||||
table.column(8).text_color = '999999'
|
||||
table.column(7).text_color = '999999'
|
||||
# hide unit_quantity if there's no tolerance anyway
|
||||
table.column(-1).width = has_tolerance ? 20 : 0
|
||||
|
||||
|
|
Loading…
Reference in a new issue