Merge pull request #5919 from solidusio/backport/v4.4/pr-5916

[v4.4] Move Line Item Actions to solidus_legacy_promotions
solidusio · Nov 14, 2024 · 7202221 · 7202221
2 parents 4b5beac + 9e4e06e
commit 7202221
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
@@ -19,9 +19,6 @@ class LineItem < Spree::Base
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
     has_many :inventory_units, inverse_of: :line_item
 
-    has_many :line_item_actions, dependent: :destroy
-    has_many :actions, through: :line_item_actions
-
     before_validation :normalize_quantity
     before_validation :set_required_attributes
 

diff --git a/core/db/migrate/20160101010000_solidus_one_four.rb b/core/db/migrate/20160101010000_solidus_one_four.rb
@@ -197,16 +197,6 @@ def up
       t.index ["variant_id"], name: "index_inventory_units_on_variant_id"
     end
 
-    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
-
     create_table "spree_line_items", force: :cascade do |t|
       t.integer "variant_id"
       t.integer "order_id"

diff --git a/...y_promotions/app/decorators/solidus_legacy_promotions/models/spree_line_item_decorator.rb b/...y_promotions/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

diff --git a/core/app/models/spree/line_item_action.rb → ...promotions/app/models/line_item_action.rb b/core/app/models/spree/line_item_action.rb → ...promotions/app/models/line_item_action.rb
diff --git a/legacy_promotions/db/migrate/20160101010001_solidus_one_four_promotions.rb b/legacy_promotions/db/migrate/20160101010001_solidus_one_four_promotions.rb
@@ -122,5 +122,17 @@ def up
         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