effective_resources 1.15.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4196a26392312c2343b4ae31d4580a7c8b84a8f37d8e74c77e17d34016314b9c
-  data.tar.gz: 93d48690d2be56b1f5068bf815055de47446599b82aaf4444e52583208f368b3
+  metadata.gz: 89ee5768e0e064df020dfd0da3110e601fa51dd100d10a909442279c5e85465e
+  data.tar.gz: 03d67a2c0228472542671b781ba00a16fd3959e541adc4d1e9beeaf3e23d2b58
 SHA512:
-  metadata.gz: b25bc7b63e988fe7198cdd2e5b44d79cbee612fb18839b088feb7e3c53c6b00a8c27ac76f0de796278f147e93b27d64f374cae0c00e1419350146243cfc4f9ae
-  data.tar.gz: 159c99e620737423d67963b28feefa1bda55dfd645a25835892bded90a4d616dd52e659913f3f97f246c6274a5ad5cae615c33d43c795c576a8fe6465235487a
+  metadata.gz: 143e22c3e4df4f5937fefd00963d97e483e4d6355ad13367a3a1e64a74c0a32541cd5d2fe3100e728fa839e15ff32dc6f5c4b716ce69dd718b8d53b43a15b899
+  data.tar.gz: 2dba5416763bec7476ffd586dbade4dd44fc21eb3112580c09b470eb5bf719a18116294e8f5c2afcb85e80d48a459d80a91734e27f68e342af6a9b7238c7b4da

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -48,9 +48,12 @@ module ActsAsPurchasableWizard
   end
 
   def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
+    order = submit_order || orders.build(user: owner) # This is polymorphic user, might be an organization
     fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
+    # A membership could go from individual to organization
+    order.user = owner
+
     # Adds fees, but does not overwrite any existing price.
     fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)

data/app/models/concerns/acts_as_wizard.rb

@@ -56,7 +56,23 @@ module ActsAsWizard
 
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      wizard_step_keys()
+
+      steps = wizard_step_keys()
+
+      # Give the caller class a mechanism to change these.
+      # Used more in effective memberships
+      steps = change_wizard_steps(steps)
+
+      unless steps.kind_of?(Array) && steps.all? { |step| step.kind_of?(Symbol) }
+        raise('expected change_wizard_steps to return an Array of steps with no nils')
+      end
+
+      steps
+    end
+
+    # Intended for use by calling class
+    def change_wizard_steps(steps)
+      steps
     end
 
     # For use in the summary partials. Does not include summary.

data/app/models/effective/resources/controller.rb

@@ -47,7 +47,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if buttons.values.find { |v| v[:action] == :archive }.present?
               buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
@@ -101,7 +100,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }

data/lib/effective_resources/engine.rb

@@ -57,11 +57,9 @@ module EffectiveResources
     # Register the acts_as_archived routes concern
     # resources :things, concerns: :acts_as_archived
     initializer 'effective_resources.routes_concern' do |app|
-      ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-
-      # Doesn't seem to work with the on_load in rails 6.0
-      #ActiveSupport.on_load :action_controller_base do
-      #end
+      app.config.to_prepare do
+        ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
+      end
     end
 
     # Register the flash_messages concern so that it can be called in ActionController

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.15.0'.freeze
+  VERSION = '1.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails