From 24afd40414d23643eeb62614841c3a44da5eb3e7 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Tue, 20 Aug 2024 13:11:07 +1000 Subject: [PATCH] Fix bulk coop supplier report --- lib/reporting/reports/bulk_coop/supplier_report.rb | 6 +++--- spec/system/admin/reports_spec.rb | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) 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 18ff2ffd99..c0daa66f9d 100644 --- a/spec/system/admin/reports_spec.rb +++ b/spec/system/admin/reports_spec.rb @@ -507,8 +507,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