From 2c2c48071d82452a930e6e35a11158b1411f2986 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 7 Jun 2022 10:36:40 +0200 Subject: [PATCH 1/2] Since `query_result` method is the same, use inheritance --- lib/reporting/reports/orders_and_fulfillment/base.rb | 6 ++++++ .../order_cycle_distributor_totals_by_supplier.rb | 6 ------ .../orders_and_fulfillment/order_cycle_supplier_totals.rb | 6 ------ .../order_cycle_supplier_totals_by_distributor.rb | 6 ------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/reporting/reports/orders_and_fulfillment/base.rb b/lib/reporting/reports/orders_and_fulfillment/base.rb index 70ac309fc1..f31514b74d 100644 --- a/lib/reporting/reports/orders_and_fulfillment/base.rb +++ b/lib/reporting/reports/orders_and_fulfillment/base.rb @@ -21,6 +21,12 @@ module Reporting report_line_items.orders end + def query_result + report_line_items.list(line_item_includes).group_by { |e| + [e.variant_id, e.price] + }.values + end + private def order_permissions diff --git a/lib/reporting/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier.rb b/lib/reporting/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier.rb index ec6aae5af2..4c5c093d36 100644 --- a/lib/reporting/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier.rb +++ b/lib/reporting/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier.rb @@ -44,12 +44,6 @@ module Reporting variant: [{ option_values: :option_type }, { product: :supplier }] }] end - - def query_result - report_line_items.list(line_item_includes).group_by { |e| - [e.variant_id, e.price] - }.values - end end end end diff --git a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb index 3b242225df..1a1a085cf0 100644 --- a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb +++ b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb @@ -35,12 +35,6 @@ module Reporting def line_item_includes [{ variant: [{ option_values: :option_type }, { product: :supplier }] }] end - - def query_result - report_line_items.list(line_item_includes).group_by { |e| - [e.variant_id, e.price] - }.values - end end end end diff --git a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor.rb b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor.rb index 993f4ce7f1..4152731bcf 100644 --- a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor.rb +++ b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor.rb @@ -42,12 +42,6 @@ module Reporting [{ order: :distributor, variant: [{ option_values: :option_type }, { product: :supplier }] }] end - - def query_result - report_line_items.list(line_item_includes).group_by { |e| - [e.variant_id, e.price] - }.values - end end end end From 3defd81ca6cf8e3b0a00990508f0eec16afc0979 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 7 Jun 2022 10:37:06 +0200 Subject: [PATCH 2/2] Group by e.order.distributor_id on Orders & Fulfillment Reports --- lib/reporting/reports/orders_and_fulfillment/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting/reports/orders_and_fulfillment/base.rb b/lib/reporting/reports/orders_and_fulfillment/base.rb index f31514b74d..887a39c5a1 100644 --- a/lib/reporting/reports/orders_and_fulfillment/base.rb +++ b/lib/reporting/reports/orders_and_fulfillment/base.rb @@ -23,7 +23,7 @@ module Reporting def query_result report_line_items.list(line_item_includes).group_by { |e| - [e.variant_id, e.price] + [e.variant_id, e.price, e.order.distributor_id] }.values end