Dry up current_currency. Fixes spree#6138

parndt · Mar 9, 2015 · dd044e5 · dd044e5
1 parent 3d15d59
commit dd044e5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/api/app/controllers/spree/api/base_controller.rb b/api/app/controllers/spree/api/base_controller.rb
@@ -109,11 +109,6 @@ def current_ability
         Spree::Ability.new(current_api_user)
       end
 
-      def current_currency
-        Spree::Config[:currency]
-      end
-      helper_method :current_currency
-
       def invalid_resource!(resource)
         @resource = resource
         render "spree/api/errors/invalid_resource", status: 422

diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rb
@@ -7,7 +7,6 @@ module Order
         included do
           before_filter :set_current_order
 
-          helper_method :current_currency
           helper_method :current_order
           helper_method :simple_current_order
         end
@@ -64,10 +63,6 @@ def set_current_order
           end
         end
 
-        def current_currency
-          Spree::Config[:currency]
-        end
-
         def ip_address
           request.remote_ip
         end

diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rb
@@ -5,14 +5,17 @@ module Store
         extend ActiveSupport::Concern
 
         included do
-
-          def current_store
-            @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
-          end
+          helper_method :current_currency
           helper_method :current_store
+        end
 
+        def current_currency
+          Spree::Config[:currency]
         end
 
+        def current_store
+          @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+        end
       end
     end
   end

diff --git a/guides/content/release_notes/3_0_0.md b/guides/content/release_notes/3_0_0.md
@@ -99,6 +99,8 @@ You can view the full changes using [Github Compare](https://github.com/spree/sp
 
     https://github.com/spree/spree/pull/6097
 
+* Moved current_currency helper from Spree::Core::ControllerHelpers::Order to Spree::Core::ControllerHelpers::Order.
+
 * The line items order population endpoint used to accept a hash, it now accepts an array. When submitting a Post request to `/api/line_items` you will receive this deprecation warning:
 
   ```text