effective_resources 2.17.3 → 2.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c70e7b28b1a29c7866bcf7dc30678e8d6209b55982ee2d0cbe304c634d5345e
-  data.tar.gz: 805d91cd88201d62adf8ecdb9a9b2d4b620e735caf11a6ee4883fa774464543e
+  metadata.gz: c8d215c9f3f4da7bf1e7776c8a313f7e75c8e2cc611ec5bfa7aab447c9153b70
+  data.tar.gz: 6c6775a3ae086b767a3a2277afa1bbb874001a9c0ea4de7c5c13939791b1619c
 SHA512:
-  metadata.gz: 3dff69131842340f24d978672a91503c34ce5aaca8043473d2cc2fff2a042fa142e816c0944f2132e909d1fd215f46e8440490fd42c7c20f2ed78fb1ebaa5959
-  data.tar.gz: 99d503e6756ba059d700f9f1f1eab65258b3c81a65445847edf1cb562ba828ff9e3ba327e32451e04040e3ea3303c2d80142527e88364cbd84ddf1edd00d2803
+  metadata.gz: ebb84318ad63c0cd8cdedf95bab1f72784a10d9e0cd80cdf3dd667c9fbc51bbdb7325686a614c963940ca92bd1bc39f2fa498e1c4733833d8c3b63ed663fc9a0
+  data.tar.gz: b58c8776531032a60c827a5e78224ebaf23778de79dc0bf2fc86c94dbc949da231606dfc71628ea5abd11083594ba99dfa6ee1f06de7e4dd3ca9096cc20bfcbb

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -77,6 +77,9 @@ module ActsAsPurchasableWizard
     # This will update all order items to match the prices from their purchasable
     order.try(:update_purchasable_attributes)
 
+    # Handle effective_memberships coupon fees price reduction
+    reduce_order_item_coupon_fee_price(order)
+
     # Hook to extend for coupon fees
     order = before_submit_order_save(order)
     raise('before_submit_order_save must return an Effective::Order') unless order.kind_of?(Effective::Order)
@@ -91,6 +94,32 @@ module ActsAsPurchasableWizard
     order
   end
 
+  # This is used by effective_memberships and effective_events
+  # Which both add coupon_fees to their submit_fees
+  def reduce_order_item_coupon_fee_price(order)
+    # This only applies to orders with coupon fees
+    order_items = order.order_items.select { |oi| oi.purchasable.try(:coupon_fee?) }
+    return order unless order_items.present?
+    raise('multiple coupon fees not supported') if order_items.length > 1
+
+    # Get the coupon fee
+    order_item = order_items.first
+    coupon_fee = order_item.purchasable
+    raise('expected order item for coupon fee to be a negative price') unless coupon_fee.price.to_i < 0
+
+    # Calculate price
+    subtotal = order.order_items.reject { |oi| oi.purchasable.try(:coupon_fee?) }.sum(&:subtotal)
+
+    price = 0 if subtotal <= 0
+    price ||= [coupon_fee.price, (0 - subtotal)].max
+
+    # Assign the price to this order item. Underlying fee price stays the same.
+    order_item.assign_attributes(price: price)
+
+    # Return the order
+    order
+  end
+
   # Should be indempotent.
   def build_submit_fees_and_order
     return false if was_submitted?

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

@@ -134,6 +134,7 @@ module Effective
         belong_tos_names_attributes
           .merge(klass_attributes(sort: true))
           .merge(effective_addresses_attributes)
+          .merge(active_storage_attributes.transform_values { |thing| [:active_storage] })
       end
 
       private

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.17.3'.freeze
+  VERSION = '2.17.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.17.3
+  version: 2.17.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails