solidus_legacy_promotions 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e25a87b32de8febdd67d28fa5a558d26c5128875d06b637b8ed52bfa0a2dc9
-  data.tar.gz: 98d7ff2153ecc29358483226092aa7001aa4f1e4e3a64ed0db8d97c662ad9786
+  metadata.gz: e6ebac885d12110287f2152e42e064669b4f6eaf137ab7a07741e39636135484
+  data.tar.gz: 917e5b3e78b24f99b85301fdf3dae18d1a77b946b4500ccfa090027bff78ea03
 SHA512:
-  metadata.gz: f71034d931089916518921d45a125ec90a345d1db2fe1579eabfb0fe39afa3e0ec55c6d548929a7b25ac48359a3b8330b5cb87e90293e98d63c567b3ec5ed649
-  data.tar.gz: 690f0d2397d6fbe4d1bc144aef2b4f8f49fc7a7ea061be32b249452f30b7ca72c6382c91f8a882960887d16f9b0da2bbe82160855210b9f0cc2035fe3b2e83fc
+  metadata.gz: c6165f9b03a15c4c07b08cd3e571c6abd798e1396d182ea2352f56e604b92594b8fcd02e6951b095aa2497e85c88418bfd0c91c06e4cfff459b496d62fc2b825
+  data.tar.gz: 87561f7492154ad168c48d91070cfb8a44da8aae324645044e271b9150ac83a24a3b440824e4504680b51f6ee98acb0670e0e81dfb73eea0a924e238f1594260

data/app/models/spree/promotion_code_batch.rb

@@ -14,5 +14,14 @@ module Spree
     def finished?
       state == "completed"
     end
+
+    def process
+      if state == "pending"
+        update!(state: "processing")
+        PromotionCodeBatchJob.perform_later(self)
+      else
+        raise CantProcessStartedBatch.new("Batch #{id} already started")
+      end
+    end
   end
 end

data/lib/solidus_legacy_promotions/engine.rb

@@ -100,12 +100,17 @@ module SolidusLegacyPromotions
     end
 
     initializer "solidus_legacy_promotions", after: "spree.load_config_initializers" do
-      Spree::Config.order_contents_class = "Spree::OrderContents"
-      Spree::Config.promotions = SolidusLegacyPromotions::Configuration.new
-      Spree::Config.adjustment_promotion_source_types << "Spree::PromotionAction"
+      # Only set these if there is no promotion configuration set. In this case,
+      # we're running on a store without the new `solidus_promotions` gem and we
+      # need to set the configuration to the legacy one.
+      if Spree::Config.promotions.is_a?(Spree::Core::NullPromotionConfiguration)
+        Spree::Config.order_contents_class = "Spree::OrderContents"
+        Spree::Config.promotions = SolidusLegacyPromotions::Configuration.new
+      end
 
       Spree::Api::Config.adjustment_attributes << :promotion_code_id
       Spree::Api::Config.adjustment_attributes << :eligible
+      Spree::Config.adjustment_promotion_source_types << "Spree::PromotionAction"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2024-12-17 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.1
+        version: 4.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.4.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.4.2
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,6 @@ files:
 - app/decorators/solidus_legacy_promotions/models/spree_order_decorator.rb
 - app/decorators/solidus_legacy_promotions/models/spree_order_updater_decorator.rb
 - app/decorators/solidus_legacy_promotions/models/spree_product_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb
 - app/decorators/solidus_legacy_promotions/models/spree_shipment_decorator.rb
 - app/helpers/spree/admin/promotions_helper.rb
 - app/helpers/spree/promotion_rules_helper.rb

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusLegacyPromotions
-  module SpreePromotionCodeBatchDecorator
-    def process
-      if state == "pending"
-        update!(state: "processing")
-        Spree::PromotionCodeBatchJob.perform_later(self)
-      else
-        raise Spree::PromotionCodeBatch::CantProcessStartedBatch.new("Batch #{id} already started")
-      end
-    end
-
-    Spree::PromotionCodeBatch.prepend(self)
-  end
-end