effective_events 2.30.1 → 2.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0b6bb02134427002f39566497b8f27a3926cbf42b8569c1ca7a549a3dc1339
-  data.tar.gz: 610c6470114b3d6776ec40632902cc6dbc78c7a00125eb259b3ca13741a0b8f5
+  metadata.gz: 32f5674dd0103143460a411264938785c8b8fe264caf401aa3ac7c39c4118be6
+  data.tar.gz: a0298a712e199e4b3e6fcef70aa1f11e9feb3d27d75266cdabb6d418b36e5518
 SHA512:
-  metadata.gz: 83b1c76fdd353b033ce990ac11089e179f415070224e02b91c7ed5e47f48d6ef6d9fb2f2d4b49a5c697ff271809e1b5d98b654a8c635407d547771a32aae9a05
-  data.tar.gz: 35ecf10066ac4c3364fb5b0a6373aa90c1cde891f411c1e8029d639a5ec25eeab2b75ccf02fba8f54f32a8d7308b1ae3da401263ca087e273c791e0e36909ec4
+  metadata.gz: 7631eec53e65b21d0546a009fe233989eefe5e448f34fe50c83562993ea2e01ea405c5b0f6f9dee9de5e4c5e3ca41c6e30aad6e640d5fab904fecc454bf7cdc8
+  data.tar.gz: b972ba664a0d9312a5fd66d04bd4442b521badb1ce34aabff9f8933e5c2b1e51b8235c37cc2d8999c4e8778769ca47cc58fcb1610e8db14675569e2bfac5e974

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -1,54 +1,77 @@
 module Admin
   class EffectiveEventTicketsDatatable < Effective::Datatable
-    filters do
-      scope :unarchived, label: "All"
-      scope :archived
-    end
-
     datatable do
       reorder :position
 
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
-      col :archived, visible: false
+      col :archived
 
-      col :event
 
+      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.non_waitlisted_event_registrants_count.count} registered<br />
+            #{ticket.capacity_available} available<br />
+            #{ticket.waitlisted_event_registrants_count} waitlisted
+          "
+        else
+          "#{ticket.non_waitlisted_event_registrants_count.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 :purchased_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/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.30.1'.freeze
+  VERSION = '2.30.2'.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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails