From f2ec806d9c024013696142bf7042e8019e759eae Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Sat, 24 Jul 2021 11:54:46 -0700
Subject: [PATCH] move all calculators to reload block

---
 config/application.rb | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 97176f97fb..8689fe592c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -98,17 +98,7 @@ module Openfoodnetwork
 
     # Register Spree calculators
     Rails.application.reloader.to_prepare do
-      Openfoodnetwork::Application.config.spree.calculators.shipping_methods = [
-        Calculator::FlatPercentItemTotal,
-        Calculator::FlatRate,
-        Calculator::FlexiRate,
-        Calculator::PerItem,
-        Calculator::PriceSack,
-        Calculator::Weight
-      ]
-    end
-    
-    initializer 'spree.register.calculators' do |app|
+      app = Openfoodnetwork::Application
       app.config.spree.calculators.shipping_methods = [
         Calculator::FlatPercentItemTotal,
         Calculator::FlatRate,
@@ -119,7 +109,7 @@ module Openfoodnetwork
       ]
 
       app.config.spree.calculators.add_class('enterprise_fees')
-      config.spree.calculators.enterprise_fees = [
+      app.config.spree.calculators.enterprise_fees = [
         Calculator::FlatPercentPerItem,
         Calculator::FlatRate,
         Calculator::FlexiRate,
@@ -129,7 +119,7 @@ module Openfoodnetwork
       ]
 
       app.config.spree.calculators.add_class('payment_methods')
-      config.spree.calculators.payment_methods = [
+      app.config.spree.calculators.payment_methods = [
         Calculator::FlatPercentItemTotal,
         Calculator::FlatRate,
         Calculator::FlexiRate,
@@ -138,7 +128,7 @@ module Openfoodnetwork
       ]
 
       app.config.spree.calculators.add_class('tax_rates')
-      config.spree.calculators.tax_rates = [
+      app.config.spree.calculators.tax_rates = [
         Calculator::DefaultTax
       ]
     end