From eeae72352b7c3f6568a7e51cdaec76923e13b2de Mon Sep 17 00:00:00 2001
From: Lynne Davis <lynne@deanforestfoodhub.org.uk>
Date: Fri, 12 Dec 2014 10:11:33 +0000
Subject: [PATCH] Renamed methods and vars to better fit naming conventions

---
 app/helpers/spree/reports_helper.rb                       | 2 +-
 .../spree/admin/reports/order_cycle_management.html.haml  | 5 +++--
 lib/open_food_network/order_cycle_management_report.rb    | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb
index 5860625991..22004577eb 100644
--- a/app/helpers/spree/reports_helper.rb
+++ b/app/helpers/spree/reports_helper.rb
@@ -12,7 +12,7 @@ module Spree
       orders.map { |o| o.payments.first.payment_method.andand.name }.uniq
     end
 
-    def report_distribution_options(orders)
+    def report_shipping_options(orders)
       orders.map { |o| o.shipping_method.andand.name  }.uniq      
     end    
 
diff --git a/app/views/spree/admin/reports/order_cycle_management.html.haml b/app/views/spree/admin/reports/order_cycle_management.html.haml
index 3428cf3977..4581d32bc6 100644
--- a/app/views/spree/admin/reports/order_cycle_management.html.haml
+++ b/app/views/spree/admin/reports/order_cycle_management.html.haml
@@ -14,8 +14,9 @@
                multiple: true, include_blank: true) 
   %br
   %br
-  = select_tag(:distribution_name, 
-      options_for_select(report_distribution_options(@orders), params[:distribution_name]), 
+  = label_tag nil, "Shipping Method: "
+  = select_tag(:shipping_method_name, 
+      options_for_select(report_shipping_options(@orders), params[:shipping_method_name]), 
 	       include_blank: true) 
   %br
   %br
diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb
index 0ac838c027..bd7974b56e 100644
--- a/lib/open_food_network/order_cycle_management_report.rb
+++ b/lib/open_food_network/order_cycle_management_report.rb
@@ -32,7 +32,7 @@ module OpenFoodNetwork
     end
 
     def filter(orders)
-      filter_to_order_cycle filter_to_payment_method filter_to_distribution orders
+      filter_to_order_cycle filter_to_payment_method filter_to_shipping_method orders
     end
 
     def filter_to_payment_method (orders)
@@ -43,9 +43,9 @@ module OpenFoodNetwork
       end
     end
 
-    def filter_to_distribution (orders)
-      if params[:distribution_name].present?
-        orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:distribution_name])
+    def filter_to_shipping_method (orders)
+      if params[:shipping_method_name].present?
+        orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:shipping_method_name])
       else
         orders
       end