effective_events 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd3b79e619ea9b2357e37fb87cecc9b0ea0b8c1e626f01c4fb89910a06b18a3f
-  data.tar.gz: 38c2ad193a4c6d6fb488f04632ee6380b34e830b5fb61164c125ea5936f6ff4d
+  metadata.gz: c5858754efeedb4638f0c9716e8db9a2314f2abf1bd2a4634a22b8504e738378
+  data.tar.gz: c48f446405a02f269a91774886f7e6e940d1cc78aad19297ba0b9a3c4605fb9e
 SHA512:
-  metadata.gz: efd880df3b4c17eca3598f9a7ad35ccc5f0bb532eed2245901764ba5f9148b0871157b4d906e346b5684410c2bba492e48a0cd912f3c93f7faeacebb0d6a9bdb
-  data.tar.gz: e49a5ba9f25b817f1911b3847fc09163cb643e6ca4916f6d54b40405a54e32c71998fbf4976b34c314e6004786ba5e0f11d04a746df32bc250da102513f37bf0
+  metadata.gz: 7f84592d4b7fe6c1e6d859fd78d39b93e99cab7a28d89066a34d76ebe44328c24cf3bb1e652d6efd6adce2149182ca279f44d975895be1fa37b5f1c314843d25
+  data.tar.gz: 986ccd698de2eccda992a2a5a3b1ccc2303ff902168d4a8b5e6ecb42e0c38f7e6c35aaedfe5cd76d03e028558294ecaff2f1a5b7dd0ae8b8f60288a02bc544d4

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -22,11 +22,13 @@ module Admin
 
       col :event
 
-      col :owner, as: :string, sql_column: 'users.last_name' do |er|
-        er.owner.to_s
+      col :owner, as: :string, sql_column: 'owners.last_name' do |er|
+        link_to(er.owner, "/admin/users/#{er.owner_id}/edit")
       end.search do |collection, term|
-        collection.where("users.first_name ILIKE :term OR users.last_name ILIKE :term", term: "%#{term}%")
+        users = Effective::Resource.new(current_user).search_any(term, columns: [:first_name, :last_name, :email])
+        collection.where(owner_id: users, owner_type: current_user.class.name)
       end
+
       col :event_registration, visible: false
 
       if defined?(EffectiveMemberships) && EffectiveMemberships.Organization.respond_to?(:sponsors)
@@ -69,24 +71,27 @@ module Admin
           '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}%")
+        event_registrants = Effective::Resource.new(Effective::EventRegistrant).search_any(term, columns: [:first_name, :last_name, :email])
+        collection.where(id: event_registrants)
       end
       
       col :user, visible: false
-      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}%")
+
+      if defined?(EffectiveMemberships) && EffectiveEvents.organization_enabled?
+        col :organization, as: :string, sql_column: 'organizations.title', visible: true do |er|
+          link_to(er.organization, effective_memberships.edit_admin_organization_path(er.organization))
+        end.search do |collection, term|
+          organizations = Effective::Resource.new(EffectiveMemberships.Organization).search_any(term, columns: [:title])
+          collection.where(organization_id: organizations, organization_type: EffectiveMemberships.Organization.name)
+        end
+      else
+        col :company, visible: true
       end
-      col :company, visible: !EffectiveEvents.organization_enabled?
 
       col :orders, visible: false
 
       col(:price, as: :price) do |registrant|
-        [
-          (badge('ADMIN') if registrant.created_by_admin?),
-          price_to_currency(registrant.price)
-        ].compact.join(' ').html_safe
+        [(badge('ADMIN') if registrant.created_by_admin?), price_to_currency(registrant.price)].compact.join(' ').html_safe
       end
 
       col :created_by_admin, visible: false
@@ -114,9 +119,12 @@ module Admin
     end
 
     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")
+      scope = Effective::EventRegistrant.deep.all
+        .joins("LEFT JOIN users AS owners ON owners.id = event_registrants.owner_id")
+
+      if defined?(EffectiveMemberships) && EffectiveEvents.organization_enabled?
+        scope = scope.joins("LEFT JOIN organizations AS organizations ON organizations.id = event_registrants.organization_id")
+      end
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/models/effective/event_registrant.rb

@@ -71,7 +71,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:event_ticket_id, :id) }
-    scope :deep, -> { includes(:event, :event_ticket, :owner, :user, event_registration: :orders) }
+    scope :deep, -> { includes(:event, :event_ticket, :owner, user: :addresses, event_registration: :orders) }
     scope :registered, -> { unarchived.where.not(registered_at: nil) }
     scope :not_registered, -> { archived.or(where(registered_at: nil)) }
     scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }

data/db/migrate/101_create_effective_events.rb

@@ -208,7 +208,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :event_registration_id
       t.string :event_registration_type
 
-      t.string :event_ticket_id
+      t.integer :event_ticket_id
       t.integer :quantity
 
       t.datetime :updated_at

data/lib/effective_events/version.rb

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

metadata

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