effective_events 3.3.3 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd6018d7733bf769e02ddfdb3971867014d30fd2abb314fdeb1b4a4f9b748d7
-  data.tar.gz: b0d158a307b8619f405617f05f47e61de09665a682eb6d9d921eaa09f18f230f
+  metadata.gz: bd3b79e619ea9b2357e37fb87cecc9b0ea0b8c1e626f01c4fb89910a06b18a3f
+  data.tar.gz: 38c2ad193a4c6d6fb488f04632ee6380b34e830b5fb61164c125ea5936f6ff4d
 SHA512:
-  metadata.gz: b7bccd357fc15737094ff71fe9b07d58af367a2a5fb2282e60dfb4c07ad4c38a746c0fc4cea09971b8b2a8f456211f03c9b964fd153d5dac112bcf7ea012fae7
-  data.tar.gz: b80e7b3971939629fc8787f1f8b9f96fc96169b2ecc67d70cb1e2efda60395268516be943dcf461be600eb2a587d51c375215e29942c7b3ed2c0e45798aab5d8
+  metadata.gz: efd880df3b4c17eca3598f9a7ad35ccc5f0bb532eed2245901764ba5f9148b0871157b4d906e346b5684410c2bba492e48a0cd912f3c93f7faeacebb0d6a9bdb
+  data.tar.gz: e49a5ba9f25b817f1911b3847fc09163cb643e6ca4916f6d54b40405a54e32c71998fbf4976b34c314e6004786ba5e0f11d04a746df32bc250da102513f37bf0

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -22,7 +22,11 @@ module Admin
 
       col :event
 
-      col :owner, sql_column: :owner
+      col :owner, as: :string, sql_column: 'users.last_name' do |er|
+        er.owner.to_s
+      end.search do |collection, term|
+        collection.where("users.first_name ILIKE :term OR users.last_name ILIKE :term", term: "%#{term}%")
+      end
       col :event_registration, visible: false
 
       if defined?(EffectiveMemberships) && EffectiveMemberships.Organization.respond_to?(:sponsors)
@@ -52,7 +56,7 @@ module Admin
       col :promoted, visible: false
       col :archived, visible: false
 
-      col :name do |er|
+      col :name, as: :string, sql_column: "NULLIF(event_registrants.last_name, '')" do |er|
         if er.user.present?
           "#{link_to(er.user, "/admin/users/#{er.user.id}/edit", target: '_blank')}<br><small>#{mail_to(er.user.email)}</small>"
         elsif er.first_name.present? && er.email.present?
@@ -64,10 +68,16 @@ module Admin
         else
           'Pending Name'
         end
+      end.search do |collection, term|
+        collection.where("event_registrants.first_name ILIKE :term OR event_registrants.last_name ILIKE :term", term: "%#{term}%")
       end
       
       col :user, visible: false
-      col :organization, visible: EffectiveEvents.organization_enabled?
+      col :organization, as: :string, sql_column: "NULLIF(organizations.title, '')", visible: EffectiveEvents.organization_enabled? do |er|
+        er.organization.to_s
+      end.search do |collection, term|
+        collection.where("organizations.title ILIKE :term", term: "%#{term}%")
+      end
       col :company, visible: !EffectiveEvents.organization_enabled?
 
       col :orders, visible: false
@@ -105,6 +115,8 @@ module Admin
 
     collection do
       scope = Effective::EventRegistrant.deep.includes(user: :addresses).all
+        .joins("LEFT JOIN users ON users.id = event_registrants.owner_id")
+        .joins("LEFT JOIN organizations ON organizations.id = event_registrants.organization_id")
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/effective_event_registrants_datatable.rb

@@ -39,7 +39,7 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
     end
 
     if event_registration.present?
-      scope = scope.where(event_registration_id: event_registration).sorted
+      scope = scope.where(event_registration_id: event_registration)
     end
 
     scope

data/app/models/concerns/effective_events_event_registration.rb

@@ -249,6 +249,10 @@ module EffectiveEventsEventRegistration
       event&.delayed_payment_date_upcoming?
     end
 
+    def delayed_payment_date_past?
+      event&.delayed_payment_date_past?
+    end
+
     def find_or_build_submit_fees
       with_outstanding_coupon_fees(submit_fees)
     end

data/app/models/effective/event.rb

@@ -377,6 +377,11 @@ module Effective
       delayed_payment_date > Time.zone.now.to_date
     end
 
+    def delayed_payment_date_past?
+      return false unless delayed?
+      delayed_payment_date <= Time.zone.now.to_date
+    end
+
     def update_delayed_orders_delayed_payment_date!
       raise('expected delayed payment date to be present') unless delayed_payment_date.present?
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.3.3'.freeze
+  VERSION = '3.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-17 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails