Merge pull request solidusio#5730 from mamhoff/move-backend-controlle…

…rs-to-lib Move promotion backend controllers to `lib/
nebulab · May 6, 2024 · 1fdedd4 · 1fdedd4
2 parents 4f9c427 + f3b621b
commit 1fdedd4
Show file tree

Hide file tree

Showing 59 changed files with 47 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -59,6 +59,7 @@ end
 group :legacy_promotions do
   gem 'solidus_legacy_promotions', path: 'legacy_promotions', require: false
   gem 'solidus_admin', path: 'admin', require: false
+  gem 'solidus_backend', path: 'backend', require: false
   gem 'axe-core-rspec', '~> 4.8', require: false
   gem 'axe-core-capybara', '~> 4.8', require: false
 end

diff --git a/legacy_promotions/config/routes.rb b/legacy_promotions/config/routes.rb
@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-Spree::Core::Engine.routes.draw do
-  namespace :admin do
-    resources :promotions do
-      resources :promotion_rules
-      resources :promotion_actions
-      resources :promotion_codes, only: [:index, :new, :create]
-      resources :promotion_code_batches, only: [:index, :new, :create] do
-        get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
+if SolidusSupport.backend_available?
+  Spree::Core::Engine.routes.draw do
+    namespace :admin do
+      resources :promotions do
+        resources :promotion_rules
+        resources :promotion_actions
+        resources :promotion_codes, only: [:index, :new, :create]
+        resources :promotion_code_batches, only: [:index, :new, :create] do
+          get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
+        end
       end
-    end
 
-    resources :promotion_categories, except: [:show]
+      resources :promotion_categories, except: [:show]
+    end
   end
 end
 

diff --git a/...ree/admin/promotion_actions_controller.rb → ...ree/admin/promotion_actions_controller.rb b/...ree/admin/promotion_actions_controller.rb → ...ree/admin/promotion_actions_controller.rb
diff --git a/.../admin/promotion_categories_controller.rb → .../admin/promotion_categories_controller.rb b/.../admin/promotion_categories_controller.rb → .../admin/promotion_categories_controller.rb
diff --git a/...dmin/promotion_code_batches_controller.rb → ...dmin/promotion_code_batches_controller.rb b/...dmin/promotion_code_batches_controller.rb → ...dmin/promotion_code_batches_controller.rb
diff --git a/...spree/admin/promotion_codes_controller.rb → ...spree/admin/promotion_codes_controller.rb b/...spree/admin/promotion_codes_controller.rb → ...spree/admin/promotion_codes_controller.rb
diff --git a/...spree/admin/promotion_rules_controller.rb → ...spree/admin/promotion_rules_controller.rb b/...spree/admin/promotion_rules_controller.rb → ...spree/admin/promotion_rules_controller.rb
diff --git a/...lers/spree/admin/promotions_controller.rb → ...kend/spree/admin/promotions_controller.rb b/...lers/spree/admin/promotions_controller.rb → ...kend/spree/admin/promotions_controller.rb
diff --git a/legacy_promotions/lib/solidus_legacy_promotions.rb b/legacy_promotions/lib/solidus_legacy_promotions.rb
@@ -2,17 +2,24 @@
 
 require "solidus_core"
 require "solidus_api"
-require "solidus_backend"
 require "solidus_support"
 
-# If `solidus_admin` is available, it needs to load before
-# our engine is initialized, so that our load paths can
-# be initialized.
+# We carry controllers and views for both the traditional backend
+# and the new Solidus Admin interface, but we want to continue to function
+# if either of them are not present. If they are present,
+# however, they need to load before us.
 begin
   require 'solidus_admin'
 rescue LoadError
   # Solidus Admin is not available
 end
+
+begin
+  require "solidus_backend"
+rescue LoadError
+  # Solidus backend is not available
+end
+
 module SolidusLegacyPromotions
   VERSION = Spree.solidus_version
 end

diff --git a/legacy_promotions/lib/solidus_legacy_promotions/engine.rb b/legacy_promotions/lib/solidus_legacy_promotions/engine.rb
@@ -3,29 +3,30 @@
 module SolidusLegacyPromotions
   class Engine < ::Rails::Engine
     include SolidusSupport::EngineExtensions
-    MenuItem = Spree::BackendConfiguration::MenuItem
 
-    initializer "solidus_legacy_promotions.add_menu_item" do
-      promotions_menu_item = MenuItem.new(
-        label: :promotions,
-        icon: Spree::Backend::Config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
-        partial: "spree/admin/shared/promotion_sub_menu",
-        condition: -> { can?(:admin, Spree::Promotion) },
-        url: :admin_promotions_path,
-        data_hook: :admin_promotion_sub_tabs,
-        children: [
-          MenuItem.new(
-            label: :promotions,
-            condition: -> { can?(:admin, Spree::Promotion) }
-          ),
-          MenuItem.new(
-            label: :promotion_categories,
-            condition: -> { can?(:admin, Spree::PromotionCategory) }
-          )
-        ]
-      )
-      product_menu_item_index = Spree::Backend::Config.menu_items.find_index { |item| item.label == :products }
-      Spree::Backend::Config.menu_items.insert(product_menu_item_index + 1, promotions_menu_item)
+    initializer "solidus_legacy_promotions.add_backend_menu_item" do
+      if SolidusSupport.backend_available?
+        promotions_menu_item = Spree::BackendConfiguration::MenuItem.new(
+          label: :promotions,
+          icon: Spree::Backend::Config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
+          partial: "spree/admin/shared/promotion_sub_menu",
+          condition: -> { can?(:admin, Spree::Promotion) },
+          url: :admin_promotions_path,
+          data_hook: :admin_promotion_sub_tabs,
+          children: [
+            Spree::BackendConfiguration::MenuItem.new(
+              label: :promotions,
+              condition: -> { can?(:admin, Spree::Promotion) }
+            ),
+            Spree::BackendConfiguration::MenuItem.new(
+              label: :promotion_categories,
+              condition: -> { can?(:admin, Spree::PromotionCategory) }
+            )
+          ]
+        )
+        product_menu_item_index = Spree::Backend::Config.menu_items.find_index { |item| item.label == :products }
+        Spree::Backend::Config.menu_items.insert(product_menu_item_index + 1, promotions_menu_item)
+      end
     end
 
     initializer "solidus_legacy_promotions.add_solidus_admin_menu_items" do

diff --git a/...ree/admin/promotion_actions/create.js.erb → ...ree/admin/promotion_actions/create.js.erb b/...ree/admin/promotion_actions/create.js.erb → ...ree/admin/promotion_actions/create.js.erb
diff --git a/...ee/admin/promotion_actions/destroy.js.erb → ...ee/admin/promotion_actions/destroy.js.erb b/...ee/admin/promotion_actions/destroy.js.erb → ...ee/admin/promotion_actions/destroy.js.erb
diff --git a/...admin/promotion_categories/_form.html.erb → ...admin/promotion_categories/_form.html.erb b/...admin/promotion_categories/_form.html.erb → ...admin/promotion_categories/_form.html.erb
diff --git a/.../admin/promotion_categories/edit.html.erb → .../admin/promotion_categories/edit.html.erb b/.../admin/promotion_categories/edit.html.erb → .../admin/promotion_categories/edit.html.erb
diff --git a/...admin/promotion_categories/index.html.erb → ...admin/promotion_categories/index.html.erb b/...admin/promotion_categories/index.html.erb → ...admin/promotion_categories/index.html.erb
diff --git a/...e/admin/promotion_categories/new.html.erb → ...e/admin/promotion_categories/new.html.erb b/...e/admin/promotion_categories/new.html.erb → ...e/admin/promotion_categories/new.html.erb
diff --git a/...motion_code_batches/_form_fields.html.erb → ...motion_code_batches/_form_fields.html.erb b/...motion_code_batches/_form_fields.html.erb → ...motion_code_batches/_form_fields.html.erb
diff --git a/.../promotion_code_batches/download.csv.ruby → .../promotion_code_batches/download.csv.ruby b/.../promotion_code_batches/download.csv.ruby → .../promotion_code_batches/download.csv.ruby
diff --git a/...min/promotion_code_batches/index.html.erb → ...min/promotion_code_batches/index.html.erb b/...min/promotion_code_batches/index.html.erb → ...min/promotion_code_batches/index.html.erb
diff --git a/...admin/promotion_code_batches/new.html.erb → ...admin/promotion_code_batches/new.html.erb b/...admin/promotion_code_batches/new.html.erb → ...admin/promotion_code_batches/new.html.erb
diff --git a/...pree/admin/promotion_codes/index.csv.ruby → ...pree/admin/promotion_codes/index.csv.ruby b/...pree/admin/promotion_codes/index.csv.ruby → ...pree/admin/promotion_codes/index.csv.ruby
diff --git a/...pree/admin/promotion_codes/index.html.erb → ...pree/admin/promotion_codes/index.html.erb b/...pree/admin/promotion_codes/index.html.erb → ...pree/admin/promotion_codes/index.html.erb
diff --git a/.../spree/admin/promotion_codes/new.html.erb → .../spree/admin/promotion_codes/new.html.erb b/.../spree/admin/promotion_codes/new.html.erb → .../spree/admin/promotion_codes/new.html.erb
diff --git a/...spree/admin/promotion_rules/create.js.erb → ...spree/admin/promotion_rules/create.js.erb b/...spree/admin/promotion_rules/create.js.erb → ...spree/admin/promotion_rules/create.js.erb
diff --git a/...pree/admin/promotion_rules/destroy.js.erb → ...pree/admin/promotion_rules/destroy.js.erb b/...pree/admin/promotion_rules/destroy.js.erb → ...pree/admin/promotion_rules/destroy.js.erb
diff --git a/.../spree/admin/promotions/_actions.html.erb → .../spree/admin/promotions/_actions.html.erb b/.../spree/admin/promotions/_actions.html.erb → .../spree/admin/promotions/_actions.html.erb
diff --git a/...min/promotions/_activations_edit.html.erb → ...min/promotions/_activations_edit.html.erb b/...min/promotions/_activations_edit.html.erb → ...min/promotions/_activations_edit.html.erb
diff --git a/...dmin/promotions/_activations_new.html.erb → ...dmin/promotions/_activations_new.html.erb b/...dmin/promotions/_activations_new.html.erb → ...dmin/promotions/_activations_new.html.erb
diff --git a/...ews/spree/admin/promotions/_form.html.erb → ...end/spree/admin/promotions/_form.html.erb b/...ews/spree/admin/promotions/_form.html.erb → ...end/spree/admin/promotions/_form.html.erb
diff --git a/...min/promotions/_promotion_action.html.erb → ...min/promotions/_promotion_action.html.erb b/...min/promotions/_promotion_action.html.erb → ...min/promotions/_promotion_action.html.erb
diff --git a/...admin/promotions/_promotion_rule.html.erb → ...admin/promotions/_promotion_rule.html.erb b/...admin/promotions/_promotion_rule.html.erb → ...admin/promotions/_promotion_rule.html.erb
diff --git a/...ws/spree/admin/promotions/_rules.html.erb → ...nd/spree/admin/promotions/_rules.html.erb b/...ws/spree/admin/promotions/_rules.html.erb → ...nd/spree/admin/promotions/_rules.html.erb
diff --git a/...tions/actions/_create_adjustment.html.erb → ...tions/actions/_create_adjustment.html.erb b/...tions/actions/_create_adjustment.html.erb → ...tions/actions/_create_adjustment.html.erb
diff --git a/...actions/_create_item_adjustments.html.erb → ...actions/_create_item_adjustments.html.erb b/...actions/_create_item_adjustments.html.erb → ...actions/_create_item_adjustments.html.erb
diff --git a/...ons/_create_quantity_adjustments.html.erb → ...ons/_create_quantity_adjustments.html.erb b/...ons/_create_quantity_adjustments.html.erb → ...ons/_create_quantity_adjustments.html.erb
diff --git a/...romotions/actions/_free_shipping.html.erb → ...romotions/actions/_free_shipping.html.erb b/...romotions/actions/_free_shipping.html.erb → ...romotions/actions/_free_shipping.html.erb
diff --git a/...n_calculators_with_custom_fields.html.erb → ...n_calculators_with_custom_fields.html.erb b/...n_calculators_with_custom_fields.html.erb → ...n_calculators_with_custom_fields.html.erb
diff --git a/...ions/calculators/_default_fields.html.erb → ...ions/calculators/_default_fields.html.erb b/...ions/calculators/_default_fields.html.erb → ...ions/calculators/_default_fields.html.erb
diff --git a/...ators/distributed_amount/_fields.html.erb → ...ators/distributed_amount/_fields.html.erb b/...ators/distributed_amount/_fields.html.erb → ...ators/distributed_amount/_fields.html.erb
diff --git a/...ns/calculators/flat_rate/_fields.html.erb → ...ns/calculators/flat_rate/_fields.html.erb b/...ns/calculators/flat_rate/_fields.html.erb → ...ns/calculators/flat_rate/_fields.html.erb
diff --git a/...ulators/tiered_flat_rate/_fields.html.erb → ...ulators/tiered_flat_rate/_fields.html.erb b/...ulators/tiered_flat_rate/_fields.html.erb → ...ulators/tiered_flat_rate/_fields.html.erb
diff --git a/...lculators/tiered_percent/_fields.html.erb → ...lculators/tiered_percent/_fields.html.erb b/...lculators/tiered_percent/_fields.html.erb → ...lculators/tiered_percent/_fields.html.erb
diff --git a/...iews/spree/admin/promotions/edit.html.erb → ...kend/spree/admin/promotions/edit.html.erb b/...iews/spree/admin/promotions/edit.html.erb → ...kend/spree/admin/promotions/edit.html.erb
diff --git a/...ews/spree/admin/promotions/index.html.erb → ...end/spree/admin/promotions/index.html.erb b/...ews/spree/admin/promotions/index.html.erb → ...end/spree/admin/promotions/index.html.erb
diff --git a/...views/spree/admin/promotions/new.html.erb → ...ckend/spree/admin/promotions/new.html.erb b/...views/spree/admin/promotions/new.html.erb → ...ckend/spree/admin/promotions/new.html.erb
diff --git a/...in/promotions/rules/_first_order.html.erb → ...in/promotions/rules/_first_order.html.erb b/...in/promotions/rules/_first_order.html.erb → ...in/promotions/rules/_first_order.html.erb
diff --git a/...les/_first_repeat_purchase_since.html.erb → ...les/_first_repeat_purchase_since.html.erb b/...les/_first_repeat_purchase_since.html.erb → ...les/_first_repeat_purchase_since.html.erb
diff --git a/...min/promotions/rules/_item_total.html.erb → ...min/promotions/rules/_item_total.html.erb b/...min/promotions/rules/_item_total.html.erb → ...min/promotions/rules/_item_total.html.erb
diff --git a/...omotions/rules/_minimum_quantity.html.erb → ...omotions/rules/_minimum_quantity.html.erb b/...omotions/rules/_minimum_quantity.html.erb → ...omotions/rules/_minimum_quantity.html.erb
diff --git a/...dmin/promotions/rules/_nth_order.html.erb → ...dmin/promotions/rules/_nth_order.html.erb b/...dmin/promotions/rules/_nth_order.html.erb → ...dmin/promotions/rules/_nth_order.html.erb
diff --git a/...omotions/rules/_one_use_per_user.html.erb → ...omotions/rules/_one_use_per_user.html.erb b/...omotions/rules/_one_use_per_user.html.erb → ...omotions/rules/_one_use_per_user.html.erb
diff --git a/...n/promotions/rules/_option_value.html.erb → ...n/promotions/rules/_option_value.html.erb b/...n/promotions/rules/_option_value.html.erb → ...n/promotions/rules/_option_value.html.erb
diff --git a/.../admin/promotions/rules/_product.html.erb → .../admin/promotions/rules/_product.html.erb b/.../admin/promotions/rules/_product.html.erb → .../admin/promotions/rules/_product.html.erb
diff --git a/...ee/admin/promotions/rules/_store.html.erb → ...ee/admin/promotions/rules/_store.html.erb b/...ee/admin/promotions/rules/_store.html.erb → ...ee/admin/promotions/rules/_store.html.erb
diff --git a/...ee/admin/promotions/rules/_taxon.html.erb → ...ee/admin/promotions/rules/_taxon.html.erb b/...ee/admin/promotions/rules/_taxon.html.erb → ...ee/admin/promotions/rules/_taxon.html.erb
diff --git a/...ree/admin/promotions/rules/_user.html.erb → ...ree/admin/promotions/rules/_user.html.erb b/...ree/admin/promotions/rules/_user.html.erb → ...ree/admin/promotions/rules/_user.html.erb
diff --git a/...promotions/rules/_user_logged_in.html.erb → ...promotions/rules/_user_logged_in.html.erb b/...promotions/rules/_user_logged_in.html.erb → ...promotions/rules/_user_logged_in.html.erb
diff --git a/...dmin/promotions/rules/_user_role.html.erb → ...dmin/promotions/rules/_user_role.html.erb b/...dmin/promotions/rules/_user_role.html.erb → ...dmin/promotions/rules/_user_role.html.erb
diff --git a/legacy_promotions/solidus_legacy_promotions.gemspec b/legacy_promotions/solidus_legacy_promotions.gemspec
@@ -25,6 +25,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'solidus_core', s.version
   s.add_dependency 'solidus_api', s.version
-  s.add_dependency 'solidus_backend', s.version
   s.add_dependency 'solidus_support'
 end