From b36b0eddeee935a80fb4bc286a5666879012c2ab Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 6 Nov 2020 12:52:38 +0000 Subject: [PATCH] Fix Rubocop issues --- app/helpers/checkout_helper.rb | 4 +++- app/jobs/confirm_order_job.rb | 2 ++ app/jobs/order_cycle_notification_job.rb | 2 ++ app/jobs/welcome_enterprise_job.rb | 2 ++ lib/open_food_network/payments_report.rb | 18 ++++++++++++++++-- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/helpers/checkout_helper.rb b/app/helpers/checkout_helper.rb index 72779dd4ec..8e54913dc5 100644 --- a/app/helpers/checkout_helper.rb +++ b/app/helpers/checkout_helper.rb @@ -18,7 +18,9 @@ module CheckoutHelper enterprise_fee_adjustments = adjustments.select { |a| a.originator_type == 'EnterpriseFee' && a.source_type != 'Spree::LineItem' } adjustments.reject! { |a| a.originator_type == 'EnterpriseFee' && a.source_type != 'Spree::LineItem' } unless exclude.include? :admin_and_handling - adjustments << Spree::Adjustment.new(label: I18n.t(:orders_form_admin), amount: enterprise_fee_adjustments.sum(:amount)) + adjustments << Spree::Adjustment.new( + label: I18n.t(:orders_form_admin), amount: enterprise_fee_adjustments.sum(:amount) + ) end adjustments diff --git a/app/jobs/confirm_order_job.rb b/app/jobs/confirm_order_job.rb index 3598cbdcfb..1a42b3041b 100644 --- a/app/jobs/confirm_order_job.rb +++ b/app/jobs/confirm_order_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ConfirmOrderJob < ActiveJob::Base def perform(order_id) Spree::OrderMailer.confirm_email_for_customer(order_id).deliver diff --git a/app/jobs/order_cycle_notification_job.rb b/app/jobs/order_cycle_notification_job.rb index b6ab117320..e3a2f4d8ac 100644 --- a/app/jobs/order_cycle_notification_job.rb +++ b/app/jobs/order_cycle_notification_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Delivers an email with a report of the order cycle to each of its suppliers class OrderCycleNotificationJob < ActiveJob::Base def perform(order_cycle_id) diff --git a/app/jobs/welcome_enterprise_job.rb b/app/jobs/welcome_enterprise_job.rb index a936514ef9..26bd581b88 100644 --- a/app/jobs/welcome_enterprise_job.rb +++ b/app/jobs/welcome_enterprise_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class WelcomeEnterpriseJob < ActiveJob::Base def perform(enterprise_id) enterprise = Enterprise.find enterprise_id diff --git a/lib/open_food_network/payments_report.rb b/lib/open_food_network/payments_report.rb index 7cfc6342f4..ec92d497ef 100644 --- a/lib/open_food_network/payments_report.rb +++ b/lib/open_food_network/payments_report.rb @@ -106,8 +106,22 @@ module OpenFoodNetwork proc { |orders| orders.sum(:item_total) }, proc { |orders| orders.sum(&:ship_total) }, proc { |orders| orders.sum(:total) }, - proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "EFT") }.sum(:amount) } }, - proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "PayPal") }.sum(:amount) } }, + proc { |orders| + orders.sum { |o| + o.payments.select { |payment| + payment.completed? && + (payment.payment_method.name.to_s.include? "EFT") + } .sum(:amount) + } + }, + proc { |orders| + orders.sum { |o| + o.payments.select { |payment| + payment.completed? && + (payment.payment_method.name.to_s.include? "PayPal") + } .sum(:amount) + } + }, proc { |orders| orders.sum(&:outstanding_balance) }] else [proc { |payments| payments.first.order.payment_state },