effective_events 3.3.11 → 3.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f848439464597b6f3f8e1f3e95bcabda4865a248b76dda287b0a307b2cc6d4db
-  data.tar.gz: 9254c63539a47aa89a78365320ac619c1a8f40ca788860fcd11ba1ef14667014
+  metadata.gz: 70b3a0308b0533ff17758e4931f2291157f72fbc2307559b1dda03ae2fd6fc44
+  data.tar.gz: a5ba8b0bac8ccf9ea36199307c77546efbe86a211d302df0b3c52f2b7b2ba1cc
 SHA512:
-  metadata.gz: 194d7bce5aeeee5d785d9987f92780e584fabd2e65ceff1cb85d4a4a0d1025921795886a227cd6e76cd0dc488fbb3ed38c599563cc81293ca138378a64454173
-  data.tar.gz: f626fe94453f4406668a62a27e02a8fb239f74b6b3748f461243e0f96db1dc586e8f60417ce538e3be3b0c88fac093d78633640ba1930c600cc731fb64a10a5e
+  metadata.gz: 75d7da4a3fae8a70206f385e81f8b3e34bfbbe053000f10aaa3c966bc8764498575b2bee8c9cafa318fb010cc1fb491b29f71479fde3142adc66ec94608ea994
+  data.tar.gz: c672ac5279abd9ff50bd8bde94c3048a7b543e1fc202c528da9d89659fd9f9b37bc1d68ca491f607e913c5586b48dd43a15068651f9898993d84204bc487dc73

data/app/models/concerns/effective_events_event_registration.rb

@@ -160,26 +160,14 @@ module EffectiveEventsEventRegistration
     end
 
     # Validate the same registrant user isn't registered for this ticket on another registration
+    # Or for this event (any ticket) on another registration, when one ticket per event is enabled
+    # The event registrant adds its own error. We add the base error so it's visible at the top of the form.
     validate(if: -> { current_step == :details }) do
       present_event_registrants.select { |er| er.user.present? }.each do |er|
-        existing = Effective::EventRegistrant.unarchived.registered.where(event_ticket: er.event_ticket, user: er.user).where.not(id: er)
+        duplicate_of = (validate_one_ticket_per_event? ? { event: er.event } : { event_ticket: er.event_ticket })
+        existing = Effective::EventRegistrant.unarchived.registered.where(user: er.user).where(duplicate_of).where.not(id: er)
 
-        if existing.present?
-          errors.add(:base, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
-          er.errors.add(:user_id, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
-        end
-      end
-    end
-
-    # Validate the same registrant user isn't registered for this event (any ticket) on another registration
-    validate(if: -> { current_step == :details && validate_one_ticket_per_event? }) do
-      present_event_registrants.select { |er| er.user.present? }.each do |er|
-        existing = Effective::EventRegistrant.unarchived.registered.where(event: er.event, user: er.user).where.not(id: er)
-
-        if existing.present?
-          errors.add(:base, "Unable to register #{er.user} for #{er.event}. They've already been registered")
-          er.errors.add(:user_id, "Unable to register #{er.user} for #{er.event}. They've already been registered")
-        end
+        errors.add(:base, "Unable to register #{er.user} for #{duplicate_of.values.first}. They've already been registered") if existing.present?
       end
     end
 

data/app/models/effective/event_registrant.rb

@@ -132,6 +132,16 @@ module Effective
       errors.add(:user_id, "registrant must be a member") unless event_ticket.guest_of_member? || member?
     end
 
+    # Validate this user isn't already registered for this event ticket on another registration
+    # Or for this event on any ticket, when one ticket per event is enabled
+    validate(if: -> { user.present? && event_ticket.present? && registrant_validations_enabled? }, unless: -> { purchased? }) do
+      duplicate_of = (validate_one_ticket_per_event? ? { event: event } : { event_ticket: event_ticket })
+
+      if Effective::EventRegistrant.unarchived.registered.where(user: user).where(duplicate_of).where.not(id: id).present?
+        errors.add(:user_id, "Unable to register #{user} for #{duplicate_of.values.first}. They've already been registered")
+      end
+    end
+
     validates :price, numericality: { greater_than_or_equal_to: 0 }
     validates :email, email: true
 
@@ -280,6 +290,12 @@ module Effective
       !member? && !guest_of_member?
     end
 
+    # The event registration can override this to add event specific validation
+    def validate_one_ticket_per_event?
+      return event_registration.validate_one_ticket_per_event? if event_registration.present?
+      EffectiveEvents.validate_one_ticket_per_event?
+    end
+
     # We create registrants on the tickets step. But don't enforce validations until the details step.
     def registrant_validations_enabled?
       return false if blank_registrant? # They want to come back later
@@ -372,7 +388,7 @@ module Effective
     end
 
     def promote_purchased_event_registration!
-      # Remove myself from any existing orders. 
+      # Remove myself from any existing orders.
       # I must be $0 so we don't need to update any prices.
       orders.each do |order|
         order.order_items.find { |oi| oi.purchasable == self }.destroy!
@@ -411,7 +427,7 @@ module Effective
     end
 
     def promote_purchased_order!
-      # Remove myself from any existing orders. 
+      # Remove myself from any existing orders.
       # I must be $0 so we don't need to update any prices.
       orders.each do |order|
         order.order_items.find { |oi| oi.purchasable == self }.destroy!
@@ -421,7 +437,7 @@ module Effective
       update!(promoted: true, purchased_order: nil)
 
       # Check if the ticket owner has an unpurchased order for the event or create a new one
-      order = owner.orders.reject { |order| order.purchased? }.find do |order| 
+      order = owner.orders.reject { |order| order.purchased? }.find do |order|
         order.purchasables.any? { |purchasable| purchasable.class.name == "Effective::EventRegistrant" && purchasable.try(:event) == event }
       end
       order ||= Effective::Order.new(user: owner)
@@ -441,7 +457,7 @@ module Effective
     def promote_not_purchased!
       update!(promoted: true)
 
-      orders.reject(&:purchased?).each do |order| 
+      orders.reject(&:purchased?).each do |order|
         order.update_purchasable_attributes!
 
         if order.pending?
@@ -578,9 +594,9 @@ module Effective
       elsif EffectiveEvents.create_users
         # Otherwise create a new user
         new_user = user_klass.create(
-          first_name: first_name.strip, 
-          last_name: last_name.strip, 
-          email: email.strip.downcase, 
+          first_name: first_name.strip,
+          last_name: last_name.strip,
+          email: email.strip.downcase,
           password: SecureRandom.base64(12) + '!@#123abcABC-'
         )
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.3.11'.freeze
+  VERSION = '3.3.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.3.11
+  version: 3.3.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-15 00:00:00.000000000 Z
+date: 2026-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails