effective_resources 2.19.5 → 2.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f56dd6a7835648efe65d8809611c96512caf3107d0287f28cc80b39155c1d6
-  data.tar.gz: 8b5185842adebc07719fc95b0a7b1669e1f0b5bd78ebdfed8051936cbdd55d6c
+  metadata.gz: 571ebcdbbca75cd1b0937bc814229321b1682f336f729517689b9ae594aa9758
+  data.tar.gz: 1b606b2566f0f1eb5ef9a2d5764df5ce1606aa25f8c8f6144a84f14978624479
 SHA512:
-  metadata.gz: 26af3e4f38cff93884b7d92aeb522db7350f2e25443ba24cdfa969f5f3b8b2992869bd58298f584ce229919b1066daaba22c8d478e18e0699ebd3771ac4b4b7d
-  data.tar.gz: d4583562b636737f806cbf349720d216e3fe02085fad7fa8961d5459c3a5a2af83a6ba03a3e32bc367ccfc6cfcef44558cc582a22d0e872a4dcdf4831b712034
+  metadata.gz: 634a2b8f2ca6a4d8a311b347365a16bd60bc9a2f2d2c99400cef5e96c61acfe4907befa97f74b0857d1deed9cdc73c6e2b639368870ff7d1816ec27460961807
+  data.tar.gz: c40344256152ca4a273dce2c580d3d0703d08fd79e4e0283d4112bc02a63bbb584e717ad8e5785ad23b43ee862b3374b84f9c0542c3160cfe0c2f8fa7b6a0d91

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -127,9 +127,6 @@ module ActsAsPurchasableWizard
     fees = find_or_build_submit_fees()
     raise('already has purchased submit fees') if Array(fees).any?(&:purchased?)
 
-    coupon_fees = find_or_build_coupon_fees(fees)
-    raise('already has purchased coupon fees') if Array(coupon_fees).any?(&:purchased?)
-
     order = find_or_build_submit_order()
     raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
     raise('already has purchased submit order') if order.purchased?
@@ -138,19 +135,20 @@ module ActsAsPurchasableWizard
     true
   end
 
-  def find_or_build_coupon_fees(purchasables)
-    existing = purchasables.select { |purchasable| purchasable.try(:coupon_fee?) }
-    return existing if existing.present?
+  # Called by effective_memberships and effective_events
+  def with_outstanding_coupon_fees(purchasables)
+    return purchasables unless owner.respond_to?(:outstanding_coupon_fees) # effective_memberships_owner
+    raise('expected has_many fees') unless respond_to?(:fees)
 
-    price = purchasables.map { |purchasable| purchasable.price || 0 }.sum
-    return [] unless price > 0
+    price = purchasables.reject { |p| p.try(:coupon_fee?) }.map { |p| p.price || 0 }.sum
 
-    apply_outstanding_coupon_fees()
-  end
+    if price > 0
+      Array(owner.outstanding_coupon_fees).each { |fee| fees << fee unless fees.include?(fee) }
+    else
+      Array(owner.outstanding_coupon_fees).each { |fee| fees.delete(fee) if fees.include?(fee) }
+    end
 
-  def apply_outstanding_coupon_fees
-    # Nothing to do.
-    # effective_events, effective_memberships override this method and opt-in to this behaviour
+    (purchasables + fees).uniq
   end
 
   # Owner clicks on the Billing step. Next step is Checkout

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.5'.freeze
+  VERSION = '2.19.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.5
+  version: 2.19.6
 platform: ruby
 authors:
 - Code and Effect