solidus_promotions 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaae8dc702bc52d537b6e0e3ab7a77ec52091890f443a6a30a63c3de58c6a097
-  data.tar.gz: ea14d817d57406914450fe4690b9dbf4db628f11cb456c15b7a92b53fdf293a7
+  metadata.gz: 9816f1dc64aa56a38370532954b8857c38a66e23b9a1ec06ca8031071849245f
+  data.tar.gz: 3d6c2a59d9585cca37cdbc38a82874cffbce16f041e62cad93436f84a9edc788
 SHA512:
-  metadata.gz: 60687b2516232af51dc68e97acbb2ef345eab68265917435991ce48bca89c5cc015c12e96fd2268e65c06ed3b3d38b8b1a2c4a49760fd5d09823886d9866d978
-  data.tar.gz: 017a4995a3feafd499cff0ccadd46665c003fdc45396f385e639222da15684fb177ee2f0a7bddedb6663a42a392c5301a386f1667281e21e85c45521e7e27070
+  metadata.gz: 145db9f71674ed56a44202500d6a91549677e673a11c1c56ec4b90a6442458ec3fb249c4fba968db9997150453f4df2b78badce65b32e66be6bacb1b4195ec7d
+  data.tar.gz: bc1fa2598d2b7621b04c11ef31e0e2760d9c9667d6fb25b20a20e677d2aa7616f0a850e0491e815e962189d8784cdeea601e8b6d065f125f788b10f8dba46645

data/app/models/solidus_promotions/benefit.rb

@@ -40,7 +40,7 @@ module SolidusPromotions
     # @!attribute [rw] promotion
     #   The owning promotion.
     #   @return [SolidusPromotions::Promotion]
-    belongs_to :promotion, inverse_of: :benefits
+    belongs_to :promotion, -> { with_discarded }, inverse_of: :benefits
     # @!attribute [rw] original_promotion_action
     #   Back-reference to the original Solidus (Spree) promotion action, when migrated.
     #   @return [Spree::PromotionAction, nil]

data/app/models/solidus_promotions/permission_sets/solidus_promotion_management.rb

@@ -3,6 +3,16 @@
 module SolidusPromotions
   module PermissionSets
     class SolidusPromotionManagement < Spree::PermissionSets::Base
+      class << self
+        def privilege
+          :management
+        end
+
+        def category
+          :solidus_promotion
+        end
+      end
+
       def activate!
         can :manage, SolidusPromotions::Promotion
         can :manage, SolidusPromotions::Condition

data/app/models/solidus_promotions/promotion.rb

@@ -12,7 +12,7 @@ module SolidusPromotions
       optional: true,
       inverse_of: :promotions
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
-    has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
+    has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy, inverse_of: :promotion
     has_many :conditions, through: :benefits
     has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy, inverse_of: :promotion
     has_many :code_batches, class_name: "SolidusPromotions::PromotionCodeBatch", dependent: :destroy
@@ -173,6 +173,7 @@ module SolidusPromotions
 
     def delete_cart_connections
       order_promotions.where(order: Spree::Order.incomplete).destroy_all
+      benefits.each(&:remove_adjustments_from_incomplete_orders)
     end
   end
 end

data/app/patches/models/solidus_promotions/in_memory_order_updater_patch.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  module InMemoryOrderUpdaterPatch
+    # This is only needed for stores upgrading from the legacy promotion system.
+    # Once we've removed support for the legacy promotion system, we can remove this.
+    def recalculate(persist: true)
+      if SolidusPromotions.config.sync_order_promotions
+        MigrationSupport::OrderPromotionSyncer.new(order: order).call
+      end
+      super
+    end
+
+    Spree::InMemoryOrderUpdater.prepend self
+  end
+end

data/app/patches/models/solidus_promotions/{order_recalculator_patch.rb → order_updater_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module OrderRecalculatorPatch
+  module OrderUpdaterPatch
     # This is only needed for stores upgrading from the legacy promotion system.
     # Once we've removed support for the legacy promotion system, we can remove this.
     def recalculate
@@ -12,6 +12,5 @@ module SolidusPromotions
     end
 
     Spree::OrderUpdater.prepend self
-    Spree::InMemoryOrderUpdater.prepend self
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Martin Meyerhoff
 - Solidus Team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -235,9 +234,10 @@ files:
 - app/models/solidus_promotions/promotion_lane.rb
 - app/models/solidus_promotions/shipping_rate_discount.rb
 - app/patches/models/solidus_promotions/adjustment_patch.rb
+- app/patches/models/solidus_promotions/in_memory_order_updater_patch.rb
 - app/patches/models/solidus_promotions/line_item_patch.rb
 - app/patches/models/solidus_promotions/order_patch.rb
-- app/patches/models/solidus_promotions/order_recalculator_patch.rb
+- app/patches/models/solidus_promotions/order_updater_patch.rb
 - app/patches/models/solidus_promotions/price_patch.rb
 - app/patches/models/solidus_promotions/shipment_patch.rb
 - app/patches/models/solidus_promotions/shipping_rate_patch.rb
@@ -399,7 +399,6 @@ licenses:
 - BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/solidusio/solidus/blob/main/promotions/README.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -414,8 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: New promotion system for Solidus
 test_files: []