effective_events 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7853d626aa69c0a8dff1a68fb7a1ccea55688f3f9fec5856bf4996f4790578b
-  data.tar.gz: 6639d6d179c25b4a636871cd4750ef46fabb8a1eaa55ee49f7a0b35ab338aa9e
+  metadata.gz: 4eb3150ad18bc1c994de1545d102ccbca5141f255be86911677869525f806ad8
+  data.tar.gz: 6bf2a2a8f338c76ab78bbcd58ce098eb4c0497da04a77664c065da834e7ba654
 SHA512:
-  metadata.gz: c1732ef7246040d9abffe7a622d6886913819edbc09db4f67b7399d89e77bdd90c0809f16e986420a415d91b818d928d6bfd48be0416d0bf4e083f064b87e292
-  data.tar.gz: fab79f89a0b04fe70e49a2e21b41084bd95d305ad43413ee366d9e591c7e4c692f99fd95761a0da806cdbe7586951e36e9c517626544ea871b5d687abf21838b
+  metadata.gz: 764efbc68f7b22ac04583815a05ed4e4b4c4168c7a8784884a787b68ed6d6dda1e28b1ec18782055799fc1b75894f81cad0a71e966099daa3e7547c4938739ce
+  data.tar.gz: b97ddb5c7e8957ac126f3328c2117f741d687e6cbcc873853f9ee072bf14c6445ff25b8fdab4b11caef5b0f34c4f56ac2ddcd95e1b4c93a48fe7cf8b31eb4fdd

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)].compact
+      { 
+        ticket.member_price => badge('Member'),
+        (ticket.guest_of_member_price if guest_of_member) => badge('Guest of Member')
+      }
     elsif ticket.anyone?
-      [ticket.member_price, (ticket.guest_of_member_price if guest_of_member), ticket.non_member_price].compact
-    end.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
@@ -442,8 +442,10 @@ module Effective
 
       if early_bird?
         event_ticket.early_bird_price
-      elsif blank_registrant?
-        event_ticket.maximum_price
+      elsif blank_registrant? && owner.try(:membership_present?)
+        event_ticket.blank_registrant_member_price
+      elsif blank_registrant? && !owner.try(:membership_present?)
+        event_ticket.blank_registrant_non_member_price
       elsif member?
         event_ticket.member_price
       elsif guest_of_member?

data/app/models/effective/event_ticket.rb

@@ -142,8 +142,16 @@ module Effective
       event&.early_bird_end_at.present?
     end
 
+    def blank_registrant_member_price
+      [member_price, (guest_of_member? ? guest_of_member_price : non_member_price)].compact.max
+    end
+
+    def blank_registrant_non_member_price
+      [member_price, non_member_price].compact.max
+    end
+
     def maximum_price
-      [non_member_price, member_price, (guest_of_member_price if guest_of_member?)].compact.max
+      [member_price, (guest_of_member_price if guest_of_member?), non_member_price].compact.max
     end
 
     # “Anyone” can buy tickets have: Member, Non-member, and Guest of Member pricing. Member and Non-member are always required.

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.5'.freeze
 end

metadata

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