effective_events 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727e4c9d82e44668cf175eeb78d9cbf252dce6499e38895244e6bfdd12126c6b
-  data.tar.gz: f734b03843f83f65231c9684a3c1309309ece9eeb0361b70af1632f4e105b9cc
+  metadata.gz: faa489daa2716307315f02ab83e8478874e8dbed3c415f1a7a3430188ab08475
+  data.tar.gz: b78169fe2686d716b00648c98c13d359254eaa1a3a1542744d50183baa0ee68a
 SHA512:
-  metadata.gz: 708327d6eca0f1332eae5e430e7f173cf97cf8022ce7c58103f3e08023fe7362262da33eef97ba317bee4be25b47d5843e411456350f36aca0913d925dace81d
-  data.tar.gz: 8916c88b24d4630ffdae2edfaa73ae444d342516f93694aa0fdcd9837498588409bd59bb222e43e433af74bfb6f5ca747905aed2b152a8c9797334358b8f39e6
+  metadata.gz: f80c9604ab423c23487a6f29de1fce40cacd1c0c95abbfe8a447fbd346441daec47f4ea49a885aaba5540bd157d56ff15d81c4a71209bf6c88bab373bb69a88f
+  data.tar.gz: b9835eb78443258a30d878bdf338147111cd70e6f692c83c0c4adb76c2a58ec72f02eba04d10ac34f248d6bee4ad6805717e3342bb0e9ff5926bd3ad2496c01e

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -21,11 +21,11 @@ module Admin
 
       col :event
 
-      col :owner, visible: false
+      col :owner
       col :event_registration, visible: false
 
       if defined?(EffectiveMemberships) && EffectiveMemberships.Organization.respond_to?(:sponsors)
-        col :sponsorship, search: EffectiveMemberships.Organization::SPONSORSHIPS do |er|
+        col :sponsorship, search: EffectiveMemberships.Organization::SPONSORSHIPS, visible: false do |er|
           er.user.try(:sponsorship)
         end
       end
@@ -59,9 +59,9 @@ module Admin
         elsif er.first_name.present?
           "#{er.first_name} #{er.last_name}"
         elsif er.owner.present?
-          er.owner.to_s + ' - GUEST'
+          'Pending Name'
         else
-          'Unknown'
+          'Pending Name'
         end
       end
       

data/app/datatables/admin/effective_events_datatable.rb

@@ -27,8 +27,15 @@ module Admin
 
       col :draft?, as: :boolean, visible: false
       col :published?, as: :boolean
-      col :published_start_at, label: "Published start", as: :datetime
-      col :published_end_at, label: "Published end", as: :datetime
+      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 :excerpt, visible: false
 

data/app/helpers/effective_events_helper.rb

@@ -48,14 +48,26 @@ module EffectiveEventsHelper
     guest_of_member = (ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member)))
 
     prices = if event.early_bird? && ticket.early_bird_price.present?
-      [ticket.early_bird_price]
+      { 
+        ticket.early_bird_price => badge('Early Bird', 'badge-warning')
+      }
     elsif ticket.members?
-      [ticket.member_price, (ticket.guest_of_member_price if guest_of_member)]
+      { 
+        ticket.member_price => badge('Member'),
+        (ticket.guest_of_member_price if guest_of_member) => badge('Guest of Member')
+      }
     elsif ticket.anyone?
-      [ticket.member_price, (guest_of_member ? ticket.guest_of_member_price : ticket.non_member_price)]
-    end.compact.uniq.sort
-
-    prices.map { |price| price == 0 ? '$0' : price_to_currency(price) }.to_sentence(last_word_connector: ' or ', two_words_connector: ' or ')
+      { 
+        ticket.member_price => badge('Member'), 
+        (ticket.guest_of_member_price if guest_of_member) => badge('Guest of Member'),
+        (ticket.non_member_price unless guest_of_member) => badge('Non-member'),
+      }
+    end.delete_if { |price| price.blank? }.sort_by { |price| price }
+
+    prices
+      .map { |price, badge| [(price == 0 ? '$0' : price_to_currency(price)), badge].join(' ') }
+      .to_sentence(last_word_connector: ' or ', two_words_connector: ' or ')
+      .html_safe
   end
 
   def effective_events_event_tickets_collection(event, namespace = nil)

data/app/models/effective/event.rb

@@ -89,7 +89,7 @@ module Effective
     scope :for_sitemap, -> { published }
 
     scope :deep, -> { 
-      base = includes(:event_registrants, :event_tickets, :rich_texts) 
+      base = includes(:event_registrants, :rich_texts, event_tickets: :event_registrants)
       base = base.includes(:pg_search_document) if defined?(PgSearch)
       base
     }
@@ -283,6 +283,22 @@ module Effective
       start_at
     end
 
+    def event_tickets_with_capacity
+      event_tickets.reject(&:archived?).select { |et| et.capacity.present? }
+    end
+
+    def total_capacity_available
+      event_tickets_with_capacity.sum { |et| et.capacity_available }
+    end
+
+    def total_capacity_taken
+      event_tickets_with_capacity.sum { |et| et.capacity_taken }
+    end
+
+    def total_capacity
+      event_tickets_with_capacity.sum { |et| et.capacity }
+    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

@@ -190,9 +190,9 @@ module Effective
       if first_name.present?
         "#{first_name} #{last_name}"
       elsif owner.present?
-        owner.to_s + ' - GUEST'
+        'Pending Name'
       else
-        'GUEST'
+        'Pending Name'
       end
     end
 
@@ -205,9 +205,9 @@ module Effective
           ("<small>#{email}</small>" if email.present?)
         ].compact.join('<br>').html_safe
       elsif owner.present?
-        owner.to_s + ' - GUEST'
+        'Pending Name'
       else
-        'GUEST'
+        'Pending Name'
       end
     end
 
@@ -229,7 +229,7 @@ module Effective
     end
 
     def last_first_name
-      (first_name.present? && last_name.present?) ? "#{last_name}, #{first_name}" : "GUEST"
+      (first_name.present? && last_name.present?) ? "#{last_name}, #{first_name}" : "Pending Name"
     end
 
     # Anyone or Members tickets

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

@@ -59,12 +59,11 @@
           .effective-event-body.mb-5
             = @event.body.to_s
 
-        - if EffectiveEvents.code_of_conduct_enabled?
-          - page = EffectiveEvents.code_of_conduct_effective_page!
-
-          .effective-event-code-of-conduct.mb-4
-            View the
-            = link_to(page.title, effective_pages.page_path(page), target: '_blank')
+        -# - if EffectiveEvents.code_of_conduct_enabled?
+        -#   - page = EffectiveEvents.code_of_conduct_effective_page!
+        -#  .effective-event-code-of-conduct.mb-4
+        -#    View the
+        -#    = link_to(page.title, effective_pages.page_path(page), target: '_blank')
 
         - if @event.registerable?
           .register.mb-4

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.0.4'.freeze
+  VERSION = '3.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails