alchemy-solidus 6.3.0 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0871f7a06ef602fcd95d7c20e3caf64016e226fd6741fb00634a1eadf8d1ee0
-  data.tar.gz: 4f8e1ea07ac7881657577aac59f70542aaf292a52c084a05eb56c736d8489156
+  metadata.gz: dfce794c5eb3858c868d40897476a4f377f444772dd0fc7086c849d09b979561
+  data.tar.gz: ed9c3370efa9b829cd4485a43b4c496f2e49a6835dd91468765558c8efc3c255
 SHA512:
-  metadata.gz: 066107a45e63c075b4fe68ad8588c396d0b60cba2af16e32881078aa29d356e34c72e4338150db683a23bda4489e34f51dc1960f216d74356afeec5e38d758ef
-  data.tar.gz: c92e64257ab9a192086ca5dffbf27f1ce32fb6435c1f82fa6f07994f933489359490002f519d10fe2206de53ff03571d88fb12f62692f0f29b6d718d3941211f
+  metadata.gz: f7ab0cf771f9214a7585231e179a27cb79f41ece1ad55627f6d54ba9311c01d855de49c3e9983a9dd7edc95609e85a51f520b1d38b303c50f846cdba7e3d4a86
+  data.tar.gz: 90827b677754ee6908381ea7e9cde78a4dc349928a995ef05bd4508f8635d7d4eb44ff2c6e8a2b757f3d0a50093e410f4288c96a088ef83e0308d167226cbc21

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-14, magic labs*
+Copyright (c) Blish GmbH
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/Rakefile

@@ -16,7 +16,7 @@ require "active_support/core_ext/string"
 
 desc "Setup test app"
 task :test_setup do
-  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.0")
+  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
   solidus_32_install_options =
     "--payment-method none --frontend none --no-with-authentication"
   solidus_33_install_options =

data/app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface

@@ -1,4 +1,4 @@
-<!-- insert_bottom "#overlay_tabs" -->
+<!-- insert_bottom "div#overlay_tabs" -->
 
 <div id="overlay_tab_product_link">
   <%= render "product_link" %>

data/app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "sl-tab-group#overlay_tabs" -->
+
+<sl-tab-panel name="overlay_tab_product_link" id="overlay_tab_product_link">
+  <%= render "product_link" %>
+</sl-tab-panel>

data/app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "sl-tab-group#overlay_tabs" -->
+
+<sl-tab slot="nav" panel="overlay_tab_product_link">
+  <%= Alchemy.t("link_overlay_tab_label.product") %>
+</sl-tab>

data/app/views/alchemy/admin/pages/_product_link.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag do %>
+<form data-link-form-type="product">
   <%= render_message do %>
     <h3><%= Alchemy.t(:choose_product_to_link) %></h3>
   <% end %>
@@ -23,8 +23,8 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'product' } %>
+    <%= button_tag Alchemy.t(:apply), class: "create-link button", data: { link_type: "product" } %>
   </div>
-<% end %>
+</form>
 
 <%= render "product_link_script" %>

data/config/initializers/spree.rb

@@ -2,66 +2,69 @@ if defined?(Alchemy::Devise::Engine)
   Spree.user_class = "Alchemy::User"
 end
 
-Spree::Backend::Config.configure do |config|
-  alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
-    config.class::MenuItem.new(
-      label: :cms,
-      icon: "copy",
-      condition: -> { can?(:index, :alchemy_admin_dashboard) },
-      url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
-      children: [
-        config.class::MenuItem.new(
-          label: :pages,
-          condition: -> { can?(:index, :alchemy_admin_pages) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
-          match_path: "/pages"
-        ),
-        config.class::MenuItem.new(
-          label: :languages,
-          condition: -> { can?(:index, :alchemy_admin_sites) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
-          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: :tags,
-          condition: -> { can?(:index, :alchemy_admin_tags) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
-        ),
-        config.class::MenuItem.new(
-          label: :pictures,
-          condition: -> { can?(:index, :alchemy_admin_pictures) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
-        ),
-        config.class::MenuItem.new(
-          label: :attachments,
-          condition: -> { can?(:index, :alchemy_admin_attachments) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
-        )
-      ].compact
-    )
-  else
-    config.class::MenuItem.new(
-      [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
-      "copy",
-      label: :cms,
-      condition: -> { can?(:index, :alchemy_admin_dashboard) },
-      partial: "spree/admin/shared/alchemy_sub_menu",
-      url: "/admin/pages",
-      match_path: "/pages"
-    )
+Rails.application.config.after_initialize do
+  Spree::Backend::Config.configure do |config|
+    alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
+      config.class::MenuItem.new(
+        label: :cms,
+        icon: config.admin_updated_navbar ? "ri-pages-line" : "copy",
+        condition: -> { can?(:index, :alchemy_admin_dashboard) },
+        url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
+        children: [
+          config.class::MenuItem.new(
+            label: :pages,
+            condition: -> { can?(:index, :alchemy_admin_pages) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
+            match_path: "/pages"
+          ),
+          config.class::MenuItem.new(
+            label: :languages,
+            condition: -> { can?(:index, :alchemy_admin_sites) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
+            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: :tags,
+            condition: -> { can?(:index, :alchemy_admin_tags) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
+          ),
+          config.class::MenuItem.new(
+            label: :pictures,
+            condition: -> { can?(:index, :alchemy_admin_pictures) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
+          ),
+          config.class::MenuItem.new(
+            label: :attachments,
+            condition: -> { can?(:index, :alchemy_admin_attachments) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
+          )
+        ].compact
+      )
+    else
+      config.class::MenuItem.new(
+        [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
+        "copy",
+        label: :cms,
+        condition: -> { can?(:index, :alchemy_admin_dashboard) },
+        partial: "spree/admin/shared/alchemy_sub_menu",
+        url: "/admin/pages",
+        match_path: "/pages"
+      )
+    end
+    settings = config.menu_items.detect { |item| item.label == :settings }
+    config.menu_items.index(settings).tap do |index|
+      config.menu_items.insert(index, alchemy_menu_item)
+    end
   end
-  config.menu_items << alchemy_menu_item
-end
 
-Rails.application.config.after_initialize do
   if Spree::Backend::Config.menu_items.many? { |menu_item| menu_item.label == :cms }
     Alchemy::Deprecation.warn("You configured the Alchemy menu items in your app's initializers. We can do that for you now! Please remove the menu item with the label `:cms`.")
   end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "6.3.0"
+    VERSION = "6.3.2"
   end
 end

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

@@ -1,12 +1,5 @@
 require "rails/generators"
-require "alchemy/version"
-
-if Alchemy.gem_version >= Gem::Version.new("5.0.0.a")
-  require "generators/alchemy/install/install_generator"
-else
-  require "rails/generators/alchemy/install/install_generator"
-end
-
+require "generators/alchemy/install/install_generator"
 require "generators/spree/custom_user/custom_user_generator"
 require "solidus_support"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.2
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -246,6 +246,8 @@ files:
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.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/views/alchemy/admin/pages/_product_link.html.erb
 - app/views/alchemy/admin/pages/_product_link_script.html.erb
@@ -295,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible