alchemy-solidus 7.5.1 → 7.7.0

data/app/patches/models/alchemy/solidus/spree_taxon_patch.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeTaxonPatch
+      def self.prepended(base)
+        base.after_update :touch_alchemy_ingredients
+        base.after_touch :touch_alchemy_ingredients
+        base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeTaxon", as: :related_object, dependent: :nullify
+      end
+
+      ::Spree::Taxon.prepend self
+
+      private
+
+      # Touch all elements that have this taxon assigned to one of its ingredients.
+      # This cascades to all parent elements and pages as well.
+      def touch_alchemy_ingredients
+        InvalidateElementsCacheJob.perform_later("SpreeTaxon", id)
+      end
+    end
+  end
+end

data/app/patches/models/alchemy/solidus/spree_user_patch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeUserPatch
+      def self.prepended(base)
+        base.has_many :folded_pages, class_name: "Alchemy::FoldedPage"
+      end
+
+      def alchemy_display_name
+        email
+      end
+
+      def alchemy_roles
+        if has_spree_role?(:admin)
+          %w[admin]
+        else
+          []
+        end
+      end
+
+      if defined?(::Spree::User)
+        ::Spree::User.prepend self
+      end
+    end
+  end
+end

data/app/patches/models/alchemy/solidus/spree_variant_patch.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeVariantPatch
+      def self.prepended(base)
+        base.after_update :touch_alchemy_ingredients
+        base.after_touch :touch_alchemy_ingredients
+        base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeVariant", as: :related_object, dependent: :nullify
+      end
+
+      ::Spree::Variant.prepend self
+
+      private
+
+      # Touch all elements that have this variant assigned to one of its ingredients.
+      # This cascades to all parent elements and pages as well.
+      def touch_alchemy_ingredients
+        InvalidateElementsCacheJob.perform_later("SpreeVariant", id)
+      end
+    end
+  end
+end

data/app/views/alchemy/ingredients/_spree_product_editor.html.erb

@@ -3,26 +3,15 @@
   data: spree_product_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_product_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_product_editor, :product_id) %>
-    <%= f.text_field :product_id,
-      value: spree_product_editor.product&.id,
-      id: spree_product_editor.form_field_id(:product_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::ProductSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_product_editor.settings[:query_params],
+      product: spree_product_editor.product
+    ) do %>
+      <%= f.text_field :product_id,
+        value: spree_product_editor.product&.id,
+        id: spree_product_editor.form_field_id(:product_id),
+        class: 'full_width' %>
+    <% end %>
   <% end %>
 <% end %>
