Merge pull request #366 from dav-armour/headless-fix

Fix loading of frontend decorators if frontend not available
spree · Nov 9, 2020 · ea8564f · ea8564f
2 parents 96aa2f7 + dd57029
commit ea8564f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/spree_gateway/engine.rb b/lib/spree_gateway/engine.rb
@@ -45,8 +45,10 @@ def self.activate
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
 
-      Dir.glob(File.join(File.dirname(__FILE__), '../../lib/spree_frontend/controllers/spree/*_decorator*.rb')) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
+      if self.frontend_available?
+        Dir.glob(File.join(File.dirname(__FILE__), '../../lib/spree_frontend/controllers/spree/*_decorator*.rb')) do |c|
+          Rails.application.config.cache_classes ? require(c) : load(c)
+        end
       end
     end