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 be4c1ecdf1..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 @@ -13,8 +13,8 @@ module Reporting quantity: proc { |line_items| line_items.to_a.sum(&:quantity) }, curr_cost_per_unit: proc { |line_items| line_items.first.price }, total_cost: proc { |line_items| line_items.sum(&:amount) }, - shipping_method: proc { |line_items| line_items.first.order.shipping_method&.name }, - total_shipping_cost: proc { |_line_items| "" } + total_shipping_cost: proc { |_line_items| "" }, + shipping_method: proc { |line_items| line_items.first.order.shipping_method&.name } } 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 abaf4ad8e4..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 @@ -9,10 +9,10 @@ module Reporting producer: supplier_name, product: product_name, variant: variant_name, - curr_cost_per_unit: proc { |line_items| line_items.first.price }, quantity: proc { |line_items| line_items.sum(&:quantity) }, total_units: proc { |line_items| total_units(line_items) }, - total_cost: proc { |line_items| line_items.sum(&:amount) }, + curr_cost_per_unit: proc { |line_items| line_items.first.price }, + total_cost: proc { |line_items| line_items.sum(&:amount) } } 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 2a64349125..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 @@ -9,9 +9,9 @@ module Reporting producer: supplier_name, product: product_name, variant: variant_name, - curr_cost_per_unit: proc { |line_items| line_items.first.price }, hub: hub_name, quantity: proc { |line_items| line_items.to_a.sum(&:quantity) }, + curr_cost_per_unit: proc { |line_items| line_items.first.price }, total_cost: proc { |line_items| line_items.sum(&:amount) }, shipping_method: proc { |line_items| line_items.first.order.shipping_method&.name } }