Merge branch 'add_brand_from_config' of https://github.com/gms-electr…

…onics/solidus into add_brand_from_config
solidusio · Dec 2, 2024 · 2cfdb98 · 2cfdb98
2 parents 03aba31 + 74fdb6c
commit 2cfdb98
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/core/app/models/spree/order_shipping.rb b/core/app/models/spree/order_shipping.rb
@@ -44,7 +44,6 @@ def ship_shipment(shipment, external_number: nil, tracking_number: nil, suppress
   # @return The carton created.
   def ship(inventory_units:, stock_location:, address:, shipping_method:,
            shipped_at: Time.current, external_number: nil, tracking_number: nil, suppress_mailer: false)
-
     carton = nil
 
     Spree::InventoryUnit.transaction do

diff --git a/core/lib/spree/testing_support/extension_rake.rb b/core/lib/spree/testing_support/extension_rake.rb
@@ -4,8 +4,8 @@
 
 desc "Generates a dummy app for testing an extension"
 namespace :extension do
-  task :test_app, [:user_class] do |_t, _args|
+  task :test_app, [:user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].invoke
+    Rake::Task['common:test_app'].invoke(args[:user_class])
   end
 end
diff --git a/...s/app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb b/...s/app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb
diff --git a/legacy_promotions/app/models/spree/promotion_code_batch.rb b/legacy_promotions/app/models/spree/promotion_code_batch.rb
@@ -14,5 +14,14 @@ class CantProcessStartedBatch < StandardError
     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