effective_resources 2.20.2 → 2.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b1a55c520efbd90c56d4e17d66fbdb328f4732e89e500279dcac8bd1a0490e
-  data.tar.gz: 9154c49ed7c9dcf18a98f5e6051f8bb516cf53f95cc0d9f4cbf777c8b93b3e25
+  metadata.gz: efe50d36259877c5389c59e3dd2bb3db2a77915d60a37325a32b9fcbaa42172d
+  data.tar.gz: 155c033973d9c7cec74a3036b6c06d981756b322093ce117c15622828b5723c2
 SHA512:
-  metadata.gz: a673a48025bda899630dd5edb0672dd12feff7e8f0b04d5ece1312bbc5bd50c318802ca5eb49980472afd0273586b658c1b1cb4b9b477314f69c6e87d13831c1
-  data.tar.gz: 8d7046ee355a352ef07c289dfa6deab682cf7233ef998fe85249dff4c602f5e3f570f476da593e5bc4214318a689fdf39c2b5fbc5e9be588d8726812b5562051
+  metadata.gz: 95e04d2418a1b790771a7f8c652c756d70be5c9b216ebf292dcb9ca55dfcedd1022a4a358f804d56d633dbd5ccb7da56111d15830f87ffa22b274d3741842c06
+  data.tar.gz: bb8aba4fdfe1c609a875ab65c5f62e38c727969813427e1517aa176717bad884abfc8a278ecae23679cf25a4c0cf2f9afcd6dda4b1bc6dd05819eac208088dd3

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -47,10 +47,27 @@ module ActsAsPurchasableWizard
     submit_fees
   end
 
+  def build_effective_order
+    if EffectiveOrders.organization_enabled? && respond_to?(:organization) # New style
+      orders.build(organization: organization)
+    else
+      orders.build(user: owner) # This is polymorphic user, might be an organization. Old style.
+    end
+  end
+
   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
+    order = submit_order || build_effective_order()
+    order = build_effective_order() if order.declined? # Make a new order, if the previous one was declined
 
+    # Update the order with the current owner
+    if EffectiveOrders.organization_enabled? && respond_to?(:organization)
+      order.organization = organization
+    else
+      # A membership could go from individual to organization
+      order.user = owner 
+    end
+
+    # Consider fees
     fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
     # Make sure all Fees are valid
@@ -58,14 +75,12 @@ module ActsAsPurchasableWizard
       raise("expected a valid fee but #{fee.id} had errors #{fee.errors.inspect}") unless fee.valid?
     end
 
-    # 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)
     end
 
+    # Remove any order items that no longer have fees for them
     order.order_items.each do |order_item|
       fee = fees.find { |fee| fee == order_item.purchasable }
       order.remove(order_item) unless fee.present?

data/app/models/concerns/acts_as_wizard.rb

@@ -145,6 +145,13 @@ module ActsAsWizard
       :start
     end
 
+    def all_steps_before(step)
+      index = all_steps.index(step)
+      raise("unexpected step #{step}") unless index.present?
+
+      all_steps.first(index)
+    end
+
     def previous_step(step)
       index = required_steps.index(step)
       required_steps[index-1] unless index == 0 || index.nil?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.20.2'.freeze
+  VERSION = '2.20.4'.freeze
 end

metadata

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