effective_resources 2.9.7 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db87dad7192ab5e49096eccdf4c6854ec0a0f9cd8ade4ba960fb668565b4358
-  data.tar.gz: 17737a10fad18ec0281ce2d09fabfe0accfdd223d1df43d3a86514ac4d563a99
+  metadata.gz: 69383be96bec20188162a0c42162ce4727bf0f14ce74fa36556b09930bc2307a
+  data.tar.gz: 7d4ae8dc17da1c34834af13b9d864502de5b580eaa88e3e9da5258f7afc2efb7
 SHA512:
-  metadata.gz: 39563c34df911a6a5fcfe1a04a684ad500111261fb22ff6db7673e14aefa1e5241ff955613adc9d78460237ae7fa5b43f2d1963f54ebb4df5dcff27bb0d2a144
-  data.tar.gz: 030b4661abe84b50967fbe8ce04e7c06fa81572409816c2ae1eb9b77d94b1a246fb2ff310ad73dc66e35faa20994266c5c4f81b19e598aab91b7f05283b38a48
+  metadata.gz: ecb3f7fb7caff620a403c577fc9d1196061e7da0ea2e1d137b6b4889e02097b46cc4a3cc8b7497cfc9fcb1641d9111170daed413a9f4743ee6005e0ba0ed4b0e
+  data.tar.gz: 6cc85b52a0ee048f15ee61e9b370cc3cad27910529bbf4d83c8260d67bcdaf7ce464d5841fcfa45c1adb6a2fd518c4348f4e46aba5831740fb4f9d4972e44194

data/app/controllers/concerns/effective/crud_controller.rb

@@ -121,7 +121,7 @@ module Effective
       datatable_klass = effective_resource.datatable_klass
       return unless datatable_klass.present?
 
-      datatable = datatable_klass.new(resource_datatable_attributes)
+      datatable = EffectiveResources.best(datatable_klass.name).new(resource_datatable_attributes)
       datatable.effective_resource = effective_resource if datatable.respond_to?(:effective_resource=)
       datatable
     end

data/app/controllers/concerns/effective/wizard_controller.rb

@@ -46,8 +46,10 @@ module Effective
       helper EffectiveResourcesWizardHelper
 
       rescue_from Wicked::Wizard::InvalidStepError do |exception|
-        flash[:danger] = "Unknown step. You have been moved to the #{resource_wizard_steps.first} step."
-        redirect_to wizard_path(resource_wizard_steps.first)
+        step = resource.required_steps.first || resource_wizard_steps.first
+
+        flash[:danger] = "Unknown step. You have been moved to the #{step} step."
+        redirect_to wizard_path(step)
       end
 
       # effective_resources on save callback

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -40,7 +40,7 @@ module ActsAsPurchasableWizard
   end
 
   def submit_order
-    orders.first
+    orders.last
   end
 
   def find_or_build_submit_fees
@@ -49,6 +49,8 @@ module ActsAsPurchasableWizard
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner) # This is polymorphic user, might be an organization
+    order = orders.build(user: owner) if order.declined? # Make a new order, if the previous one was declined
+
     fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
     # Make sure all Fees are valid

data/app/models/concerns/acts_as_wizard.rb

@@ -172,7 +172,8 @@ module ActsAsWizard
       existing = current_step
 
       begin
-        self.current_step = nil; yield
+        self.current_step = nil
+        yield
       ensure
         self.current_step = existing
       end
@@ -191,7 +192,4 @@ module ActsAsWizard
     end
 
   end
-
-
-
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.9.7'.freeze
+  VERSION = '2.10.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.9.7
+  version: 2.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails