Compare commits

..

No commits in common. "043eccf16788eab457e1c10eb1eab3028c376c8d" and "d648f1bd55ea26ccacd7739956dd4864ff75bd64" have entirely different histories.

2 changed files with 4 additions and 6 deletions

View file

@ -187,11 +187,9 @@ class GroupOrderInvoicePdf < RenderPdf
index = 0
supplier_headlines = []
group_order_articles.group_by { |goa| goa.group_order.order.supplier.name }.each do |supplier_name, articles|
if articles.map(&:result).sum > 0
data << [supplier_name, "", "", "", "", ""]
index += 1
supplier_headlines << index
end
data << [supplier_name, "", "", "", "", ""]
index += 1
supplier_headlines << index
articles.each do |goa|
next if goa.result.to_i == 0

View file

@ -28,7 +28,7 @@ class OrdergroupInvoice < ApplicationRecord
#how to define one order?
invoice_data[:pickup] = order.pickup
invoice_data[:supplier] = FoodsoftConfig[:name]
invoice_data[:supplier] = order.supplier&.name
invoice_data[:ordergroup] = group_orders.first.ordergroup
invoice_data[:group_order_ids] = group_orders.pluck(:id)
invoice_data[:invoice_number] = invoice_number