From 03b59eae75dda5cbb945bd35cecfb56db870d021 Mon Sep 17 00:00:00 2001
From: Lynne Davis <lynne@deanforestfoodhub.org.uk>
Date: Fri, 14 Nov 2014 15:56:07 +0000
Subject: [PATCH] 266: Updating with rohans suggestions to tidy up and 'rubify'
 the code. Thanks for the tips Rohan!

---
 .../admin/reports_controller_decorator.rb     |  2 +-
 app/helpers/spree/reports_helper.rb           | 20 ++-----------------
 .../order_cycle_management_report.rb          |  4 ++--
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb
index 7ffb32d097..b1deb5c3ed 100644
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -631,7 +631,7 @@ Spree::Admin::ReportsController.class_eval do
       :orders_and_fulfillment => {:name => "Orders & Fulfillment Reports", :description => ''},
       :customers => {:name => "Customers", :description => 'Customer details'},
       :products_and_inventory => {:name => "Products & Inventory", :description => ''},
-      :order_cycle_management => {:name => "UK Order Cycle Management", :description => ''}
+      :order_cycle_management => {:name => "Order Cycle Management", :description => ''}
       
     }
     # Return only reports the user is authorized to view.
diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb
index 967cd7fd36..5860625991 100644
--- a/app/helpers/spree/reports_helper.rb
+++ b/app/helpers/spree/reports_helper.rb
@@ -8,28 +8,12 @@ module Spree
       end
     end
 
-    #lin-d-hop
-    #Find the payment methods options for reporting. 
-    #I don't like that this is done in two loops, but redundant list entries
-    #  were created otherwise... 
     def report_payment_method_options(orders)
-      payment_method_list = []
-      orders.map do |o| 
-        payment_method_list << o.payments.first.payment_method.andand.name
-      end
-      payment_method_list.uniq.each do |pm|
-        [ "#{pm}".html_safe,  pm]
-      end
+      orders.map { |o| o.payments.first.payment_method.andand.name }.uniq
     end
 
     def report_distribution_options(orders)
-      distribution_list = []
-      orders.map do |o| 
-        distribution_list << o.shipping_method.andand.name 
-      end
-      distribution_list.uniq.each do |pm|
-        [ "#{pm}".html_safe,  pm]
-      end
+      orders.map { |o| o.shipping_method.andand.name  }.uniq      
     end    
 
   end
diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb
index fb4da5468d..2087f901de 100644
--- a/lib/open_food_network/order_cycle_management_report.rb
+++ b/lib/open_food_network/order_cycle_management_report.rb
@@ -44,7 +44,7 @@ module OpenFoodNetwork
     end
 
     def filter_to_payment_method (orders)
-      if params.has_key? (:payment_method_name)
+      if params[:payment_method_name].present?
         orders.with_payment_method_name(params[:payment_method_name])
       else
         orders
@@ -52,7 +52,7 @@ module OpenFoodNetwork
     end
 
     def filter_to_distribution (orders)
-      if params.has_key? (:distribution_name)
+      if params[:distribution_name].present?
         orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:distribution_name])
       else
         orders