From c4c5bbc9a3fd1287d8f07494285e91d7eaf1d62a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 13 Mar 2021 11:22:39 +0000
Subject: [PATCH] Adapt helpers to rails 5.2

---
 app/controllers/checkout_controller.rb | 3 ---
 app/helpers/injection_helper.rb        | 2 ++
 app/mailers/subscription_mailer.rb     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 1374c1ccb0..1b8cd07d67 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -6,9 +6,6 @@ class CheckoutController < ::BaseController
   layout 'darkswarm'
 
   include OrderStockCheck
-  include CheckoutHelper
-  include OrderCyclesHelper
-  include EnterprisesHelper
 
   helper 'terms_and_conditions'
   helper 'checkout'
diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index 7addd06135..3af44f885f 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -2,6 +2,8 @@ require 'open_food_network/enterprise_injection_data'
 
 module InjectionHelper
   include SerializerHelper
+  include EnterprisesHelper
+  include OrderCyclesHelper
 
   def inject_enterprises(enterprises = nil)
     inject_json_array(
diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 0f60ccbeab..dd20008bfc 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -1,5 +1,5 @@
 class SubscriptionMailer < Spree::BaseMailer
-  helper CheckoutHelper
+  helper 'checkout'
   helper MailerHelper
   helper ShopMailHelper
   helper OrderHelper