From 51b0d7e0eb01829a88e5dc0c0fd915ec673bf244 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 8 Jan 2015 10:46:03 +1100 Subject: [PATCH] Move private method to helper --- .../spree/admin/reports_controller_decorator.rb | 7 ++----- app/helpers/spree/reports_helper.rb | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 2be9876933..861d6a2b16 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -6,10 +6,11 @@ require 'open_food_network/order_grouper' require 'open_food_network/customers_report' require 'open_food_network/users_and_enterprises_report' require 'open_food_network/order_cycle_management_report' -require 'spree/money_decorator' Spree::Admin::ReportsController.class_eval do + include Spree::ReportsHelper + REPORT_TYPES = { orders_and_fulfillment: [ ['Order Cycle Supplier Totals',:order_cycle_supplier_totals], @@ -617,10 +618,6 @@ Spree::Admin::ReportsController.class_eval do end private - - def currency_symbol - Spree::Money.currency_symbol - end def load_data # Load distributors either owned by the user or selling their enterprises products. diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb index 81310b6c62..f4ecdcea6f 100644 --- a/app/helpers/spree/reports_helper.rb +++ b/app/helpers/spree/reports_helper.rb @@ -1,3 +1,5 @@ +require 'spree/money_decorator' + module Spree module ReportsHelper def report_order_cycle_options(order_cycles) @@ -16,5 +18,8 @@ module Spree orders.map { |o| o.shipping_method.andand.name }.uniq end + def currency_symbol + Spree::Money.currency_symbol + end end end