From d925533366ab108de6dd0d1feaed2098fdcc2ee7 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Mon, 28 Jan 2019 06:08:04 +0100 Subject: [PATCH] Fix rendering of stock order in OrderByGroups --- app/models/group_order.rb | 1 + lib/order_pdf.rb | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/group_order.rb b/app/models/group_order.rb index 89f40cd1..c6fd08c8 100644 --- a/app/models/group_order.rb +++ b/app/models/group_order.rb @@ -16,6 +16,7 @@ class GroupOrder < ApplicationRecord scope :in_open_orders, -> { joins(:order).merge(Order.open) } scope :in_finished_orders, -> { joins(:order).merge(Order.finished_not_closed) } + scope :stock, -> { where(ordergroup: 0) } scope :ordered, -> { includes(:ordergroup).order('groups.name') } diff --git a/lib/order_pdf.rb b/lib/order_pdf.rb index 935b08e2..1a08e2be 100644 --- a/lib/order_pdf.rb +++ b/lib/order_pdf.rb @@ -73,7 +73,7 @@ class OrderPdf < RenderPDF group('groups.id'). offset(offset). limit(limit). - pluck('groups.name', 'SUM(group_orders.price)', 'groups.id') + pluck('groups.name', 'SUM(group_orders.price)', 'ordergroup_id') result.map do |item| [item.first || stock_ordergroup_name] + item[1..-1] @@ -129,10 +129,9 @@ class OrderPdf < RenderPDF end def stock_ordergroup_name - users = GroupOrder. + users = GroupOrder.stock. eager_load(:updated_by). where(order: @orders). - where(ordergroup: nil). map(&:updated_by). map{ |u| u.try(&:name) || '?' }