diff --git a/app/documents/group_order_invoice_pdf.rb b/app/documents/group_order_invoice_pdf.rb index 1bf4741b..ccbdb1aa 100644 --- a/app/documents/group_order_invoice_pdf.rb +++ b/app/documents/group_order_invoice_pdf.rb @@ -187,9 +187,11 @@ class GroupOrderInvoicePdf < RenderPdf index = 0 supplier_headlines = [] group_order_articles.group_by { |goa| goa.group_order.order.supplier.name }.each do |supplier_name, articles| - data << [supplier_name, "", "", "", "", ""] - index += 1 - supplier_headlines << index + if articles.map(&:result).sum > 0 + data << [supplier_name, "", "", "", "", ""] + index += 1 + supplier_headlines << index + end articles.each do |goa| next if goa.result.to_i == 0 diff --git a/app/models/ordergroup_invoice.rb b/app/models/ordergroup_invoice.rb index 1b1e4414..3c36a230 100644 --- a/app/models/ordergroup_invoice.rb +++ b/app/models/ordergroup_invoice.rb @@ -28,7 +28,7 @@ class OrdergroupInvoice < ApplicationRecord #how to define one order? invoice_data[:pickup] = order.pickup - invoice_data[:supplier] = order.supplier&.name + invoice_data[:supplier] = FoodsoftConfig[:name] invoice_data[:ordergroup] = group_orders.first.ordergroup invoice_data[:group_order_ids] = group_orders.pluck(:id) invoice_data[:invoice_number] = invoice_number