effective_events 3.0.8 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d4268ae530144b096986609342443d7380e789be6e5078dcdc8fa5f27373a5
-  data.tar.gz: bcfc0c7f2480a3a8f5522dddacb6ea42ff3992db5195fcc6aeafa0c0a3138fd6
+  metadata.gz: 4e37bb52cbe39fa76dbb40c45b4364abbab706a4a872125e11de75a1432c7b62
+  data.tar.gz: 484e50eafc049ea811ba446638a600ca8d49e17004da1e7a88d4635afe73f30e
 SHA512:
-  metadata.gz: b15cca4bc102f1d5af216333e9a3186068817db7088f97eb51ad5acbcef90a5d82f2b05e998cbe2b58b9fe8734f444a6b2d1327f4965a1170d884691eba7066d
-  data.tar.gz: 71b409cdc710bbaabd2bcb6b3ced3e3b8faa054cd335024a25e8a8ce1a91b8a0492d42a0fcc0d93db5ff653b984f8c96b0088dd3c6934c973230b1c112eba3fc
+  metadata.gz: 84b97ecbbad1998e51a2ccbe93a2d5bd015e9a6dfa9f5e267db7a9f2aaf8a1668aaa1822c4ba6482f8cc539ae76846a4b2a0128e7654d0923040b662bc1590a6
+  data.tar.gz: f8ca6e7b250819032b81a8b8459cf7179e9ff0b8ba782902755fae7d3f1c1a9c247edb0bc12b4ea0f45d883828b8b82bc05cc4fb0160a27271966f1fe179480d

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -80,6 +80,10 @@ module Admin
       col :question2, visible: false
       col :question3, visible: false
 
+      col :question1_required, visible: false
+      col :question2_required, visible: false
+      col :question3_required, visible: false
+
       actions_col
     end
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -146,7 +146,7 @@ module EffectiveEventsEventRegistration
       end
     end
 
-    # Validate the same registrant user isn't registered on another registration
+    # Validate the same registrant user isn't registered for this ticket on another registration
     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)
@@ -158,6 +158,18 @@ module EffectiveEventsEventRegistration
       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
+      end
+    end
+
     # Validate all products are available for registration
     validate(if: -> { current_step == :addons }) do
       unavailable_event_products.each do |event_product|
@@ -525,6 +537,13 @@ module EffectiveEventsEventRegistration
     false
   end
 
+  # We always validate that the user cannot register for the same event ticket more than once
+  # This is an additional validation where they cannot register for the same event more than once
+  # Can be overridden in the model if you need event specific validation.
+  def validate_one_ticket_per_event?
+    EffectiveEvents.validate_one_ticket_per_event?
+  end
+
   def wizard_step_title(step)
     return EffectiveEvents.code_of_conduct_page_title if step == :code_of_conduct
     default_wizard_step_title(step)

data/app/models/effective/event_registrant.rb

@@ -135,11 +135,16 @@ module Effective
     validates :last_name, presence: true, if: -> { registrant_validations_enabled? }
     validates :email, presence: true, if: -> { registrant_validations_enabled? }
 
-    # User, company and organization conditionall required
+    # User, company and organization conditionally required
     validates :user, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.create_users }
     validates :company, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required }
     validates :organization, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required && EffectiveEvents.organization_enabled? }
 
+    # Responses may or may not be required depending on the event ticket
+    validates :response1, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question1_required? }
+    validates :response2, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question2_required? }
+    validates :response3, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question3_required? }
+
     # Copy any user errors from build_user_and_organization() into the registrant
     after_validation(if: -> { user && user.new_record? && user.errors.present? }) do
       errors.add(:first_name, user.errors[:first_name].join(', ')) if user.errors[:first_name].present?

data/app/models/effective/event_ticket.rb

@@ -35,6 +35,10 @@ module Effective
       question2                   :text
       question3                   :text
 
+      question1_required          :boolean
+      question2_required          :boolean
+      question3_required          :boolean
+
       # Pricing
       early_bird_price            :integer
 
@@ -164,5 +168,17 @@ module Effective
       category == 'Members'
     end
 
+    def question1_required?
+      question1.present? && question1_required
+    end
+
+    def question2_required?
+      question2.present? && question2_required
+    end
+
+    def question3_required?
+      question3.present? && question3_required
+    end
+
   end
 end

data/app/views/admin/event_tickets/_form.html.haml

@@ -49,7 +49,12 @@
       %small.text-muted Please add up to 3 questions to ask during registration. Each ticket will have their own unique answers. Leave a question blank to skip.
 
     = f.text_field :question1, label: 'Question 1'
+    = f.check_box :question1_required, label: 'Question 1 Required'
+
     = f.text_field :question2, label: 'Question 2'
+    = f.check_box :question2_required, label: 'Question 2 Required'
+
     = f.text_field :question3, label: 'Question 3'
+    = f.check_box :question3_required, label: 'Question 3 Required'
 
   = effective_submit(f)

data/app/views/effective/event_registrants/_fields.html.haml

@@ -41,11 +41,11 @@
 
   - if event_ticket.present?
     - if event_ticket.question1.present?
-      = f.text_field :response1, label: event_ticket.question1
+      = f.text_field :response1, label: event_ticket.question1, required: event_ticket.question1_required?
 
     - if event_ticket.question2.present?
-      = f.text_field :response2, label: event_ticket.question2
+      = f.text_field :response2, label: event_ticket.question2, required: event_ticket.question2_required?
 
     - if event_ticket.question3.present?
-      = f.text_field :response3, label: event_ticket.question3
+      = f.text_field :response3, label: event_ticket.question3, required: event_ticket.question3_required?
 

data/config/effective_events.rb

@@ -23,6 +23,9 @@ EffectiveEvents.setup do |config|
   # Turn on the validation. You must have a company or organization when filling out Ticket Details screen.
   config.company_or_organization_required = false
 
+  # Prevent users from purchasing more than one ticket for themselves to an event
+  config.validate_one_ticket_per_event = false
+
   # Categories
   config.categories = ['Events']
 

data/db/migrate/101_create_effective_events.rb

@@ -58,6 +58,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.text :question2
       t.text :question3
 
+      t.boolean :question1_required, default: false
+      t.boolean :question2_required, default: false
+      t.boolean :question3_required, default: false
+
       t.string :qb_item_name
       t.boolean :tax_exempt, default: false
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.0.8'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/lib/effective_events.rb

@@ -10,7 +10,7 @@ module EffectiveEvents
       :event_registrations_table_name, :event_products_table_name, :event_addons_table_name, :event_notifications_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
-      :organization_enabled, :create_users, :company_or_organization_required,
+      :organization_enabled, :create_users, :company_or_organization_required, :validate_one_ticket_per_event,
       :code_of_conduct_enabled, :code_of_conduct_slug,
       :event_registration_class_name
     ]
@@ -51,6 +51,10 @@ module EffectiveEvents
     page
   end
 
+  def self.validate_one_ticket_per_event?
+    validate_one_ticket_per_event == true
+  end
+
   # If we can create delayed payment events at all
   def self.delayed?
     !!EffectiveOrders.try(:delayed?) 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2025-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails