raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix product and inventory report

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-04-17 15:17:38 +10:00
parent 17793e7b12
commit 83fa080f76
2 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/reporting/reports/products_and_inventory/base.rb
View File

@@ -13,8 +13,8 @@ module Reporting
# rubocop:disable Metrics/AbcSize
def columns
{
supplier: proc { |variant| variant.product.supplier.name },
producer_suburb: proc { |variant| variant.product.supplier.address.city },
supplier: proc { |variant| variant.supplier.name },
producer_suburb: proc { |variant| variant.supplier.address.city },
product: proc { |variant| variant.product.name },
product_properties: proc { |v| v.product.properties.map(&:name).join(", ") },
taxons: proc { |variant| variant.primary_taxon.name },
@@ -33,9 +33,10 @@ module Reporting
def child_variants
Spree::Variant.
select("spree_variants.*, spree_products.name").
joins(:product).
merge(visible_products).
order('spree_products.name')
order('spree_products.name').distinct
end
private
@@ -59,7 +60,7 @@ module Reporting
def filter_to_supplier(variants)
if params[:supplier_id].to_i > 0
variants.where(spree_products: { supplier_id: params[:supplier_id] })
variants.where(supplier: params[:supplier_id])
else
variants
end