effective_events 2.31.4 → 2.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f321f525f4db929519c4a6f30b718b1fd5abc8499bf50e57ea412e050991554
-  data.tar.gz: c6e66cab6cccdb137708ea66f02c58134150dc31ac9fb669e76e799e7b2762f0
+  metadata.gz: 81ec9bb4f71c619dc8ffc2632f2fa53898ba7c7f78978130fef63aba5cd5ba76
+  data.tar.gz: 3a3b4b10cacc93bc04d4c9ca6081e6ce3a7d1991af032f13bf02aa22d7bc5927
 SHA512:
-  metadata.gz: afa01f66544ac0b1873444bfa708fe905185aa4342799811f09af1b1592ada5acff84a9c0421d6c2947c6125c983df59cd748a069daefec8f6cb0f4e36bdcd12
-  data.tar.gz: c980a324a6e3347cf5c541da6f47e92031a11dc3fd4e7ecbfd068a381596572cee95aa26f0e35540c2c92b7a4c5b9636c1bb15011aa081bd6ea0720bf82865cd
+  metadata.gz: b53a568ab95d67da9773ab9a32f7b126fda3992b18d2d992d194a432f9e0821cce2f06b6aeab2f899da10a7e126e22d7bb63f385250db2c9168c05c02bbf40be
+  data.tar.gz: 283afdc9a85aefeaea037c610526cb6822d1e0ac8dc58da4489d931742566da9d74bb6a360750fa5bd146aae1518bf2d690dd1f0cd4f470083545df3863ee4c7

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -22,7 +22,7 @@ module Admin
       if attributes[:event_id]
         col :event_product, search: Effective::EventProduct.where(event: event).all
       else
-        col :event_product, search: :string
+        col :event_product
       end
 
       col :purchased_order, visible: false

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -33,7 +33,7 @@ module Admin
       if attributes[:event_id]
         col :event_ticket, search: Effective::EventTicket.where(event: event).all
       else
-        col :event_ticket, search: :string
+        col :event_ticket
       end
 
       col :waitlisted do |registrant|

data/app/datatables/admin/effective_event_registrations_datatable.rb

@@ -10,11 +10,11 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :submitted_at, label: 'Submitted', as: :date
     col :completed_at, label: 'Completed', as: :date
 
-    col :event, search: :string
+    col :event
     col :owner
 
-    col :event_registrants, search: :string, visible: false
-    col :event_addons, search: :string, visible: false
+    col :event_registrants, visible: false
+    col :event_addons, visible: false
     col :orders, label: 'Order'
 
     actions_col

data/app/datatables/admin/effective_events_datatable.rb

@@ -48,17 +48,17 @@ module Admin
       col :delayed_payment_date, visible: false
 
       # These show too much information to be useful to admins, rely on the edit screen
-      # col :event_tickets, search: :string
-      # col :event_products, search: :string
-      # col :event_registrants, search: :string
-      # col :event_addons, search: :string
+      # col :event_tickets
+      # col :event_products
+      # col :event_registrants
+      # col :event_addons
 
       col :allow_blank_registrants, visible: false
       col :roles, visible: false
       col :authenticate_user, visible: false
 
       col :qb_item_names, 
-        search: { fuzzy: true, collection:Effective::ItemName.sorted.map(&:to_s) },
+        search: { fuzzy: true, collection: Effective::ItemName.sorted.map(&:to_s) },
         label: qb_item_names_label,
         visible: false do |event|
           event.qb_item_names.map { |qb_item_name| content_tag(:div, qb_item_name) } .join.html_safe

data/app/datatables/effective_event_addons_datatable.rb

@@ -7,7 +7,7 @@ class EffectiveEventAddonsDatatable < Effective::Datatable
       "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
     end
 
-    col :event_product, search: :string, label: 'Add-on' do |er|
+    col :event_product, label: 'Add-on' do |er|
       [
         er.event_product.to_s,
         (content_tag(:span, 'Archived', class: 'badge badge-warning') if er.event_product&.archived?)

data/app/datatables/effective_event_registrants_datatable.rb

@@ -7,7 +7,7 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
     col :full_name, label: 'Name'
     col :id, visible: false
 
-    col :event_ticket, search: :string, label: 'Ticket' do |er|
+    col :event_ticket, label: 'Ticket' do |er|
       [er.event_ticket.to_s, er.details.presence].compact.join('<br>').html_safe
     end
 

data/app/datatables/effective_event_registrations_datatable.rb

@@ -10,16 +10,16 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
       er.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
-    col :event, search: :string do |er|
+    col :event do |er|
       link_to(er.event.to_s, effective_events.event_path(er.event))
     end
 
-    col :owner, visible: false, search: :string
+    col :owner, visible: false
     col :status, visible: false
-    col :event_registrants, label: 'Registrants', search: :string
+    col :event_registrants, label: 'Registrants'
 
-    col :event_addons, label: 'Add-ons', search: :string
-    col :orders, action: :show, visible: false, search: :string
+    col :event_addons, label: 'Add-ons'
+    col :orders, action: :show, visible: false
 
     actions_col(actions: []) do |er|
       if er.draft? || er.submitted?

data/app/datatables/effective_events_datatable.rb

@@ -30,7 +30,7 @@ class EffectiveEventsDatatable < Effective::Datatable
       end
     end
 
-    col :event_tickets, visible: false, search: :string
+    col :event_tickets, visible: false
     col :early_bird_end_at, label: 'Early bird ends', visible: false
 
     actions_col show: false do |event|

data/app/models/concerns/effective_events_event_registration.rb

@@ -92,8 +92,9 @@ module EffectiveEventsEventRegistration
       includes(:owner)
       .includes(event: [:rich_texts, event_products: :purchased_event_addons, event_tickets: :purchased_event_registrants])
       .includes(event_ticket_selections: [:event_ticket])
-      .includes(event_registrants: [event_ticket: :purchased_event_registrants])
+      .includes(event_registrants: [:owner, event_ticket: :purchased_event_registrants])
       .includes(event_addons: [event_product: :purchased_event_addons])
+      .includes(:orders)
     }
 
     scope :sorted, -> { order(:id) }

data/app/models/effective/event_registrant.rb

@@ -70,7 +70,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:event_ticket_id, :id) }
-    scope :deep, -> { includes(:event, :event_ticket, :owner, event_registration: :orders) }
+    scope :deep, -> { includes(:event, :event_ticket, :owner, :user, 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/app/models/effective/event_ticket.rb

@@ -49,7 +49,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:title) }
-    scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
+    scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants, :event_registrants) }
 
     before_validation(if: -> { event.present? }) do
       self.category ||= CATEGORIES.first

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.31.4'.freeze
+  VERSION = '2.32.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.31.4
+  version: 2.32.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails