effective_events 2.30.0 → 2.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00e6d6e6fce1100f98e19f6d9a0e5d1a9ba66ebfadf33de9b65f73127c859fa
-  data.tar.gz: 0abd39dd425fe5aa03a4aca9bc3e23e35319b829eb8136ac274a06531297f098
+  metadata.gz: 32f5674dd0103143460a411264938785c8b8fe264caf401aa3ac7c39c4118be6
+  data.tar.gz: a0298a712e199e4b3e6fcef70aa1f11e9feb3d27d75266cdabb6d418b36e5518
 SHA512:
-  metadata.gz: 53bb80da8ecd9e1cedea4f489c9e3cd48a8d76ec839655480e7ed7e238a7e5daf1586830e68c3e79c5744d50d3e81a095a9c3296c5105545fd57965cd36e92d9
-  data.tar.gz: ab519af6f7760009617670f236a8983189112931d9ab3eb50b292fe419f52921e6b1009c5f6fecc8610376c28989d2b7c9ff3c457527ca50f99ee5d3447955ea
+  metadata.gz: 7631eec53e65b21d0546a009fe233989eefe5e448f34fe50c83562993ea2e01ea405c5b0f6f9dee9de5e4c5e3ca41c6e30aad6e640d5fab904fecc454bf7cdc8
+  data.tar.gz: b972ba664a0d9312a5fd66d04bd4442b521badb1ce34aabff9f8933e5c2b1e51b8235c37cc2d8999c4e8778769ca47cc58fcb1610e8db14675569e2bfac5e974

data/app/controllers/effective/event_registrations_controller.rb

@@ -21,6 +21,7 @@ module Effective
       return if resource.event.blank?
       return if resource.submit_order&.deferred?
       return if resource.event.registerable? && !resource.event.sold_out?(except: resource)
+      return if resource.event.registerable_when_impersonating? && view_context.try(:impersonating?)
       return if resource.just_let_them_edit_tickets_and_register_anyway?
 
       flash[:danger] = "Your selected event is not available for registration. This event registration not available."
@@ -33,6 +34,7 @@ module Effective
       return if resource.event.blank?
       return if resource.selection_not_expired?
       return if resource.orders.any? { |order| order.declined? && order.delayed? }
+      return if resource.event.registerable_when_impersonating? && view_context.try(:impersonating?)
       return if resource.just_let_them_edit_tickets_and_register_anyway?
 
       resource.ticket_selection_expired!

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -86,7 +86,11 @@ module Admin
       col :response2
       col :response3
 
-      actions_col
+      actions_col do |registrant|
+        if EffectiveResources.authorized?(self, :impersonate, registrant.owner)
+          dropdown_link_to("Impersonate", "/admin/users/#{registrant.owner_id}/impersonate", data: { confirm: "Really impersonate #{registrant.owner}?", method: :post, remote: true })
+        end
+      end
     end
 
     collection do

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/app/datatables/effective_event_registrations_datatable.rb

@@ -32,7 +32,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
         end
 
         # Register Again
-        if er.event.registerable? && !er.event.sold_out?
+        if (er.event.registerable? && !er.event.sold_out?) || (er.event.registerable_when_impersonating? && impersonating?)
           url = er.event.external_registration_url.presence || effective_events.new_event_event_registration_path(er.event)
           dropdown_link_to('Register Again', url)
         end

data/app/models/effective/event.rb

@@ -197,6 +197,10 @@ module Effective
       (external_registration? && external_registration_url.present?) || event_tickets.present?
     end
 
+    def registerable_when_impersonating?
+      (external_registration? && external_registration_url.present?) || event_tickets.present?
+    end
+
     def registration_available?
       return false if registration_start_at.blank? || registration_end_at.blank?
       (registration_start_at..registration_end_at).cover?(Time.zone.now)

data/app/models/effective/event_registrant.rb

@@ -358,8 +358,11 @@ module Effective
 
     # Manual admin action only
     def send_confirmation_email!
-      order = event_registration&.submit_order
-      order.send_order_emails!
+      send_order_emails!
+    end
+
+    def send_order_emails!
+      event_registration&.submit_order&.send_order_emails!
     end
 
     def event_registration_submit_order

data/app/views/effective/event_registrations/checkout.html.haml

@@ -4,7 +4,7 @@
 
   - if resource.submit_order.deferred?
     = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
-  - elsif resource.just_let_them_edit_tickets_and_register_anyway?
+  - elsif resource.just_let_them_edit_tickets_and_register_anyway? || (resource.event.registerable_when_impersonating? && impersonating?)
     = card do
       = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
   - elsif resource.event.registerable? == false

data/app/views/effective/events/show.html.haml

@@ -14,7 +14,7 @@
         - if @event.closed?
           .alert.alert-warning.mb-3 This event is no longer available.
 
-        - if @event.registerable?
+        - if @event.registerable? || (impersonating? && @event.registerable_when_impersonating?)
           .register.mb-4
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
             = link_to 'Register', url, class: 'btn btn-lg btn-primary'

data/config/routes.rb

@@ -51,6 +51,7 @@ EffectiveEvents::Engine.routes.draw do
       post :unarchive, on: :member
 
       post :send_confirmation_email, on: :member
+      post :send_order_emails, on: :member
     end
 
     resources :event_addons, except: [:show] do

data/lib/effective_events/version.rb

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