solidus_promotions 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db60a6f38884af89ad6588b3b6306f7bda9b9d67170ffeee5b171ed72a0ddafb
-  data.tar.gz: 756a0ef51fc6355fa90f5b7824d30d96701b3e9f672da33bf92fa05d845addd3
+  metadata.gz: 8d6349051a6426b230165c4ddb9d0f3e3dc90ea2c27ed9e80b5968757135fe67
+  data.tar.gz: d51b5804b5bcdcfed387a4508bc4cbd7593ee311284b51886cde909423fab6e6
 SHA512:
-  metadata.gz: f8a85cbf84e94bae9702b35cb2dfc376bf5c86f7b144dadfe553637ac51ea8392711cf6fd828773ca358a452f48361a7be5866546a1133fa17cecd46188c75dd
-  data.tar.gz: 0fc83043628ca2454361030801fdd08484a638b9e9a0241d422cd453e40bc6d322cde88c0076741cab1371864a9c75ed1b109c981a762daed816399eefceaec6
+  metadata.gz: 014bfa7ca43f1c7033656d059e26dd7822188b3c024e5e8ca80ef88c981d6569b5abba6712a230ecb15129baf9f94757af9c6bb2b98b5450d63a18c5c2ce1434
+  data.tar.gz: b5e9de86e525f26598e37514f2314e3ee47d5ce9c03cfcfae618f92e18f75ef540da6aa43d36e31dd5a4eafc0491c1003b6a6dff82878eec40a4916962bcdee4

data/config/locales/en.yml

@@ -2,13 +2,15 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
+  solidus_admin:
+    menu_item:
+      promotions: Promotions (new)
+      promotion_categories: Promotion Categories (new)
   spree:
     admin:
       tab:
-        promotions: Promotions
-        promotion_categories: Promotion Categories
-        legacy_promotions: Legacy Promotions
-        legacy_promotion_categories: Legacy Promotion Categories
+        promotions: Promotions (new)
+        promotion_categories: Promotion Categories (new)
     hints:
       solidus_promotions/promotion:
         expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.

data/lib/components/admin/solidus_admin/orders/show/adjustments/index/source/solidus_promotions_benefit/component.rb

@@ -10,8 +10,4 @@ class SolidusAdmin::Orders::Show::Adjustments::Index::Source::SolidusPromotionsB
   def promotion_name
     source.promotion.name
   end
-
-  def solidus_promotions
-    @solidus_promotions ||= SolidusPromotions::Engine.routes.url_helpers
-  end
 end

data/lib/components/admin/solidus_promotions/orders/index/component.yml

@@ -1,3 +1,5 @@
 en:
   filters:
     promotions: Promotions
+  scopes:
+    promotions: Promotions

data/lib/components/admin/solidus_promotions/promotions/index/component.rb

@@ -101,8 +101,4 @@ class SolidusPromotions::Promotions::Index::Component < SolidusAdmin::UI::Pages:
       }
     ]
   end
-
-  def solidus_promotions
-    @solidus_promotions ||= SolidusPromotions::Engine.routes.url_helpers
-  end
 end

data/lib/controllers/admin/solidus_promotions/promotion_categories_controller.rb

@@ -13,7 +13,7 @@ module SolidusPromotions
       set_page_and_extract_portion_from(promotion_categories)
 
       respond_to do |format|
-        format.html { render component("promotion_categories/index").new(page: @page) }
+        format.html { render component("solidus_promotions/categories/index").new(page: @page) }
       end
     end
 

data/lib/controllers/admin/solidus_promotions/promotions_controller.rb

@@ -19,7 +19,7 @@ module SolidusPromotions
       set_page_and_extract_portion_from(promotions)
 
       respond_to do |format|
-        format.html { render component("promotions/index").new(page: @page) }
+        format.html { render component("solidus_promotions/promotions/index").new(page: @page) }
       end
     end
 

data/lib/solidus_promotions/engine.rb

@@ -52,64 +52,71 @@ module SolidusPromotions
       end
     end
 
-    initializer "solidus_promotions.add_admin_order_index_component", after: "solidus_legacy_promotions.add_admin_order_index_component" do
+    initializer "solidus_promotions.add_admin_order_index_component", after: "spree.load_config_initializers" do
       if SolidusSupport.admin_available?
-        SolidusAdmin::Config.components["orders/index"] = "SolidusPromotions::Orders::Index::Component"
-        SolidusAdmin::Config.components["promotions/index"] = "SolidusPromotions::Promotions::Index::Component"
-        SolidusAdmin::Config.components["promotion_categories/index"] = "SolidusPromotions::PromotionCategories::Index::Component"
+        if Spree::Config.promotions.is_a?(SolidusPromotions::Configuration)
+          SolidusAdmin::Config.components["orders/index"] = "SolidusPromotions::Orders::Index::Component"
+        end
+
+        SolidusAdmin::Config.components["solidus_promotions/promotions/index"] = "SolidusPromotions::Promotions::Index::Component"
+        SolidusAdmin::Config.components["solidus_promotions/categories/index"] = "SolidusPromotions::PromotionCategories::Index::Component"
       end
     end
 
