effective_events 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e37bb52cbe39fa76dbb40c45b4364abbab706a4a872125e11de75a1432c7b62
-  data.tar.gz: 484e50eafc049ea811ba446638a600ca8d49e17004da1e7a88d4635afe73f30e
+  metadata.gz: 40a4145045dd8daf4428a0bc51fa41b0038e740a94638239f4afc03785288757
+  data.tar.gz: 1fb48be6ed97c39e23e9b0ac0103bb89df797a11f17f38490a38439d8ba76fd7
 SHA512:
-  metadata.gz: 84b97ecbbad1998e51a2ccbe93a2d5bd015e9a6dfa9f5e267db7a9f2aaf8a1668aaa1822c4ba6482f8cc539ae76846a4b2a0128e7654d0923040b662bc1590a6
-  data.tar.gz: f8ca6e7b250819032b81a8b8459cf7179e9ff0b8ba782902755fae7d3f1c1a9c247edb0bc12b4ea0f45d883828b8b82bc05cc4fb0160a27271966f1fe179480d
+  metadata.gz: ba175c474fdc49420da8dfd410445c24fad80d9cde7e69e169718579855a20c2b194469e1ef871e4782fb0e142317595c1d6a21afec283d78640d9bf72b556bb
+  data.tar.gz: 9180e93c99df92081432c14449c25970d2e97cd12de99e989d5ef27f99ba4dcd50f60b932497d44e3646b249912013f5322bb39797c262ba12e43328cf65eb73

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -18,6 +18,7 @@ module Admin
       col :id, visible: false
 
       col :registered_at
+      col :cancelled_at
 
       col :event
 

data/app/datatables/admin/effective_events_datatable.rb

@@ -30,12 +30,19 @@ module Admin
       col :published_start_at, label: "Published start", as: :datetime, visible: false
       col :published_end_at, label: "Published end", as: :datetime, visible: false
 
-      # TODO
-      # col :total_capacity, label: 'Capacity' do |event|
-      #   if event.event_tickets_with_capacity.present?
-      #     "#{event.total_capacity_taken}/#{event.total_capacity}"
-      #   end
-      # end
+      col :total_registered do |event|
+        registered = if event.event_tickets_with_capacity.present?
+          "#{event.total_registered_non_waitlisted_count}/#{event.total_capacity}"
+        elsif event.event_tickets.present?
+          "#{event.total_registered}"
+        end
+
+        waitlisted = if event.event_tickets_with_waitlist.present?
+          "#{event.total_registered_waitlisted_count} waitlisted"
+        end
+
+        [registered, waitlisted].compact.join(" +")
+      end
 
       col :excerpt, visible: false
 

data/app/mailers/effective/events_mailer.rb

@@ -7,13 +7,15 @@ module Effective
     helper EffectiveEventsHelper
     helper EffectiveOrdersHelper
 
+    # We do not send email from this gem, and instead use the effective_orders gem to send the email.
+
     # For the notifications. No longer used.
-    def event_registrant_purchased(resource, opts = {})
-      raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
+    # def event_registrant_purchased(resource, opts = {})
+    #   raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
 
-      @assigns = assigns_for(resource)
-      mail(to: resource.email, **headers_for(resource, opts))
-    end
+    #   @assigns = assigns_for(resource)
+    #   mail(to: resource.email, **headers_for(resource, opts))
+    # end
 
     protected
 
@@ -22,6 +24,10 @@ module Effective
         return event_registrant_assigns(resource).merge(event_assigns(resource.event)).merge(event_ticket_assigns(resource.event_ticket))
       end
 
+      if resource.class.try(:effective_events_event_registration?)
+        return event_registration_assigns(resource).merge(event_assigns(resource.event))
+      end
+
       raise('unexpected resource')
     end
 
@@ -34,7 +40,23 @@ module Effective
         url: link_to(effective_events.event_url(resource))
       }
 
