effective_events 2.35.0 → 2.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752b1ea45717c8cc9c6cef3c312ca7392186497fb0024c55c71ac63a8e0ac402
-  data.tar.gz: e0dd03ae68b811e37b2ca5ee2237342ac4c1058bbf70a1136846fa81370dadaf
+  metadata.gz: 0a35679ce20fbdd029eb43d42d309d2d9afb8f14563a8678b6a0dfed1fba1c86
+  data.tar.gz: af28a6d095903ec662b695943fbf0c8eb140bbfc3151c67cb68696fad79bc657
 SHA512:
-  metadata.gz: 012ac6517e8998ddf0ede909ac774b7d18fcbede6170f5e4961a8db118252b0cd392cf0a0cb608ff7736c1d25a4bc4cf523fae38b12da271b4deae79734a1a2d
-  data.tar.gz: d0a9ef6bb70fa6ef410cce8fccfd12d1bcf3be40d4d4eea8cc5e0803de03198b565287ad748d8f9195b257a2af056a37ba4d79e85b55b596b7868b1cd365e19b
+  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/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/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"
@@ -67,7 +68,8 @@
 
         - 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/lib/effective_events/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.35.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