effective_events 2.30.1 → 2.30.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0b6bb02134427002f39566497b8f27a3926cbf42b8569c1ca7a549a3dc1339
-  data.tar.gz: 610c6470114b3d6776ec40632902cc6dbc78c7a00125eb259b3ca13741a0b8f5
+  metadata.gz: 91109a7761fa4e8cbc16e6ac9b9f8154da0f82e0137c2ffaa5988d6574608fd5
+  data.tar.gz: 4b69f5c89699e704194adf9c8c9f2e8f8b70eb5e4a1af6a176709798e1aab8d7
 SHA512:
-  metadata.gz: 83b1c76fdd353b033ce990ac11089e179f415070224e02b91c7ed5e47f48d6ef6d9fb2f2d4b49a5c697ff271809e1b5d98b654a8c635407d547771a32aae9a05
-  data.tar.gz: 35ecf10066ac4c3364fb5b0a6373aa90c1cde891f411c1e8029d639a5ec25eeab2b75ccf02fba8f54f32a8d7308b1ae3da401263ca087e273c791e0e36909ec4
+  metadata.gz: c0535e852a75453384146d633c341c18bbfc34c217033b0eb8c59175c6897913fbd65829ce4a8068fb13d54191e4f4435680e58c47e5cacbe35dd8fd089beac2
+  data.tar.gz: '09ca6a32572b6821ab732ac68d25e4d2856fc28fbfe413885f0b69f1d228c21e6304c742a087c1f6e10f00e3201f10f7be5d4e4d3a7f682657580ecca3d899ac'

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -16,7 +16,6 @@ module Admin
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
-      col :archived, visible: false
 
       col :registered_at
 
@@ -45,9 +44,12 @@ module Admin
         else
           '-'
         end
+      end.search do |collection, term|
+        EffectiveResources.truthy?(term) ? collection.waitlisted : collection.non_waitlisted
       end
 
       col :promoted, visible: false
+      col :archived, visible: false
 
       col :name do |er|
         if er.user.present?

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -1,54 +1,76 @@
 module Admin
   class EffectiveEventTicketsDatatable < Effective::Datatable
-    filters do
-      scope :unarchived, label: "All"
-      scope :archived
-    end
-
     datatable do
-      reorder :position
+      order :title
 
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
-      col :archived, visible: false
+      col :archived
 
       col :event
-
       col :title
       col :category, visible: false
+      col :waitlist, visible: false
 
-      col :early_bird_price, as: :price, visible: event&.early_bird_end_at.present?
-      col :regular_price, as: :price
-      col :member_price, as: :price
+      col :early_bird_price, as: :price, visible: false
+      col :regular_price, as: :price, visible: false
+      col :member_price, as: :price, visible: false
 
-      col :waitlist
-      col :capacity_available, visible: false
-      col :capacity, label: 'Capacity Total', visible: false
+      col :prices do |ticket|
+        prices = ""
+
+        if event&.early_bird_end_at.present?
+          prices += "#{price_to_currency(ticket.early_bird_price || 0)} early<br />"
+        end
 
-      col :capacity_to_s, label: 'Capacity' do |ticket|
-        if ticket.capacity.present? && ticket.waitlist?
-          "#{ticket.capacity_available} remaining / #{ticket.capacity} total. #{ticket.waitlisted_event_registrants_count} waitlisted."
-        elsif ticket.capacity.present?
-          "#{ticket.capacity_available} remaining / #{ticket.capacity} total"
+        if ticket.category == "Member Only"
+          prices += "#{price_to_currency(ticket.member_price)} member"
+        elsif ticket.category == "Regular"
+          prices += "#{price_to_currency(ticket.regular_price)} regular"
+        elsif ticket.category == ("Member or Non-Member" || "Regular")
+          prices +=
+          "
+            #{price_to_currency(ticket.regular_price)} regular<br />
+            #{price_to_currency(ticket.member_price)} member
+          "
+        else
+          "Invalid ticket category"
+        end
+
+        prices
+      end
+
+      col :capacity_available, visible: false
+      col :capacity, label: 'Capacity total', visible: false
+
+      col :registrations, label: 'Registrations' do |ticket|
+        if ticket.capacity.present?
+          "
+            #{ticket.capacity} capacity<br />
+            #{ticket.registered_non_waitlisted_count} registered<br />
+            #{ticket.registered_available_count} available<br />
+            #{ticket.registered_waitlisted_count} waitlisted
+          "
+        else
+          "#{ticket.registered_count} registered"
         end
       end
 
       col :category, visible: false
 
-      col :registered_event_registrants_count, label: 'Registered' do |event|
+      col :registered_event_registrants_count, label: 'Registered', visible: false, as: :integer do |event|
         event.event_registrants.registered.count
       end
 
-      col :purchased_event_registrants_count, label: 'Deferred', visible: false do |event|
+      col :deferred_event_registrants_count, label: 'Deferred', visible: false, as: :integer do |event|
         event.event_registrants.deferred.count
       end
 
-      col :purchased_event_registrants_count, label: 'Purchased', visible: false do |event|
+      col :purchased_event_registrants_count, label: 'Purchased', visible: false, as: :integer do |event|
         event.event_registrants.purchased.count
       end
 
-
       col :question1, visible: false
       col :question2, visible: false
       col :question3, visible: false

data/app/datatables/admin/effective_events_datatable.rb

@@ -22,8 +22,8 @@ module Admin
 
       col :draft?, as: :boolean, visible: false
       col :published?, as: :boolean
-      col :published_start_at, as: "Published start"
-      col :published_end_at, as: "Published end"
+      col :published_start_at, label: "Published start", as: :datetime
+      col :published_end_at, label: "Published end", as: :datetime
 
       col :start_at, label: 'Start', visible: false
       col :end_at, label: 'End', visible: false

data/app/models/effective/event_registrant.rb

@@ -76,6 +76,9 @@ module Effective
     scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
     scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 
+    scope :waitlisted, -> { where(waitlisted: true, promoted: false) }
+    scope :non_waitlisted, -> { where(waitlisted: false).or(where(waitlisted: true, promoted: true)) }
+
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
       self.owner ||= event_registration.owner

data/app/models/effective/event_ticket.rb

@@ -48,7 +48,7 @@ module Effective
       timestamps
     end
 
-    scope :sorted, -> { order(:position) }
+    scope :sorted, -> { order(:title) }
     scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
     before_validation(if: -> { event.present? }) do
@@ -75,6 +75,7 @@ module Effective
       title.presence || 'New Event Ticket'
     end
 
+    # These capacity methods are used by the front end EventRegistrations screens
     def capacity_selectable(except: nil)
       return nil if capacity.blank?
       return nil if waitlist?
@@ -88,7 +89,7 @@ module Effective
     end
 
     def capacity_taken(except: nil)
-      registered_or_selected_event_registrants(except: except).reject(&:waitlisted?).length
+      registered_or_selected_event_registrants(except: except).reject { |er| er.waitlisted? && !er.promoted? }.length
     end
 
     def registered_or_selected_event_registrants(except: nil)
@@ -99,24 +100,31 @@ module Effective
       end
     end
 
-    def registered_or_selected_event_registrants_count
-      registered_or_selected_event_registrants.count
-    end
+    # These registered methods are for the admin registrations screens
 
-    def registered_event_registrants_count
+    # Total registered count, including waitlisted and non waitlisted
+    def registered_count
       registered_event_registrants.length
     end
 
-    def purchased_event_registrants_count
-      purchased_event_registrants.length
+    # Registered and not waitlisted count
+    def registered_non_waitlisted_count
+      registered_event_registrants.non_waitlisted.length
     end
 
-    def non_waitlisted_event_registrants_count
-      registered_event_registrants.where(waitlisted: false).or(registered_event_registrants.where(waitlisted: true, promoted: true))
+    # Registered and waitlisted count
+    def registered_waitlisted_count
+      registered_event_registrants.waitlisted.length
     end
 
-    def waitlisted_event_registrants_count
-      registered_event_registrants.where(waitlisted: true, promoted: false).length
+    # Registered and available count
+    def registered_available_count
+      return nil if capacity.blank?
+      [capacity - registered_non_waitlisted_count, 0].max
+    end
+
+    def purchased_event_registrants_count
+      purchased_event_registrants.length
     end
 
     def questions
@@ -134,6 +142,5 @@ module Effective
     def member_or_non_member?
       category == 'Member or Non-Member'
     end
-
   end
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.30.1'.freeze
+  VERSION = '2.30.3'.freeze
 end

metadata

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