-    initializer "solidus_promotions.add_backend_menus", after: "spree.backend.environment" do
-      if SolidusSupport.backend_available?
-        # Replace the promotions menu from core with ours
-        Spree::Backend::Config.configure do |config|
-          config.menu_items = config.menu_items.flat_map do |item|
-            next item unless item.label.to_sym == :promotions
-
-            [
-              Spree::BackendConfiguration::MenuItem.new(
-                label: :promotions,
-                icon: config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
-                condition: -> { can?(:admin, SolidusPromotions::Promotion) },
-                url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotions_path },
-                data_hook: :admin_solidus_promotion_sub_tabs,
-                children: [
-                  Spree::BackendConfiguration::MenuItem.new(
-                    label: :promotions,
-                    url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotions_path },
-                    condition: -> { can?(:admin, SolidusPromotions::Promotion) }
-                  ),
-                  Spree::BackendConfiguration::MenuItem.new(
-                    label: :promotion_categories,
-                    url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotion_categories_path },
-                    condition: -> { can?(:admin, SolidusPromotions::PromotionCategory) }
-                  )
-                ]
-              ),
-              Spree::BackendConfiguration::MenuItem.new(
-                label: :legacy_promotions,
-                icon: config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
-                condition: -> { can?(:admin, SolidusPromotions::Promotion) },
-                url: -> { Spree::Core::Engine.routes.url_helpers.admin_promotions_path },
-                data_hook: :admin_promotion_sub_tabs,
-                children: [
-                  Spree::BackendConfiguration::MenuItem.new(
-                    label: :legacy_promotions,
-                    condition: -> { can?(:admin, Spree::Promotion && Spree::Promotion.any?) },
-                    url: -> { Spree::Core::Engine.routes.url_helpers.admin_promotions_path },
-                  ),
-                  Spree::BackendConfiguration::MenuItem.new(
-                    label: :legacy_promotion_categories,
-                    condition: -> { can?(:admin, Spree::PromotionCategory && Spree::Promotion.any?) },
-                    url: -> { Spree::Core::Engine.routes.url_helpers.admin_promotion_categories_path },
-                  )
-                ]
-              )
+    initializer "solidus_promotions.add_solidus_admin_menu_items", after: "spree.load_config_initializers" do
+      if SolidusSupport.admin_available?
+        SolidusAdmin::Config.configure do |config|
+          config.menu_items << {
+            key: "promotions",
+            route: -> { solidus_promotions.admin_promotions_path },
+            icon: "megaphone-line",
+            position: 1.6,
+            children: [
+              {
+                key: "promotions",
+                route: -> { solidus_promotions.admin_promotions_path },
+                position: 1
+              },
+              {
+                key: "promotion_categories",
+                route: -> { solidus_promotions.admin_promotion_categories_path },
+                position: 1
+              }
             ]
-          end
+          }
         end
       end
     end
+
+    initializer "solidus_promotions.add_backend_menus", after: "spree.backend.environment" 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",
+          condition: -> { can?(:admin, SolidusPromotions::Promotion) },
+          url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotions_path },
+          data_hook: :admin_solidus_promotion_sub_tabs,
+          children: [
+            Spree::BackendConfiguration::MenuItem.new(
+              label: :promotions,
+              url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotions_path },
+              condition: -> { can?(:admin, SolidusPromotions::Promotion) }
+            ),
+            Spree::BackendConfiguration::MenuItem.new(
+              label: :promotion_categories,
+              url: -> { SolidusPromotions::Engine.routes.url_helpers.admin_promotion_categories_path },
+              condition: -> { can?(:admin, SolidusPromotions::PromotionCategory) }
+            )
+          ]
+        )
+
+        # We want to appear after the legacy promotions menu item if it exists, otherwise after the products menu item
+        product_menu_item_index = Spree::Backend::Config.menu_items.find_index { |item| item.label == :products }
+        legacy_promotions_menu_item = Spree::Backend::Config.menu_items.find_index { |item| item.label == :legacy_promotions }
+        promotions_menu_index = [product_menu_item_index, legacy_promotions_menu_item].compact.max + 1
+
+        Spree::Backend::Config.menu_items.insert(promotions_menu_index, promotions_menu_item)
+      end
+    end
   end
 end

data/solidus_promotions.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
-  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.files = files.grep_v(%r{^(spec|bin)/})
 
   spec.add_dependency "importmap-rails", "~> 1.2"
   spec.add_dependency "ransack-enum", "~> 1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: importmap-rails
@@ -204,7 +204,6 @@ files:
 - app/models/solidus_promotions/promotion_handler/page.rb
 - app/models/solidus_promotions/shipping_rate_discount.rb
 - app/subscribers/solidus_promotions/order_promotion_subscriber.rb
-- bin/rails
 - config/importmap.rb
 - config/locales/en.yml
 - config/locales/promotion_categories.en.yml
@@ -352,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/bin/rails

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/solidus_promotions/engine', __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'