From c088fb9a4956ef87546d4d0ccb3113d73296d91a Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Sun, 24 Mar 2019 11:42:29 +0800 Subject: [PATCH] Use shorter syntax for Customer Totals report --- .../orders_and_fulfillments_report.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/open_food_network/orders_and_fulfillments_report.rb b/lib/open_food_network/orders_and_fulfillments_report.rb index 294104680f..faa5781676 100644 --- a/lib/open_food_network/orders_and_fulfillments_report.rb +++ b/lib/open_food_network/orders_and_fulfillments_report.rb @@ -115,12 +115,12 @@ module OpenFoodNetwork proc { |line_items| "" }, proc { |line_items| "" }, - proc { |line_items| line_items.sum { |li| li.amount } }, - proc { |line_items| line_items.sum { |li| li.amount_with_adjustments } }, - proc { |line_items| line_items.map { |li| li.order }.uniq.sum { |o| o.admin_and_handling_total } }, - proc { |line_items| line_items.map { |li| li.order }.uniq.sum { |o| o.ship_total } }, - proc { |line_items| line_items.map { |li| li.order }.uniq.sum { |o| o.payment_fee } }, - proc { |line_items| line_items.map { |li| li.order }.uniq.sum { |o| o.total } }, + proc { |line_items| line_items.sum(&:amount) }, + proc { |line_items| line_items.sum(&:amount_with_adjustments) }, + proc { |line_items| line_items.map(&:order).uniq.sum(&:admin_and_handling_total) }, + proc { |line_items| line_items.map(&:order).uniq.sum(&:ship_total) }, + proc { |line_items| line_items.map(&:order).uniq.sum(&:payment_fee) }, + proc { |line_items| line_items.map(&:order).uniq.sum(&:total) }, proc { |line_items| line_items.all? { |li| li.order.paid? } ? I18n.t(:yes) : I18n.t(:no) }, proc { |line_items| "" },