effective_resources 2.20.6 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97928e9b633c9913eca0ee5b59dfa00f262e6737913de56fc418e806744d5b95
-  data.tar.gz: e6a905802155572d02e9e8eded99c084511e84d051f07c7041cf1fe0a099840d
+  metadata.gz: 325c0f900b5e2d964f5d3bece938f7a936106d5545f7a4fa43ca84b078ad3662
+  data.tar.gz: c97aa499db357d7f0a897ffa2118d3c8939d8f97069ed40aba7f64c215cdfdcf
 SHA512:
-  metadata.gz: ff222ec2cf0e39d721d08fcffe0c2da186370fc10d1dd062cdcf0f348d30a7e072ead4a963d950b44c274a0e824dd7504a5b661d4400b00e7abfd93396b638f7
-  data.tar.gz: 429ff43ed3b1f2b09e93cc734c9b9d482271fa62df210663ce7e422ba785889777e222d571627cebde925db909de26004633208f7b00ec6753c18a8028241f85
+  metadata.gz: 0affaea2159469810208e0f19e4ff83dbec90c236702a6a5c32a95b2f45ee3522f65eac8aa39255951eace3d7765636ee525a2cb6f955ee7e6ff64c051aa288a
+  data.tar.gz: 55ef59912a00a3d643119e78ea9e79865807beb25c59b42a66ded59061405459e629e45e1227a33e1b7eb2f59f4758d1923ef6a1fd7337fc1f9b2754111549ed

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.6'.freeze
+  VERSION = '2.21.0'.freeze
 end

metadata

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