effective_events 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d25eaee6089c0b76752550e6458c502124947d0e244a1d0e7b65584935caa43
-  data.tar.gz: 6b06663b84f26a0ba07324fe601c41bc7070117c42e019527ecffbcbcc0fcd6c
+  metadata.gz: 418833792fdacf3ee145ead72e1bac6aee5933e9ca8eaad3cf26afc589ec8e3b
+  data.tar.gz: 1a105035e07a3ff8dde869ff9ed9b28830ff9739fde2bae7d6d7a59be2ba0437
 SHA512:
-  metadata.gz: c599c5411f8c66a3dbe6f4c0ded8f9ef6f202c25d66cbdee33ee141cbbd3d4afd1fbd4a19ae55ccc9fc303a44882b5c971359595b31e30f551e5f35ed3b4f13b
-  data.tar.gz: 77ac6e934e9276331670d270dee9d82b55bf2eb8c2e1ed90ee57a9b1798aa56bcca6142d46dcb98b140adc1dbf61982ff469b9c2950c62a9a7252a0813d08272
+  metadata.gz: 36464803efef6e30bcac251faa6251080e1fdf8cf1f1504695e102ee82f0b65320102c13ccfe61410d0d7a29c22734e5cf27d535b854ec6f00652e0a05f5b1dc
+  data.tar.gz: d135b844f28edde57fa67bcda5a2bf03935db3a3d33b49db09d32be8381cf6e7e478c67e4ac7195f450a1ab74718f980c8a7de6c8aeb52ce7347e974dad5f0db

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -23,7 +23,9 @@ module Admin
       col :member_price, as: :price
 
       col :capacity_to_s, label: 'Capacity' do |ticket|
-        if ticket.capacity.present?
+        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"
         end
       end
@@ -34,6 +36,10 @@ module Admin
         event.event_registrants.registered.unarchived.count
       end
 
+      col :purchased_event_registrants_count, label: 'Deferred', visible: false do |event|
+        event.event_registrants.deferred.unarchived.count
+      end
+
       col :purchased_event_registrants_count, label: 'Purchased', visible: false do |event|
         event.event_registrants.purchased.unarchived.count
       end

data/app/models/effective/event_ticket.rb

@@ -108,6 +108,14 @@ module Effective
       purchased_event_registrants.length
     end
 
+    def non_waitlisted_event_registrants_count
+      registered_event_registrants.where(waitlisted: false).or(registered_event_registrants.where(waitlisted: true, promoted: true))
+    end
+
+    def waitlisted_event_registrants_count
+      registered_event_registrants.where(waitlisted: true, promoted: false).length
+    end
+
     def questions
       [question1.presence, question2.presence, question3.presence].compact
     end

data/app/views/admin/event_registrants/_form.html.haml

@@ -11,7 +11,7 @@
   - else
     = f.static_field :owner
 
-  = f.datetime_field :registered_at
+  = f.datetime_field :registered_at, required: true
 
   = render 'effective/event_registrants/fields', f: f, event: event_registrant.event, namespace: :admin
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Code and Effect