diff --git a/lib/reporting/reports/bulk_coop/supplier_report.rb b/lib/reporting/reports/bulk_coop/supplier_report.rb index 6e797cd389..33f87263c6 100644 --- a/lib/reporting/reports/bulk_coop/supplier_report.rb +++ b/lib/reporting/reports/bulk_coop/supplier_report.rb @@ -10,7 +10,7 @@ module Reporting def columns { - supplier: :variant_product_supplier_name, + supplier: :variant_supplier_name, product: :variant_product_name, bulk_unit_size: :variant_product_group_buy_unit_size_f, variant: :full_name, @@ -44,8 +44,8 @@ module Reporting private - def variant_product_supplier_name(line_items) - line_items.first.variant.product.supplier.name + def variant_supplier_name(line_items) + line_items.first.variant.supplier.name end end end diff --git a/spec/system/admin/reports_spec.rb b/spec/system/admin/reports_spec.rb index adac20636d..4d1b8bf533 100644 --- a/spec/system/admin/reports_spec.rb +++ b/spec/system/admin/reports_spec.rb @@ -508,8 +508,6 @@ RSpec.describe ' end it "generating Bulk Co-op Supplier Report" do - pending("S2 bug #12768") - click_link "Bulk Co-op Supplier Report" run_report