-
-<script type="module">
-  import "alchemy_solidus/product_select"
-
-  $('#<%= spree_product_editor.form_field_id(:product_id) %>').alchemyProductSelect({
-    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_products_path %>",
-    query_params: <%== spree_product_editor.settings[:query_params].to_json %>,
-    <% if spree_product_editor.product %>
-    initialSelection: {
-      id: <%= spree_product_editor.product.id %>,
-      text: "<%= spree_product_editor.product.name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/ingredients/_spree_taxon_editor.html.erb

@@ -3,26 +3,15 @@
   data: spree_taxon_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_taxon_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_taxon_editor, :taxon_id) %>
-    <%= f.text_field :taxon_id,
-      value: spree_taxon_editor.taxon&.id,
-      id: spree_taxon_editor.form_field_id(:taxon_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::TaxonSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_taxon_editor.settings[:query_params],
+      taxon: spree_taxon_editor.ingredient.taxon
+    ) do %>
+      <%= f.text_field :taxon_id,
+        value: spree_taxon_editor.taxon&.id,
+        id: spree_taxon_editor.form_field_id(:taxon_id),
+        class: "full_width" %>
+    <% end %>
   <% end %>
 <% end %>
-
-<script type="module">
-  import "alchemy_solidus/taxon_select"
-
-  $('#<%= spree_taxon_editor.form_field_id(:taxon_id) %>').alchemyTaxonSelect({
-    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_taxons_path %>",
-    query_params: <%== spree_taxon_editor.settings[:query_params].to_json %>,
-    <% if spree_taxon_editor.taxon %>
-    initialSelection: {
-      id: <%= spree_taxon_editor.taxon.id %>,
-      text: "<%= spree_taxon_editor.taxon.pretty_name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/ingredients/_spree_variant_editor.html.erb

@@ -3,10 +3,16 @@
   data: spree_variant_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_variant_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_variant_editor, :variant_id) %>
-    <%= f.text_field :variant_id,
-      value: spree_variant_editor.variant&.id,
-      id: spree_variant_editor.form_field_id(:variant_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::VariantSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_variant_editor.settings[:query_params],
+      variant: spree_variant_editor.ingredient.variant
+    ) do %>
+      <%= f.text_field :variant_id,
+        value: spree_variant_editor.variant&.id,
+        id: spree_variant_editor.form_field_id(:variant_id),
+        class: 'alchemy_selectbox full_width' %>
+    <% end %>
   <% end %>
 <% end %>
 
@@ -28,21 +34,3 @@
     }
   }
 </style>
-
-<script type="module">
-  import "alchemy_solidus/variant_select"
-
-  $('#<%= spree_variant_editor.form_field_id(:variant_id) %>').alchemyVariantSelect({
-    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_variants_path %>",
-    query_params: <%== spree_variant_editor.settings[:query_params].to_json %>,
-    <% if spree_variant_editor.variant %>
-    initialSelection: {
-      id: <%= spree_variant_editor.variant.id %>,
-      name: "<%= spree_variant_editor.variant.name %>",
-      options_text: "<%= spree_variant_editor.variant.options_text %>"
-    }
-    <% end %>
-  })
-</script>

data/config/initializers/alchemy.rb

@@ -1,27 +1,27 @@
 alchemy_module = {
-  engine_name: 'spree',
-  name: 'solidus',
+  engine_name: "spree",
+  name: "solidus",
   navigation: {
-    controller: '/spree/admin/orders',
-    action: 'index',
-    name: 'Store',
-    icon: Alchemy.gem_version >= Gem::Version.new("7.4.0.a") ? 'shopping-cart' : 'shopping-cart-line',
-    data: { turbolinks: false },
+    controller: "/spree/admin/orders",
+    action: "index",
+    name: "Store",
+    icon: (Alchemy.gem_version >= Gem::Version.new("7.4.0.a")) ? "shopping-cart" : "shopping-cart-line",
+    data: {turbolinks: false},
     sub_navigation: [
       {
-        controller: '/spree/admin/orders',
-        action: 'index',
-        name: 'Orders'
+        controller: "/spree/admin/orders",
+        action: "index",
+        name: "Orders"
       },
       {
-        controller: '/spree/admin/products',
-        action: 'index',
-        name: 'Products'
+        controller: "/spree/admin/products",
+        action: "index",
+        name: "Products"
       },
       {
-        controller: '/spree/admin/stock_items',
-        action: 'index',
-        name: 'Stock'
+        controller: "/spree/admin/stock_items",
+        action: "index",
+        name: "Stock"
       }
     ]
   }
@@ -30,12 +30,12 @@ alchemy_module = {
 if defined?(Spree::Auth::Engine)
   alchemy_module[:navigation][:sub_navigation].push(
     {
-      controller: '/spree/admin/users',
-      action: 'index',
-      name: 'Users'
+      controller: "/spree/admin/users",
+      action: "index",
+      name: "Users"
     }
   )
-  Alchemy.user_class_name = 'Spree::User'
+  Alchemy.user_class_name = "Spree::User"
   Alchemy.current_user_method = :spree_current_user
 
   if Alchemy.respond_to?(:logout_method)

data/config/initializers/spree.rb

@@ -24,13 +24,13 @@ Rails.application.config.after_initialize do
             match_path: "/languages"
           ),
           (if defined?(Alchemy::Devise::Engine)
-              config.class::MenuItem.new(
-                label: :users,
-                condition: -> { can?(:index, :alchemy_admin_users) },
-                url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
-                match_path: "/users"
-              )
-            end),
+             config.class::MenuItem.new(
+               label: :users,
+               condition: -> { can?(:index, :alchemy_admin_users) },
+               url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
+               match_path: "/users"
+             )
+           end),
           config.class::MenuItem.new(
             label: :tags,
             condition: -> { can?(:index, :alchemy_admin_tags) },

data/lib/alchemy/solidus/engine.rb

@@ -4,6 +4,12 @@ require "solidus_core"
 require "solidus_backend"
 require "solidus_support"
 
+begin
+  require "solidus_frontend"
+rescue LoadError
+  # Solidus frontend is not available, but we can still load the engine
+end
+
 module Alchemy
   module Solidus
     class Engine < ::Rails::Engine
@@ -25,26 +31,21 @@ module Alchemy
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
 
-        if Alchemy.user_class_name == "::Spree::User"
-          require "alchemy/solidus/spree_user_extension"
-          Spree::User.include Alchemy::Solidus::SpreeUserExtension
-        end
-
-        if Alchemy.user_class_name == "::Alchemy::User"
-          require "alchemy/solidus/alchemy_user_extension"
-          require "alchemy/solidus/current_user_helpers"
-          Alchemy::User.include Alchemy::Solidus::AlchemyUserExtension
-          ApplicationController.include Alchemy::Solidus::CurrentUserHelpers
-          require "alchemy/solidus/spree_admin_unauthorized_redirect"
-        end
-
         if SolidusSupport.frontend_available?
           # Allows to render Alchemy content within Solidus' controller views
-          require_dependency "alchemy/solidus/alchemy_in_solidus"
+
+          # Do not prefix element view partials with `spree` namespace.
+          # See https://github.com/AlchemyCMS/alchemy_cms/issues/1626
+          ActionView::Base.prefix_partial_path_with_controller_namespace = false
         end
+      end
 
-        # Allows to use Solidus helpers within Alchemys controller views
-        require_dependency "alchemy/solidus/use_solidus_layout"
+      initializer "alchemy_solidus.patches" do |app|
+        if Alchemy.gem_version < Gem::Version.new("7.4.0") && SolidusSupport.backend_available?
+          app.config.to_prepare do
+            Alchemy::Solidus::SpreeAdminBaseControllerPatch
+          end
+        end
       end
     end
   end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.5.1"
+    VERSION = "7.7.0"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -15,29 +15,29 @@ module Alchemy
       desc "Installs Alchemy Solidus into your App."
 
       class_option :skip_alchemy_installer,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Alchemy installer"
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Alchemy installer"
       class_option :skip_alchemy_devise_installer,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :skip_spree_custom_user_generator,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :skip_alchemy_user_generator,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :auto_accept,
-                   default: false,
-                   type: :boolean,
-                   desc: "Set true if run from a automated script (ie. on a CI)"
+        default: false,
+        type: :boolean,
+        desc: "Set true if run from a automated script (ie. on a CI)"
 
       source_root File.expand_path("files", __dir__)
 
@@ -66,7 +66,7 @@ module Alchemy
 
       def run_spree_custom_user_generator
         if alchemy_devise_present? &&
-             !options[:skip_spree_custom_user_generator]
+            !options[:skip_spree_custom_user_generator]
           arguments =
             (
               if options[:auto_accept]
@@ -77,15 +77,15 @@ module Alchemy
             )
           Spree::CustomUserGenerator.start(arguments)
           gsub_file "lib/spree/authentication_helpers.rb",
-                    /main_app\./,
-                    "Alchemy."
+            /main_app\./,
+            "Alchemy."
           rake("db:migrate", abort_on_failure: true)
         end
       end
 
       def create_admin_user
         if alchemy_devise_present? && !options[:skip_alchemy_user_generator] &&
-             Alchemy::User.count.zero?
+            Alchemy::User.count.zero?
           login = ENV.fetch("ALCHEMY_ADMIN_USER_LOGIN", "admin")
           email = ENV.fetch("ALCHEMY_ADMIN_USER_EMAIL", "admin@example.com")
           password = ENV.fetch("ALCHEMY_ADMIN_USER_PASSWORD", "test1234")
@@ -123,12 +123,12 @@ module Alchemy
               default: mountpoint
             )
         end
-        if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
-          sentinel = SPREE_MOUNT_REGEXP
+        sentinel = if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
+          SPREE_MOUNT_REGEXP
         else
-          sentinel = "Rails.application.routes.draw do\n"
+          "Rails.application.routes.draw do\n"
         end
-        inject_into_file routes_file_path, { after: sentinel } do
+        inject_into_file routes_file_path, {after: sentinel} do
           "\n  mount Alchemy::Engine, at: '/#{mountpoint.chomp("/")}'\n"
         end
       end
@@ -136,12 +136,12 @@ module Alchemy
       def set_root_route
         routes_file_path = Rails.root.join("config", "routes.rb")
         if options[:auto_accept] ||
-             yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
+            yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
           sentinel = "Rails.application.routes.draw do\n"
-          inject_into_file routes_file_path, { after: sentinel } do
+          inject_into_file routes_file_path, {after: sentinel} do
             <<~ROOT_ROUTE
-              \  # Let AlchemyCMS handle the root route
-              \  root to: 'alchemy/pages#index'
+              # Let AlchemyCMS handle the root route
+              root to: 'alchemy/pages#index'
             ROOT_ROUTE
           end
           copy_file("db/seeds/alchemy/pages.yml")
@@ -151,7 +151,7 @@ module Alchemy
 
       def append_assets
         append_file "vendor/assets/javascripts/alchemy/admin/all.js",
-                    "//= require alchemy/solidus/admin.js"
+          "//= require alchemy/solidus/admin.js"
       end
 
       private

data/lib/patches/backend/controllers/alchemy/solidus/spree_admin_base_controller_patch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeAdminBaseControllerPatch
+      def self.prepended(base)
+        if Alchemy.user_class_name == "::Alchemy::User"
+          base.unauthorized_redirect = -> do
+            if spree_current_user
+              flash[:error] = I18n.t("spree.authorization_failure")
+              redirect_to spree.root_path
+            else
+              store_location
+              redirect_to Alchemy.login_path
+            end
+          end
+        end
+      end
+
+      if defined?(::Spree::Admin::BaseController)
+        ::Spree::Admin::BaseController.prepend self
+      end
+    end
+  end
+end

data/lib/patches/frontend/controllers/alchemy/solidus/spree_store_controller_patch.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeStoreControllerPatch
+      # Allows to render Alchemy content within Solidus' controller views
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+        base.include Alchemy::ConfigurationMethods
+      end
+
+      if defined?(::Spree::StoreController)
+        ::Spree::StoreController.prepend self
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.5.1
+  version: 7.7.0
 platform: ruby
 authors:
 - Thomas von Deyen
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -85,7 +85,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -243,26 +243,37 @@ files:
 - app/assets/javascripts/alchemy/solidus/admin.js
 - app/components/alchemy/admin/link_dialog/product_tab.rb
 - app/components/alchemy/admin/product_select.rb
+- app/components/alchemy/admin/taxon_select.rb
+- app/components/alchemy/admin/variant_select.rb
 - app/components/alchemy/ingredients/spree_product_view.rb
 - app/components/alchemy/ingredients/spree_taxon_view.rb
 - app/components/alchemy/ingredients/spree_variant_view.rb
-- app/decorators/models/alchemy/solidus/spree_product_decorator.rb
-- app/decorators/models/alchemy/solidus/spree_taxon_decorator.rb
-- app/decorators/models/alchemy/solidus/spree_variant_decorator.rb
 - app/javascript/alchemy_solidus.js
+- app/javascript/alchemy_solidus/components/ajax_config.js
 - app/javascript/alchemy_solidus/components/product_select.js
-- app/javascript/alchemy_solidus/product_select.js
-- app/javascript/alchemy_solidus/select2_config.js
-- app/javascript/alchemy_solidus/taxon_select.js
-- app/javascript/alchemy_solidus/variant_select.js
+- app/javascript/alchemy_solidus/components/taxon_select.js
+- app/javascript/alchemy_solidus/components/variant_select.js
+- app/jobs/alchemy/solidus/base_job.rb
+- app/jobs/alchemy/solidus/invalidate_elements_cache_job.rb
 - app/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
-- app/models/alchemy/solidus/touch_alchemy_ingredients.rb
 - app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
+- app/patches/controllers/alchemy/solidus/alchemy_base_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/application_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_confirmations_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_passwords_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_registrations_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_sessions_controller_patch.rb
+- app/patches/helpers/alchemy/solidus/alchemy_base_helper_patch.rb
+- app/patches/models/alchemy/solidus/alchemy_user_patch.rb
+- app/patches/models/alchemy/solidus/spree_product_patch.rb
+- app/patches/models/alchemy/solidus/spree_taxon_patch.rb
+- app/patches/models/alchemy/solidus/spree_user_patch.rb
+- app/patches/models/alchemy/solidus/spree_variant_patch.rb
 - app/views/alchemy/ingredients/_spree_product_editor.html.erb
 - app/views/alchemy/ingredients/_spree_product_view.html.erb
 - app/views/alchemy/ingredients/_spree_taxon_editor.html.erb
@@ -277,20 +288,13 @@ files:
 - config/locales/alchemy_solidus_en.yml
 - config/locales/alchemy_solidus_it.yml
 - config/locales/en.yml
-- db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
-- db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb
-- db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb
 - lib/alchemy-solidus.rb
-- lib/alchemy/solidus/alchemy_in_solidus.rb
-- lib/alchemy/solidus/alchemy_user_extension.rb
-- lib/alchemy/solidus/current_user_helpers.rb
 - lib/alchemy/solidus/engine.rb
-- lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb
-- lib/alchemy/solidus/spree_user_extension.rb
-- lib/alchemy/solidus/use_solidus_layout.rb
 - lib/alchemy/solidus/version.rb
 - lib/generators/alchemy/solidus/install/files/db/seeds/alchemy/pages.yml
 - lib/generators/alchemy/solidus/install/install_generator.rb
+- lib/patches/backend/controllers/alchemy/solidus/spree_admin_base_controller_patch.rb
+- lib/patches/frontend/controllers/alchemy/solidus/spree_store_controller_patch.rb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD-3-Clause
@@ -309,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!

data/app/decorators/models/alchemy/solidus/spree_taxon_decorator.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Solidus
-    module SpreeTaxonDecorator
-      def self.prepended(base)
-        base.include Alchemy::Solidus::TouchAlchemyIngredients
-        base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeTaxon", as: :related_object, dependent: :nullify
-      end
-
-      ::Spree::Taxon.prepend self
-    end
-  end
-end

data/app/decorators/models/alchemy/solidus/spree_variant_decorator.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Solidus
-    module SpreeVariantDecorator
-      def self.prepended(base)
-        base.include Alchemy::Solidus::TouchAlchemyIngredients
-        base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeVariant", as: :related_object, dependent: :nullify
-      end
-
-      ::Spree::Variant.prepend self
-    end
-  end
-end