Adapt helpers to rails 5.2

2026-02-28 01:53:25 +00:00 · 2021-03-13 11:22:39 +00:00
parent 32c68f5951
commit c4c5bbc9a3
3 changed files with 3 additions and 4 deletions
--- 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'
--- 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(
--- 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