effective_events 3.2.9 → 3.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a20e23c2d1f6ff1fc2e33cfa799e6455d2c82263ff910a2c920de564d68588d
-  data.tar.gz: bd7fda0dabec7029fd0eea28edd2beef18a21aa25dae34789d6ad16607a4672c
+  metadata.gz: 9c4d14430b3a1197b810f95aa457a8ddc248f2e464e72b78fa39eb4f79b8418b
+  data.tar.gz: dcb24ff04fecbb4806d2627f474a11addcbfc31582c9b274741d80f4e1a5db30
 SHA512:
-  metadata.gz: d19a7f0d3f1971aa9d93cb50422623c473efc84a0b2b9fae580a1f42212b4e6487841638820cdcf69434b89a62f2a7b83f5df3de3fe6efa61f9a3e063f49e8f7
-  data.tar.gz: b5f65bbc418de37eba98bdb4e3e5437703d2012020e8ec770b12aa5f848a19356b983e828519224166df86aaa2b074f05f478a5f24a21946a86fd569583afbbe
+  metadata.gz: 8ac4337b712ed5f1071fbe75c818344f346fd69721287b3a9a8bf0b0859f1724bb9896ed81946dffdbf50b4b1ad07c4a856aca0af60c3a4036a4870415f3d9f4
+  data.tar.gz: d229d1cf992b268af7db6430b37df49753849edc52e2a255317235fba74ee4f15d7fe862bcf84b4236ec6e533e962450cf434219072b5deb50c32035df689a65

data/app/models/concerns/effective_events_event_registration.rb

@@ -135,7 +135,7 @@ module EffectiveEventsEventRegistration
     validate(if: -> { current_step == :tickets }) do
       unavailable_event_tickets.each do |event_ticket|
         errors.add(:base, "The requested number of #{event_ticket} tickets are not available")
-        event_ticket_selections.find { |ets| ets.event_ticket == event_ticket }.errors.add(:quantity, "not available")
+        event_ticket_selections.find { |ets| ets.event_ticket == event_ticket }&.errors&.add(:quantity, "not available")
       end
     end
 
@@ -408,10 +408,14 @@ module EffectiveEventsEventRegistration
   def waitlist_event_registrants
     present_event_registrants.group_by { |er| er.event_ticket }.each do |event_ticket, event_registrants|
       if event_ticket.waitlist?
-        existing = event_registrants.find { |er| er.persisted? && er.waitlisted_not_promoted? }
+        existing = event_registrants.find { |er| er.persisted? && er.waitlisted_not_promoted? }.present?
         capacity = event.capacity_available(event_ticket: event_ticket, event_registration: self)
 
-        event_registrants.reject(&:registered?).each_with_index { |er, index| er.assign_attributes(waitlisted: (existing || index >= capacity)) }
+        # Count already-registered non-waitlisted registrants in this registration
+        registered = event_registrants.count { |er| er.registered? && !er.waitlisted? }
+        available = [capacity - registered, 0].max
+
+        event_registrants.reject(&:registered?).each_with_index { |er, index| er.assign_attributes(waitlisted: (existing || index >= available)) }
       else
         event_registrants.each { |er| er.assign_attributes(waitlisted: false) }
       end
@@ -493,8 +497,9 @@ module EffectiveEventsEventRegistration
 
   # Find or build
   def event_ticket_selection(event_ticket:, quantity: 0)
-    selection = event_ticket_selections.find { |ets| ets.event_ticket == event_ticket } 
-    selection || event_ticket_selections.build(event_ticket: event_ticket, quantity: quantity)
+    selection = event_ticket_selections.find { |ets| ets.event_ticket == event_ticket } || event_ticket_selections.build(event_ticket: event_ticket)
+    selection.assign_attributes(quantity: quantity)
+    selection
   end
 
   # This builds the default event addons used by the wizard form

data/app/models/effective/event_registrant.rb

@@ -95,7 +95,7 @@ module Effective
       end
 
       before_validation(if: -> { user.blank? && first_name.present? && last_name.present? && email.present? }) do
-        build_user() if EffectiveEvents.create_users
+        build_user()
         build_organization_and_representative() if EffectiveEvents.organization_enabled?
       end
 
@@ -575,7 +575,7 @@ module Effective
         if EffectiveEvents.organization_enabled? && user_klass.try(:effective_memberships_organization_user?)
           assign_attributes(organization: existing_user.organizations.first) if existing_user.organizations.present?
         end
-      else
+      elsif EffectiveEvents.create_users
         # Otherwise create a new user
         new_user = user_klass.create(
           first_name: first_name.strip, 
@@ -587,7 +587,7 @@ module Effective
         assign_attributes(user: new_user)
       end
 
-      user.valid?
+      user&.valid?
     end
 
     # The organization might already be set here

data/app/views/effective/event_registrations/_form_blank_registrants.html.haml

@@ -21,6 +21,9 @@
         - else
           = effective_events_ticket_prices(event, event_ticket)
 
+        - if event_registrant.waitlisted_not_promoted?
+          %span.badge.badge-warning Waitlist
+
       = fr.check_box :blank_registrant, label: "I will return and add this ticket's information later"
 
       = fr.show_if(:blank_registrant, false) do

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.2.9'.freeze
+  VERSION = '3.2.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-28 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails