effective_resources 2.17.4 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb41fb3f61a31219410a41bd018e2ae57558f876e40074d79d598ebeacf84330
-  data.tar.gz: 6f1538d2b6ffc782fc37f4283bb41b31608fab3505e88a7c0a5a406c09a15d2a
+  metadata.gz: 39ecd0ecd2a6e70ee849e768b239f37f5922b5bf4625f09cfd1fc5856008361f
+  data.tar.gz: b35eb86cf1db76ac404f64655b40aadc483ea6d0792d8d8e832f9d5d03eb2ea2
 SHA512:
-  metadata.gz: 53783dfd73fb23feef274bf4f4a646cb007adb648b23bc4c969ff3a15e12e5feffb0cbf03a3651d105279122a2f620ca92aad10ad41ac5d0727c860e43b32abf
-  data.tar.gz: 779f6c3e0e9d23ffea318b511e0570310cc11fdb2e8c5cfce81160e3eb7f46b8ef8600e4a9dda15e29b0165e534bbab6a1d61bc90616592db6cc67a7333e6044
+  metadata.gz: 947eeacd7e1569c4d942423e55c77abeec47d9a66901e7fed5a326a09136b7b966c8f50e05b58f447c517240e88440f31258a8d96418be6e5f180de90a80767b
+  data.tar.gz: 4db9d6528ff9c7aa51421ed3c9e4745b0c7ee764144e27d6abda886c014493a0135c3617b6420e82fd3df7abe4b162488b111f58decf3d1cd214d5fb78bf0720

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/concerns/acts_as_statused.rb

@@ -34,7 +34,11 @@ module ActsAsStatused
       status_steps           :text, permitted: false
     end
 
-    serialize :status_steps, Hash
+    if EffectiveResources.serialize_with_coder?
+      serialize :status_steps, type: Hash, coder: YAML
+    else
+      serialize :status_steps, Hash
+    end
 
     const_set(:STATUSES, acts_as_statused_options[:statuses])
 

data/app/models/concerns/acts_as_tokened.rb

@@ -41,7 +41,7 @@ module ActsAsTokened
 
   # Instance Methods
   def to_param
-    token
+    token if persisted?
   end
 
   def to_global_id(**params)

data/app/models/concerns/acts_as_wizard.rb

@@ -55,7 +55,11 @@ module ActsAsWizard
       wizard_steps           :text, permitted: false
     end
 
-    serialize :wizard_steps, Hash
+    if EffectiveResources.serialize_with_coder?
+      serialize :wizard_steps, type: Hash, coder: YAML
+    else
+      serialize :wizard_steps, Hash
+    end
 
     before_save(if: -> { current_step.present? }) do
       wizard_steps[current_step.to_sym] ||= Time.zone.now

data/lib/effective_resources/effective_gem.rb

@@ -28,7 +28,7 @@ module EffectiveGem
   module ClassMethods
     def config(namespace = nil)
       namespace ||= Tenant.current if defined?(Tenant)
-      @config.dig(namespace) || @config.dig(:effective)
+      (@config[namespace] if namespace) || @config[:effective]
     end
 
     def setup(namespace = nil, &block)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.17.4'.freeze
+  VERSION = '2.18.0'.freeze
 end

data/lib/effective_resources.rb

@@ -16,6 +16,11 @@ module EffectiveResources
 
   include EffectiveGem
 
+  # We use the newer syntax for serialize calls in rails 7+
+  def self.serialize_with_coder?
+    Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7')
+  end
+
   def self.authorized?(controller, action, resource)
     @exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
 
@@ -120,7 +125,7 @@ module EffectiveResources
     end
   end
 
-  def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
+  def self.advance_date(date, business_days: 1, holidays: [:us, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
 
     business_days.times do
@@ -133,7 +138,7 @@ module EffectiveResources
     date
   end
 
-  def self.business_day?(date, holidays: [:ca, :observed])
+  def self.business_day?(date, holidays: [:us, :observed])
     require 'holidays' unless defined?(Holidays)
     date.wday != 0 && date.wday != 6 && Holidays.on(date, *holidays).blank?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.17.4
+  version: 2.18.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +140,16 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.