From d4cbf472264adeb1d2246bb4a7c76fda8280d2c8 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 12 Mar 2021 21:43:35 +0000 Subject: [PATCH 1/4] Add T and Cs helper to checkout controller --- app/controllers/checkout_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index 4022925385..ce1e88aa9f 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -10,6 +10,8 @@ class CheckoutController < ::BaseController include OrderCyclesHelper include EnterprisesHelper + helper 'terms_and_conditions' + ssl_required # We need pessimistic locking to avoid race conditions. From f55150745ef2a5b646c81866d74bf231c269a91a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 12 Mar 2021 22:07:50 +0000 Subject: [PATCH 2/4] Add checkout helper to checkout controller --- app/controllers/checkout_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index ce1e88aa9f..1374c1ccb0 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -11,7 +11,8 @@ class CheckoutController < ::BaseController include EnterprisesHelper helper 'terms_and_conditions' - + helper 'checkout' + ssl_required # We need pessimistic locking to avoid race conditions. From 32c68f59514c6e81394573a20af2bd36a0c107ca Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 13 Mar 2021 10:56:01 +0000 Subject: [PATCH 3/4] Adapt helper call to make it work in rails 5.2 --- app/mailers/spree/order_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb index 9fbed9f02b..00002715c3 100644 --- a/app/mailers/spree/order_mailer.rb +++ b/app/mailers/spree/order_mailer.rb @@ -2,7 +2,7 @@ module Spree class OrderMailer < BaseMailer - helper ::CheckoutHelper + helper 'checkout' helper SpreeCurrencyHelper helper Spree::Admin::PaymentsHelper helper OrderHelper From c4c5bbc9a3fd1287d8f07494285e91d7eaf1d62a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 13 Mar 2021 11:22:39 +0000 Subject: [PATCH 4/4] 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