solidus_legacy_promotions 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d7efd633c012b29dd74c0586dac9c26b1a39c90e2ba9fb956843913cf00cf5
-  data.tar.gz: 5ebe9bde3952c34717157d2229f34c12e79e95a43114bb459966457fa433a97f
+  metadata.gz: f7e25a87b32de8febdd67d28fa5a558d26c5128875d06b637b8ed52bfa0a2dc9
+  data.tar.gz: 98d7ff2153ecc29358483226092aa7001aa4f1e4e3a64ed0db8d97c662ad9786
 SHA512:
-  metadata.gz: f8235d2a505e5c77ed0d1c1867e7fc2296ad1c130b225181225b096deb5f027bfba955fc3ef02824383bb9733956a25badbfd385b6466c478d8fd1947520e487
-  data.tar.gz: 9cd8c70170387dd5c8c2875bcb6a570704410eded75113d7833e816f05948d48acc592de1272661db249add575ae8ac4e0d1b758238e6f1fbae141e8a480c8c2
+  metadata.gz: f71034d931089916518921d45a125ec90a345d1db2fe1579eabfb0fe39afa3e0ec55c6d548929a7b25ac48359a3b8330b5cb87e90293e98d63c567b3ec5ed649
+  data.tar.gz: 690f0d2397d6fbe4d1bc144aef2b4f8f49fc7a7ea061be32b249452f30b7ca72c6382c91f8a882960887d16f9b0da2bbe82160855210b9f0cc2035fe3b2e83fc

data/app/assets/stylesheets/solidus_legacy_promotions/promotions.scss

@@ -1,3 +1,3 @@
-@import "spree/backend/themes/classic";
+@import "spree/backend/globals/variables";
 
 @import "solidus_legacy_promotions/promotions/edit";

data/app/decorators/solidus_legacy_promotions/models/spree_line_item_decorator.rb

@@ -2,6 +2,11 @@
 
 module SolidusLegacyPromotions
   module SpreeLineItemDecorator
+    def self.prepended(base)
+      base.has_many :line_item_actions, dependent: :destroy
+      base.has_many :actions, through: :line_item_actions
+    end
+
     def total_before_tax
       amount + adjustments.select { |value| !value.tax? && value.eligible? }.sum(&:amount)
     end

data/app/models/spree/line_item_action.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class LineItemAction < Spree::Base
+    belongs_to :line_item, optional: true
+    belongs_to :action, class_name: "Spree::PromotionAction", optional: true
+  end
+end

data/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  solidus_admin:
+    menu_item:
+      legacy_promotions: Promotions
+      legacy_promotion_categories: Promotion Categories
   spree:
     admin:
       promotion_status:
@@ -23,8 +27,8 @@ en:
           general: General
           starts_at_placeholder: Immediately
       tab:
-        promotion_categories: Promotion Categories
-        promotions: Promotions
+        legacy_promotions: Promotions
+        legacy_promotion_categories: Promotion Categories
     back_to_promotion_categories_list: Back To Promotions Categories List
     back_to_promotions_list: Back To Promotions List
     base_amount: Base Amount

data/db/migrate/20160101010001_solidus_one_four_promotions.rb

@@ -122,5 +122,17 @@ class SolidusOneFourPromotions < ActiveRecord::Migration[5.0]
         t.index ["starts_at"], name: "index_spree_promotions_on_starts_at"
       end
     end
+
+    unless table_exists?(:spree_line_item_actions)
+      create_table "spree_line_item_actions", force: :cascade do |t|
+        t.integer "line_item_id", null: false
+        t.integer "action_id", null: false
+        t.integer "quantity", default: 0
+        t.datetime "created_at", precision: 6
+        t.datetime "updated_at", precision: 6
+        t.index ["action_id"], name: "index_spree_line_item_actions_on_action_id"
+        t.index ["line_item_id"], name: "index_spree_line_item_actions_on_line_item_id"
+      end
+    end
   end
 end

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

@@ -1,20 +1,5 @@
 en:
-  columns:
-    items:
-      one: 1 Item
-      other: '%{count} Items'
   filters:
-    status: Status
-    shipment_state: Shipment State
-    payment_state: Payment State
     promotions: Promotions
-  date:
-    formats:
-      short: '%d %b %y'
   scopes:
-    all_orders: All
-    canceled: Canceled
-    complete: Complete
-    returned: Returned
-    in_progress: In Progress
     promotions: Promotions

data/lib/solidus_legacy_promotions/engine.rb

@@ -9,7 +9,7 @@ module SolidusLegacyPromotions
     initializer "solidus_legacy_promotions.add_backend_menu_item" do
       if SolidusSupport.backend_available?
         promotions_menu_item = Spree::BackendConfiguration::MenuItem.new(
-          label: :promotions,
+          label: :legacy_promotions,
           icon: Spree::Backend::Config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
           partial: "spree/admin/shared/promotion_sub_menu",
           condition: -> { can?(:admin, Spree::Promotion) },
@@ -17,12 +17,14 @@ module SolidusLegacyPromotions
           data_hook: :admin_promotion_sub_tabs,
           children: [
             Spree::BackendConfiguration::MenuItem.new(
-              label: :promotions,
-              condition: -> { can?(:admin, Spree::Promotion) }
+              label: :legacy_promotions,
+              condition: -> { can?(:admin, Spree::Promotion) },
+              url: :admin_promotions_path
             ),
             Spree::BackendConfiguration::MenuItem.new(
-              label: :promotion_categories,
-              condition: -> { can?(:admin, Spree::PromotionCategory) }
+              label: :legacy_promotion_categories,
+              condition: -> { can?(:admin, Spree::PromotionCategory) },
+              url: -> { Spree::Core::Engine.routes.url_helpers.admin_promotion_categories_path },
             )
           ]
         )
@@ -41,10 +43,22 @@ module SolidusLegacyPromotions
       if SolidusSupport.admin_available?
         SolidusAdmin::Config.configure do |config|
           config.menu_items << {
-            key: "promotions",
+            key: "legacy_promotions",
             route: -> { spree.admin_promotions_path },
             icon: "megaphone-line",
-            position: 30
+            position: 1.5,
+            children: [
+              {
+                key: "legacy_promotions",
+                route: -> { spree.admin_promotions_path },
+                position: 1
+              },
+              {
+                key: "legacy_promotion_categories",
+                route: -> { spree.admin_promotion_categories_path },
+                position: 2
+              }
+            ]
           }
         end
       end

data/solidus_legacy_promotions.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(spec|script)/})
+    f.match(%r{^(spec|bin)/})
   end
 
   s.required_ruby_version = '>= 3.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ files:
 - app/models/spree/calculator/percent_on_line_item.rb
 - app/models/spree/calculator/tiered_flat_rate.rb
 - app/models/spree/calculator/tiered_percent.rb
+- app/models/spree/line_item_action.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_promotion.rb
 - app/models/spree/permission_sets/promotion_display.rb
@@ -140,7 +141,6 @@ files:
 - app/views/spree/order_mailer/confirm_email.text.erb
 - app/views/spree/promotion_code_batch_mailer/promotion_code_batch_errored.text.erb
 - app/views/spree/promotion_code_batch_mailer/promotion_code_batch_finished.text.erb
-- bin/rails
 - config/locales/en.yml
 - config/locales/promotion_categories.en.yml
 - config/locales/promotions.en.yml

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_legacy_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"