-      { event: values }
+      { 
+        event: values,
+        dashboard_url: link_to(root_url + 'dashboard')
+      }
+    end
+
+    def event_registration_assigns(resource)
+      raise('expected an event registration') unless resource.class.try(:effective_events_event_registration?)
+
+      values = { 
+        owner: resource.owner.to_s, 
+        email: resource.email, 
+        cancelled_registrants: resource.event_registrants.select(&:cancelled?).map(&:to_s).join("<br>"),
+        url: link_to(effective_events.event_event_registration_url(resource.event, resource))
+      }
+
+      { event_registration: values }
     end
 
     def event_ticket_assigns(resource)

data/app/models/concerns/effective_events_event_registration.rb

@@ -287,6 +287,29 @@ module EffectiveEventsEventRegistration
 
       true
     end
+
+    # Called by the event_registrant.cancel_all!
+    # Admin action only. Cancels all event registrants
+    def cancel!
+      event_registrants.reject(&:cancelled?).each do |event_registrant|
+        event_registrant.assign_attributes(cancelled_at: Time.zone.now)
+        event_registrant.archive!
+      end
+
+      after_commit { send_event_registrants_cancelled_email! }
+
+      true
+    end
+
+    def uncancel!
+      event_registrants.select(&:cancelled?).each do |event_registrant|
+        event_registrant.assign_attributes(cancelled_at: nil)
+        event_registrant.unarchive!
+      end
+
+      true
+    end
+
   end
 
   # Instance Methods
@@ -294,6 +317,10 @@ module EffectiveEventsEventRegistration
     event.present? ? "Event registration - #{event}" : model_name.human
   end
 
+  def email
+    owner&.email
+  end
+
   def in_progress?
     draft? || submitted?
   end
@@ -533,6 +560,10 @@ module EffectiveEventsEventRegistration
     submit_order.send_order_emails!
   end
 
+  def send_event_registrants_cancelled_email!
+    submit_order.send_event_registrants_cancelled_email!
+  end
+
   def just_let_them_edit_tickets_and_register_anyway?
     false
   end

data/app/models/effective/event.rb

@@ -283,22 +283,33 @@ module Effective
       start_at
     end
 
+    # For Events#index column
     def event_tickets_with_capacity
-      event_tickets.reject(&:archived?).select { |et| et.capacity.present? }
+      event_tickets.select { |et| et.capacity.present? }
     end
 
-    def total_capacity_available
-      event_tickets_with_capacity.sum { |et| et.capacity_available }
+    def event_tickets_with_waitlist
+      event_tickets_with_capacity.select { |et| et.waitlist? }
     end
 
-    def total_capacity_taken
-      event_tickets_with_capacity.sum { |et| et.capacity_taken }
+    # Total Registered and not waitlisted count
+    def total_registered_non_waitlisted_count
+      event_tickets_with_capacity.sum { |et| et.registered_non_waitlisted_count }
+    end
+
+    # Total Registered and waitlisted count
+    def total_registered_waitlisted_count
+      event_tickets_with_capacity.sum { |et| et.registered_waitlisted_count }
     end
 
     def total_capacity
       event_tickets_with_capacity.sum { |et| et.capacity }
     end
 
+    def total_registered
+      event_tickets.sum { |et| et.registered_count }
+    end
+
     # The amount of tickets that can be purchased except ones from an event registration
     def capacity_selectable(event_ticket:, event_registration: nil)
       return 0 if event_ticket.archived?

data/app/models/effective/event_registrant.rb

@@ -47,6 +47,7 @@ module Effective
 
       selected_at           :datetime     # When the event registration was selected by a user on the tickets! step
       registered_at         :datetime     # When the order is deferred or purchased
+      cancelled_at          :datetime     # When the registrant was cancelled by an admin. This also archives it.
 
       # Question Responses
       response1             :text
@@ -221,7 +222,8 @@ module Effective
         (content_tag(:span, 'Member', class: 'badge badge-warning') if member?),
         (content_tag(:span, 'Guest of Member', class: 'badge badge-warning') if guest_of_member?),
         (content_tag(:span, 'Waitlist', class: 'badge badge-warning') if waitlisted_not_promoted?),
