diff --git a/app/documents/group_order_invoice_pdf.rb b/app/documents/group_order_invoice_pdf.rb index c8db67e6..899d6cf8 100644 --- a/app/documents/group_order_invoice_pdf.rb +++ b/app/documents/group_order_invoice_pdf.rb @@ -103,13 +103,13 @@ class GroupOrderInvoicePdf < RenderPdf total_gross += goa_total_deposit end - table data, position: :left, cell_style: { size: fontsize(8), overflow: :shrink_to_fit } do |table| + table data, cell_style: { size: fontsize(8), overflow: :shrink_to_fit } do |table| table.header = true table.position = :center table.cells.border_width = 1 table.cells.border_color = '666666' - table.row(0).column(1).width = 40 + table.row(0).column(0..4).width = 80 table.row(0).border_bottom_width = 2 table.columns(1).align = :right table.columns(1..6).align = :right @@ -117,17 +117,25 @@ class GroupOrderInvoicePdf < RenderPdf move_down 5 sum = [] - sum << [nil, nil, I18n.t('documents.group_order_invoice_pdf.sum_to_pay'), number_to_currency(total_gross)] + sum << [nil, nil, I18n.t('documents.group_order_invoice_pdf.sum_to_pay_gross'), number_to_currency(total_gross)] # table for sum - indent(200) do - table sum, position: :center, cell_style: { size: fontsize(8), overflow: :shrink_to_fit } do |table| - sum.length.times do |count| - table.row(count).columns(0..3).borders = [] - end - table.row(sum.length - 1).columns(0..2).borders = [] - table.row(sum.length - 1).border_bottom_width = 2 - table.row(sum.length - 1).columns(3).borders = [:bottom] - end + table sum, cell_style: { size: fontsize(8), overflow: :shrink_to_fit } do |table| + table.header = true + table.position = :center + table.cells.border_width = 1 + table.cells.border_color = '666666' + table.row(0).columns(2..4).style(align: :bottom) + table.row(0).border_bottom_width = 2 + table.row(0..-1).columns(0..1).border_width = 0 + + table.rows(0..-1).columns(0..4).width = 80 + table.row(0).column(-1).style(font_style: :bold) + table.row(0).column(-2).style(font_style: :bold) + table.row(0).column(-1).size = fontsize(10) + table.row(0).column(-2).size = fontsize(10) + + table.columns(1).align = :right + table.columns(1..6).align = :right end move_down 25