From f1cc3a7b0df6dd12123f14d9d54fc7b09a520c68 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 9 Mar 2016 12:42:16 +1100 Subject: [PATCH] Apply code style following Rubocop --- app/helpers/injection_helper.rb | 4 ++-- app/models/spree/user_decorator.rb | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb index aa5148b394..7f14fa46f2 100644 --- a/app/helpers/injection_helper.rb +++ b/app/helpers/injection_helper.rb @@ -56,10 +56,10 @@ module InjectionHelper data_array = spree_current_user.orders_by_distributor.to_a data_array.each do |enterprise| enterprise.distributed_orders.each do |order| - order.payments.keep_if{ |payment| payment.state == "completed" } + order.payments.keep_if { |payment| payment.state == "completed" } end end - data_array.sort!{ |a, b| b.distributed_orders.length <=> a.distributed_orders.length } + data_array.sort! { |a, b| b.distributed_orders.length <=> a.distributed_orders.length } inject_json_ams "orders_by_distributor", data_array, Api::OrdersByDistributorSerializer end diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb index 6c5027a228..e4bac45990 100644 --- a/app/models/spree/user_decorator.rb +++ b/app/models/spree/user_decorator.rb @@ -56,7 +56,11 @@ Spree.user_class.class_eval do # Returns orders and their associated payments for all distributors that have been ordered from def orders_by_distributor - Enterprise.includes(distributed_orders: :payments).where(enterprises: { id: self.enterprises_ordered_from }, spree_orders: { state: 'complete', user_id: self.id }).order('spree_orders.completed_at DESC') + Enterprise.includes(distributed_orders: :payments). + where( + enterprises: { id: self.enterprises_ordered_from }, + spree_orders: { state: 'complete', user_id: self.id }). + order('spree_orders.completed_at DESC') end private