effective_resources 2.20.5 → 2.20.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad54f3d0e430c72b0e9607d11aa393d22e05fa004877a231bb3ea56da870cde0
-  data.tar.gz: 4e99daf7cbd5d2d2b1fea577591fd115822b16f355d631a4990f858b811294c4
+  metadata.gz: 69e89a1c84cc396ff530fdc93cd65fbefad6ea5ae8ffb2058f67d75fd10b6cc4
+  data.tar.gz: 35c4dcec9220fa6b88eea8fa9877c1e9d793b5ccec1763a58c0fad399b5cf0bc
 SHA512:
-  metadata.gz: f2c6742b9cd6a9be676718add27c8394722ba121b5faad5f6f1f14024e902e7a98c2f8888aa20581e89250c5c929212c4953ac358de8ad4a03c18421d4f3abdf
-  data.tar.gz: 0250b78198490e85fce003d3a8791fc110701e80ec4d1c6152b50660c904c3b1c015e4cec4f573ae5b12faa795d8a23b8c724b6fee34ddf9844712b2f3af9219
+  metadata.gz: b3b93da68c46b5cbdf3c558b77d53e9c69012d4c41db6632821be08affac220c1c5601087cb7b52ebb92011e63c5ece1fd57749812a75b6efdb798c28c82d23c
+  data.tar.gz: 53c3c00d8f29414894aa61865fc64fa6d895f3540b44ce101c229d8a865caceed72b508097dbd57dced9fbf3fa348d2b42764aa10ac8b84d935a34204b456330

data/app/controllers/admin/select2_ajax_controller.rb

@@ -37,17 +37,5 @@ module Admin
         { id: organization.to_param, text: organization.try(:to_select2) || to_select2(organization) }
       end
     end
-
-    private
-
-    def to_select2(resource)
-      if resource.try(:email).present?
-        "<span>#{resource}</span> <small>#{resource.email}</small>"
-      else
-        "<span>#{resource}</span>"
-      end
-    end
-
   end
-
 end

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

@@ -2,11 +2,11 @@ module Effective
   module Select2AjaxController
     extend ActiveSupport::Concern
 
-    def respond_with_select2_ajax(collection, skip_search: false, &block)
+    def respond_with_select2_ajax(collection, skip_search: false, skip_authorize: false, &block)
       raise('collection should be an ActiveRecord::Relation') unless collection.kind_of?(ActiveRecord::Relation)
 
       # Authorize
-      EffectiveResources.authorize!(self, :index, collection.klass)
+      EffectiveResources.authorize!(self, :index, collection.klass) unless skip_authorize
 
       # Scope
       if collection.respond_to?(:select2_ajax)
@@ -49,5 +49,15 @@ module Effective
       end
     end
 
+    private
+
+    def to_select2(resource)
+      if resource.try(:email).present?
+        "<span>#{resource}</span> <small>#{resource.email}</small>"
+      else
+        "<span>#{resource}</span>"
+      end
+    end
+
   end
 end

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -26,6 +26,13 @@ module ActsAsPurchasableWizard
       self.errors.add(:base, "must have an email") unless owner.email.present?
     end
 
+    after_defer do |_|
+      raise('expected submit_order to be deferred') unless submit_order&.deferred?
+      before_submit_deferred!
+      submit_deferred!
+      after_submit_deferred!
+    end
+
     after_purchase do |_|
       raise('expected submit_order to be purchased') unless submit_order&.purchased?
       before_submit_purchased!
@@ -180,9 +187,34 @@ module ActsAsPurchasableWizard
     end
   end
 
+  # The historic way of handling a deferred order checkout is to return to the :checkout step and not call wizard submit!
+  # With effective_events date delayed payments, we do call wizard submit! and proceed to the :submitted step.
+
+  # False by default - do not call submit
+  def submit_wizard_on_deferred_order?
+    false
+  end
+
+  # Called automatically via after_defer hook above
+  def submit_deferred!
+    return unless submit_wizard_on_deferred_order?
+    return false if was_submitted?
+
+    wizard_steps[:checkout] = Time.zone.now
+    submit!
+  end
+
+  # A hook to extend
+  def before_submit_deferred!
+  end
+
+  def after_submit_deferred!
+  end
+
   # Called automatically via after_purchase hook above
+  # If previously submitted, possibly with deferred order, just save so any before_save or validate can run.
   def submit_purchased!
-    return false if was_submitted?
+    return save! if was_submitted?
 
     wizard_steps[:checkout] = Time.zone.now
     submit!
@@ -198,7 +230,12 @@ module ActsAsPurchasableWizard
   # Draft -> Submitted requirements
   def submit!
     raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
+
+    if submit_wizard_on_deferred_order?
+      raise('expected a purchased or deferred order') unless (submit_order&.purchased? || submit_order&.deferred?)
+    else
+      raise('expected a purchased order') unless submit_order&.purchased?
+    end
 
     wizard_steps[:checkout] ||= Time.zone.now
     wizard_steps[:submitted] = Time.zone.now

data/app/models/concerns/acts_as_wizard.rb

@@ -113,7 +113,7 @@ module ActsAsWizard
 
     # For use in the summary partials. Does not include summary.
     def render_steps
-      blacklist = [:start, :billing, :checkout, :submit, :submitted, :summary]
+      blacklist = [:start, :billing, :checkout, :submit, :submitted, :complete, :completed, :summary]
       ((required_steps | completed_steps) - blacklist).select { |step| has_completed_step?(step) }
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.20.5'.freeze
+  VERSION = '2.20.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.20.5
+  version: 2.20.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails