effective_events 2.34.0 → 2.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb357bc4bbc753d7c333e7dd8410323330c35081258bb898496e597cd5ecbae
-  data.tar.gz: 1cd28f66fc94ba767cfda94936a5dfa0ef06ae433c193a03d8b1f4a5a1b810aa
+  metadata.gz: 0a35679ce20fbdd029eb43d42d309d2d9afb8f14563a8678b6a0dfed1fba1c86
+  data.tar.gz: af28a6d095903ec662b695943fbf0c8eb140bbfc3151c67cb68696fad79bc657
 SHA512:
-  metadata.gz: 980795fa4aa2ee13ec0a914388ecf72b7842e1861e555ce5fcb790513d64e6128feea4b1ab2540bb4c250108f6317848f4115fd6bac388630d8b6dba111ea0bc
-  data.tar.gz: da796c0c1a13e13e7de03af15ac9649c35c617661bdefd55af85e503b8b2d62b2915878960737e1287ea333cd08e18373cf9f7f3c7ed2d104f47c07afd525216
+  metadata.gz: f62138d80a94f535ff09d17b7d243ac77519efeac21040813535e4daf7a7a039474e8226e8569602397e4efd5227ae4bcf1de6c0dd8766c195f5d541212c4be8
+  data.tar.gz: 64fa8b144451340b18c3ba0e10764618717f64f833bd67fe25256d9857608c08face61f94142f69ee830a99379247f64500642f69d97a1187fa349aa03b5c83d

data/app/datatables/effective_events_datatable.rb

@@ -35,8 +35,9 @@ class EffectiveEventsDatatable < Effective::Datatable
 
     actions_col show: false do |event|
       if event.registerable?
+        label = (event.waitlist_only? ? 'Join Waitlist' : 'Register')
         url = event.external_registration_url.presence || effective_events.new_event_event_registration_path(event)
-        dropdown_link_to('Register', url)
+        dropdown_link_to(label, url)
       end
     end
   end

data/app/models/concerns/effective_events_event_registration.rb

@@ -36,6 +36,7 @@ module EffectiveEventsEventRegistration
       tickets: 'Tickets',
       details: 'Ticket Details',
       addons: 'Add-ons',
+      code_of_conduct: 'Code of Conduct',
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',
@@ -61,7 +62,7 @@ module EffectiveEventsEventRegistration
     accepts_nested_attributes_for :event_registrants, reject_if: :all_blank, allow_destroy: true
 
     has_many :event_addons, -> { order(:event_product_id, :id) }, class_name: 'Effective::EventAddon', inverse_of: :event_registration, dependent: :destroy
-    accepts_nested_attributes_for :event_addons, reject_if: :all_blank, allow_destroy: true
+    accepts_nested_attributes_for :event_addons, reject_if: -> (atts) { atts[:event_product_id].blank? }, allow_destroy: true
 
     has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
@@ -73,6 +74,9 @@ module EffectiveEventsEventRegistration
       accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
     end
 
+    # Code of Conduct Step
+    attr_accessor :declare_code_of_conduct
+
     effective_resource do
       # Acts as Statused
       status                 :string, permitted: false
@@ -161,6 +165,11 @@ module EffectiveEventsEventRegistration
       end
     end
 
+    # Code of Conduct Step
+    with_options(if: -> { current_step == :code_of_conduct }) do
+      validates :declare_code_of_conduct, acceptance: true
+    end
+
     # If we're submitted. Try to move to completed.
     before_save(if: -> { submitted? }) { try_completed! }
 
@@ -193,9 +202,18 @@ module EffectiveEventsEventRegistration
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
 
-      with_addons = event.event_products.any? { |event_product| event_product.archived? == false }
-
-      with_addons ? wizard_step_keys : (wizard_step_keys - [:addons])
+      [
+        :start,
+        :tickets,
+        :details,
+        (:addons if event.event_products.any? { |event_product| !event_product.archived? }),
+        (:code_of_conduct if EffectiveEvents.code_of_conduct_enabled?),
+        :summary,
+        :billing,
+        :checkout,
+        :submitted,
+        :complete
+      ].compact
     end
 
     def delayed_payment_attributes
@@ -507,6 +525,11 @@ module EffectiveEventsEventRegistration
     false
   end
 
+  def wizard_step_title(step)
+    return EffectiveEvents.code_of_conduct_page_title if step == :code_of_conduct
+    default_wizard_step_title(step)
+  end
+
   private
 
   def update_deferred_event_registration!

data/app/models/effective/event.rb

@@ -210,8 +210,10 @@ module Effective
     end
 
     def registration_available?
-      return false if registration_start_at.blank? || registration_end_at.blank?
-      (registration_start_at..registration_end_at).cover?(Time.zone.now)
+      return false if closed?
+
+      return false if registration_start_at.blank?
+      registration_start_at <= Time.zone.now
     end
 
     def closed?
@@ -228,6 +230,10 @@ module Effective
       event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, except: except, quantity: 1) }
     end
 
+    def waitlist_only?
+      any_waitlist? && event_tickets.none? { |et| et.capacity_available > 0 }
+    end
+
     def upcoming?
       end_at > Time.zone.now
     end
@@ -297,7 +303,7 @@ module Effective
     end
 
     # Can I register/purchase this many new event tickets?
-    def event_ticket_available?(event_ticket, except: nil, quantity: 0)
+    def event_ticket_available?(event_ticket, except: nil, quantity: 1)
       raise('expected an EventTicket') unless event_ticket.kind_of?(Effective::EventTicket)
       raise('expected except to be an EventRegistration') if except && !except.class.try(:effective_events_event_registration?)
       raise('expected quantity to be greater than 0') unless quantity.to_i > 0
@@ -311,7 +317,7 @@ module Effective
     end
 
     # Can I register/purchase this many new event products?
-    def event_product_available?(event_product, quantity:)
+    def event_product_available?(event_product, quantity: 1)
       raise('expected an EventProduct') unless event_product.kind_of?(Effective::EventProduct)
       raise('expected quantity to be greater than 0') unless quantity.to_i > 0
 

data/app/models/effective/event_addon.rb

@@ -81,7 +81,7 @@ module Effective
     end
 
     def tax_exempt
-      event_product.tax_exempt
+      event_product&.tax_exempt
     end
 
     def qb_item_name

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

@@ -1,9 +1,3 @@
-= card do
-  .row
-    .col-sm
-      %h5.card-title= event_registration.wizard_step_title(:addons)
-    .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:addons)) if edit_effective_wizard?
-
+= wizard_card(event_registration) do
   - datatable = EffectiveEventAddonsDatatable.new(event_registration: event_registration)
   .mb-4= render_simple_datatable(datatable)

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

@@ -0,0 +1,3 @@
+= wizard_card(event_registration) do
+  = effective_table_with(event_registration) do |f|
+    = render("effective/event_registrations/code_of_conduct_fields", f: f)

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

@@ -0,0 +1,6 @@
+- f.object.declare_code_of_conduct = f.object.has_completed_step?(:code_of_conduct)
+
+- page = EffectiveEvents.code_of_conduct_effective_page!
+
+= f.check_box :declare_code_of_conduct, required: true,
+  label: "I agree to abide by the #{link_to(page.title, effective_pages.page_path(page), target: '_blank')}."

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

@@ -1,3 +1,4 @@
 .effective-event-registration
   - event_registration.render_steps.each do |partial|
-    = render "effective/event_registrations/#{partial}", event_registration: event_registration, step: partial
+    - event_registration.render_step = partial
+    = render "effective/event_registrations/#{partial}", event_registration: event_registration

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

@@ -1,9 +1,3 @@
-= card do
-  .row
-    .col-sm
-      %h5.card-title= event_registration.wizard_step_title(:tickets)
-    .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:tickets)) if edit_effective_wizard?
-
+= wizard_card(event_registration) do
   - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
   .mb-4= render_simple_datatable(datatable)

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

@@ -10,7 +10,7 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = f.fields_for(:owner, f.object.owner) do |fu|
-        = effective_address_fields(fu, :billing)
+      = f.fields_for(:owner, f.object.owner) do |fo|
+        = effective_address_fields(fo, :billing)
 
-      = f.save 'Save and Continue'
+      = f.submit 'Save and Continue', left: true

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

@@ -20,5 +20,5 @@
   - if resource.submit_order.delayed? && resource.submit_order.deferred?
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
-      = f.save 'Save and Continue'
+      = f.submit 'Save and Continue', left: true
 

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

@@ -0,0 +1,11 @@
+= render 'layout' do
+  = render('effective/event_registrations/changing', resource: resource)
+  = render('effective/event_registrations/content', resource: resource)
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = render('effective/event_registrations/code_of_conduct_fields', f: f)
+
+      = f.submit 'Save and Continue', left: true

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

@@ -5,7 +5,6 @@
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
 
-    = render('effective/event_registrations/fields_event_registrants', form: f)
+    = render('effective/event_registrations/details_fields', form: f)
 
-    %hr
-    = f.save 'Save and Continue'
+    = f.submit 'Save and Continue', left: true

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

@@ -1,37 +1,34 @@
 = render 'layout' do
   = render('effective/event_registrations/content', resource: resource)
 
-  - # Signed out
-  - if resource.owner.blank?
-    .card
-      .card-body
-        %p Welcome!
+  = card do
+    - # Signed out
+    - if resource.owner.blank?
+      %p Welcome!
 
-        %p You are about to register for #{resource.event}.
+      %p You are about to register for #{resource.event}.
 
-        %p 
-          Please 
-          = link_to 'sign in', '/users/sign_in'
-          or
-          = link_to 'sign up', '/users/sign_up'
-          to continue.
-          
-        %p= link_to 'Sign In to Continue', '/users/sign_in', class: 'btn btn-primary'
+      %p 
+        Please 
+        = link_to 'sign in', '/users/sign_in'
+        or
+        = link_to 'sign up', '/users/sign_up'
+        to continue.
+        
+      %p= link_to 'Sign In to Continue', '/users/sign_in', class: 'btn btn-primary'
 
-  - # Signed in
-  - if resource.owner.present?
-    .card
-      .card-body
-        %p Welcome #{current_user}!
+    - # Signed in
+    - if resource.owner.present?
+      %p Welcome #{current_user}!
 
-        %p You are registering for #{resource.event}.
+      %p You are registering for #{resource.event}.
 
-        = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-          = f.hidden_field :id
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
 
-          = f.hidden_field :event_id
+        = f.hidden_field :event_id
 
-          = f.hidden_field :owner_type
-          = f.hidden_field :owner_id
+        = f.hidden_field :owner_type
+        = f.hidden_field :owner_id
 
-          = f.save 'Save and Continue'
+        = f.submit 'Save and Continue', left: true

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

@@ -1,9 +1,10 @@
 = render 'layout' do
   = render('effective/event_registrations/changing', resource: resource)
   = render('effective/event_registrations/content', resource: resource)
+
   = render('effective/event_registrations/event_registration', event_registration: resource)
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
 
-    = f.save 'Save and Continue'
+    = f.submit 'Save and Continue', left: true

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

@@ -2,10 +2,10 @@
   = render('effective/event_registrations/changing', resource: resource)
   = render('effective/event_registrations/content', resource: resource)
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :id
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-    = card do
-      = render('effective/event_registrations/fields_event_ticket_selections', form: f)
+      = render('effective/event_registrations/tickets_fields', form: f)
 
-      = f.save 'Save and Continue'
+      = f.submit 'Save and Continue', left: true

data/app/views/effective/events/show.html.haml

@@ -16,8 +16,9 @@
 
         - if @event.registerable? || (impersonating? && @event.registerable_when_impersonating?)
           .register.mb-4
+            - label = (@event.waitlist_only? ? 'Join Waitlist' : 'Register')
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
+            = link_to label, url, class: 'btn btn-lg btn-primary'
 
         - if @event.file.attached?
           = image_tag url_for(@event.file), class: "effective-events-image d-none d-lg-block float-right", alt: @event.title, width: "350", height: "220"
@@ -58,9 +59,17 @@
           .effective-event-body.mb-5
             = @event.body.to_s
 
+        - if EffectiveEvents.code_of_conduct_enabled?
+          - page = EffectiveEvents.code_of_conduct_effective_page!
+
+          .effective-event-code-of-conduct.mb-4
+            View the
+            = link_to(page.title, effective_pages.page_path(page), target: '_blank')
+
         - if @event.registerable?
           .register.mb-4
+            - label = (@event.waitlist_only? ? 'Join Waitlist' : 'Register')
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
+            = link_to label, url, class: 'btn btn-lg btn-primary'
 
         = link_to("← #{events_name_label}".html_safe, effective_events.events_path, class: "btn btn-secondary my-4")

data/config/effective_events.rb

@@ -29,6 +29,12 @@ EffectiveEvents.setup do |config|
   # Hint text for event images attachments
   config.events_hint_text = 'Optional. Shown on the events index and event pages. Dimensions are 220px tall and 350px wide.'
 
+  # Code of Conduct
+  # Enable the code of conduct checkbox on the event registration wizard
+  # Create an Effective::Page for the code of conduct with this slug.
+  config.code_of_conduct_enabled = false
+  config.code_of_conduct_slug = 'event-code-of-conduct' 
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.34.0'.freeze
+  VERSION = '2.35.1'.freeze
 end

data/lib/effective_events.rb

@@ -11,6 +11,7 @@ module EffectiveEvents
       :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,
+      :code_of_conduct_enabled, :code_of_conduct_slug,
       :event_registration_class_name
     ]
   end
@@ -34,6 +35,22 @@ module EffectiveEvents
     organization_enabled == true
   end
 
+  def self.code_of_conduct_enabled?
+    code_of_conduct_enabled == true
+  end
+
+  def self.code_of_conduct_effective_page
+    return unless defined?(Effective::Page)
+    Effective::Page.where(slug: code_of_conduct_slug).first
+  end
+
+  def self.code_of_conduct_effective_page!
+    page = code_of_conduct_effective_page()
+    raise("The Effective::Page for slug \"#{code_of_conduct_slug}\" does not exist. Please create it.") if page.blank?
+
+    page
+  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: 2.34.0
+  version: 2.35.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-23 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,20 +270,23 @@ files:
 - app/views/effective/event_registrants/_fields.html.haml
 - app/views/effective/event_registrations/_addons.html.haml
 - app/views/effective/event_registrations/_changing.html.haml
+- app/views/effective/event_registrations/_code_of_conduct.html.haml
+- app/views/effective/event_registrations/_code_of_conduct_fields.html.haml
 - app/views/effective/event_registrations/_content.html.haml
 - app/views/effective/event_registrations/_dashboard.html.haml
 - app/views/effective/event_registrations/_details.html.haml
+- app/views/effective/event_registrations/_details_fields.html.haml
 - app/views/effective/event_registrations/_event_registration.html.haml
-- app/views/effective/event_registrations/_fields_event_registrants.html.haml
-- app/views/effective/event_registrations/_fields_event_ticket_selections.html.haml
 - app/views/effective/event_registrations/_form_blank_registrants.html.haml
 - app/views/effective/event_registrations/_layout.html.haml
 - app/views/effective/event_registrations/_orders.html.haml
 - app/views/effective/event_registrations/_summary.html.haml
 - app/views/effective/event_registrations/_tickets.html.haml
+- app/views/effective/event_registrations/_tickets_fields.html.haml
 - app/views/effective/event_registrations/addons.html.haml
 - app/views/effective/event_registrations/billing.html.haml
 - app/views/effective/event_registrations/checkout.html.haml
+- app/views/effective/event_registrations/code_of_conduct.html.haml
 - app/views/effective/event_registrations/complete.html.haml
 - app/views/effective/event_registrations/details.html.haml
 - app/views/effective/event_registrations/start.html.haml