-        (content_tag(:span, 'Archived', class: 'badge badge-warning') if archived?)
+        (content_tag(:span, 'Archived', class: 'badge badge-warning') if archived? && !cancelled?),
+        (content_tag(:span, 'Cancelled', class: 'badge badge-warning') if cancelled?),
       ].compact.join(' ').html_safe
     end
 
@@ -304,7 +306,9 @@ module Effective
 
     def selected_not_expired?
       return false unless EffectiveEvents.EventRegistration.selection_window.present?
-      selected_at.present? && (selected_at + EffectiveEvents.EventRegistration.selection_window > Time.zone.now)
+      return false unless selected_at.present?
+
+      (selected_at + EffectiveEvents.EventRegistration.selection_window) > Time.zone.now
     end
 
     # Called by an event_registration after_defer and after_purchase
@@ -436,11 +440,43 @@ module Effective
     end
 
     def unarchive!
+      assign_attributes(cancelled_at: nil)
+
       super()
       orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
       true
     end
 
+    def cancelled?
+      cancelled_at.present?
+    end
+
+    # If this changes a lot, consider effective_events_event_registration.cancel!
+    def cancel!
+      assign_attributes(cancelled_at: Time.zone.now)
+      archive!
+
+      after_commit { event_registration&.send_event_registrants_cancelled_email! }
+
+      true
+    end
+
+    # If this changes a lot, consider effective_events_event_registration.uncancel!
+    def uncancel!
+      assign_attributes(cancelled_at: nil)
+      unarchive!
+    end
+
+    def cancel_all!
+      raise("expected an event registration") if event_registration.blank?
+      event_registration.cancel!
+    end
+
+    def uncancel_all!
+      raise("expected an event registration") if event_registration.blank?
+      event_registration.uncancel!
+    end
+
     def event_ticket_price
       raise('expected an event') if event.blank?
       raise('expected an event ticket') if event_ticket.blank?

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

@@ -18,8 +18,12 @@
 
     = tab 'Registrants & Addons' do
       %h2 Registrants
+      - email_template = Effective::EmailTemplate.where(template_name: :event_registrants_cancelled).first!
+
       .mb-4
-        %small.text-muted Please refresh the page after archiving/unarchiving here to display an accurate Registered count on the Tickets & Products tab
+        %small.text-muted Please refresh the page after archiving/unarchiving/cancelling to display an accurate Registered count on the Tickets & Products tab.
+        %br
+        %small.text-muted Cancelling a registrant will send an email to the event registration owner notifying them that their tickets have been cancelled.
 
       - datatable = EffectiveResources.best('Admin::EffectiveEventRegistrantsDatatable').new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)

data/config/routes.rb

@@ -47,6 +47,11 @@ EffectiveEvents::Engine.routes.draw do
       post :waitlist, on: :member
       post :unwaitlist, on: :member
 
+      post :cancel, on: :member
+      post :uncancel, on: :member
+      post :cancel_all, on: :member
+      post :uncancel_all, on: :member
+
       post :archive, on: :member
       post :unarchive, on: :member
 

data/db/migrate/101_create_effective_events.rb

@@ -106,6 +106,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
 
       t.datetime :selected_at
       t.datetime :registered_at
+      t.datetime :cancelled_at
 
       t.text :response1
       t.text :response2

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-07 00:00:00.000000000 Z
+date: 2025-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,7 +300,6 @@ files:
 - app/views/effective/events/_sidebar.html.haml
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
-- app/views/effective/events_mailer/event_registrant_purchased.liquid
 - app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
 - config/locales/effective_events.en.yml

data/app/views/effective/events_mailer/event_registrant_purchased.liquid

@@ -1,16 +0,0 @@
----
-subject: 'You have been registered for {{ event.title }}'
----
-Hello {{ registrant.name }},
-
-Your ticket {{ ticket.name }} has been purchased.
-
-You are registered for {{ event.name }}
-
-The event starts on {{ event.date }}
-
-{{ event.url }}
-
-Thank you.
-
-Please contact us for assistance.