From 22bbe29f3d0431246a4065213de4896b7e5c4ca7 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Mon, 11 Sep 2017 12:03:53 +1000
Subject: [PATCH] Call single-use before_filters from actions instead

---
 app/controllers/enterprises_controller.rb        |  3 ++-
 app/controllers/spree/credit_cards_controller.rb | 10 +++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index 8f38f4e095..06926a746c 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -11,11 +11,12 @@ class EnterprisesController < BaseController
 
   before_filter :clean_permalink, only: :check_permalink
   before_filter :enable_embedded_shopfront
-  before_filter :set_enterprise, only: :relatives
 
   respond_to :js, only: :permalink_checker
 
   def relatives
+    set_enterprise
+
     respond_to do |format|
       format.json do
         enterprises = @enterprise.andand.relatives.andand.activated
diff --git a/app/controllers/spree/credit_cards_controller.rb b/app/controllers/spree/credit_cards_controller.rb
index a39db0d929..aa67514f47 100644
--- a/app/controllers/spree/credit_cards_controller.rb
+++ b/app/controllers/spree/credit_cards_controller.rb
@@ -1,8 +1,5 @@
 module Spree
   class CreditCardsController < BaseController
-    before_filter :set_credit_card, only: [:destroy]
-    before_filter :destroy_at_stripe, only: [:destroy]
-
     def new_from_token
       # A new Customer is created for every credit card (same as via ActiveMerchant)
       # Note that default_source is the card represented by the token
@@ -20,6 +17,9 @@ module Spree
     end
 
     def destroy
+      @credit_card = Spree::CreditCard.find(params[:id])
+      destroy_at_stripe
+
       if @credit_card.destroy
         flash[:success] = I18n.t(:card_has_been_removed, number: "x-#{@credit_card.last_digits}")
       else
@@ -58,9 +58,5 @@ module Spree
       card.user_id = spree_current_user.id
       card
     end
-
-    def set_credit_card
-      @credit_card = Spree::CreditCard.find(params[:id])
-    end
   end
 end