effective_events 2.35.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752b1ea45717c8cc9c6cef3c312ca7392186497fb0024c55c71ac63a8e0ac402
-  data.tar.gz: e0dd03ae68b811e37b2ca5ee2237342ac4c1058bbf70a1136846fa81370dadaf
+  metadata.gz: 72f182aaf30b6c9d1d6d5813b8d8a9f027b5cb06908495ab7b4cd63515059774
+  data.tar.gz: 68d417df7dd7a5c24523b872a2b7dbcd6b9bcbf676cfd8362fe0e392b443ffe9
 SHA512:
-  metadata.gz: 012ac6517e8998ddf0ede909ac774b7d18fcbede6170f5e4961a8db118252b0cd392cf0a0cb608ff7736c1d25a4bc4cf523fae38b12da271b4deae79734a1a2d
-  data.tar.gz: d0a9ef6bb70fa6ef410cce8fccfd12d1bcf3be40d4d4eea8cc5e0803de03198b565287ad748d8f9195b257a2af056a37ba4d79e85b55b596b7868b1cd365e19b
+  metadata.gz: 16ada620e360116ce6550a46df6118bddd510551c16cab981d0dd6b3c04ef65ed282a5e3043f027a7d59d4d5a690a0b18b96bbff865370818849508dd960e304
+  data.tar.gz: 2cb548fabcd8ccdda8755a74fe1e0ecbabf111546b821f032f138ed0e79a7fe01e82487129b04392bb32905b3d202ae08ee19a32064bf2b0539b5ad5c8723b9f

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -10,35 +10,40 @@ module Admin
 
       col :event
       col :title
-      col :category, visible: false
+      col :category, label: 'Purchasable by', visible: false
       col :waitlist, visible: false
+      col :guest_of_member, visible: false
 
       col :early_bird_price, as: :price, visible: false
-      col :regular_price, as: :price, visible: false
+      col :non_member_price, as: :price, visible: false
       col :member_price, as: :price, visible: false
+      col :guest_of_member_price, as: :price, visible: false
 
-      col :prices do |ticket|
-        prices = ""
+      col :prices, label: 'Price' do |ticket|
+        prices = []
 
         if event&.early_bird_end_at.present?
-          prices += "#{price_to_currency(ticket.early_bird_price || 0)} early<br />"
+          prices << "#{price_to_currency(ticket.early_bird_price || 0)} early"
         end
 
-        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
-          "
+        if [ticket.member_price, ticket.non_member_price, ticket.guest_of_member_price].compact.uniq.length == 1
+          prices << "#{price_to_currency(ticket.member_price)}"
         else
-          "Invalid ticket category"
+          if ticket.anyone?
+            prices << "#{price_to_currency(ticket.non_member_price)} non-member"
+            prices << "#{price_to_currency(ticket.member_price)} member"
+          elsif ticket.members?
+            prices << "#{price_to_currency(ticket.member_price)} member"
+          else
+            raise("Invalid ticket category #{ticket.category}")
+          end
+
+          if ticket.guest_of_member?
+            prices << "#{price_to_currency(ticket.guest_of_member_price)} guest"
+          end
         end
 
-        prices
+        prices.join('<br />')
       end
 
       col :capacity_available, visible: false
@@ -57,8 +62,6 @@ module Admin
         end
       end
 
-      col :category, visible: false
-
       col :registered_event_registrants_count, label: 'Registered', visible: false, as: :integer do |event|
         event.event_registrants.registered.count
       end

data/app/datatables/effective_events_datatable.rb

@@ -35,8 +35,9 @@ class EffectiveEventsDatatable < Effective::Datatable
 
     actions_col show: false do |event|
       if event.registerable?
+        label = (event.waitlist_only? ? 'Join Waitlist' : 'Register')
         url = event.external_registration_url.presence || effective_events.new_event_event_registration_path(event)
-        dropdown_link_to('Register', url)
+        dropdown_link_to(label, url)
       end
     end
   end

data/app/helpers/effective_events_helper.rb

@@ -41,21 +41,21 @@ module EffectiveEventsHelper
     end
   end
 
-  def effective_events_ticket_price(event, ticket)
+  def effective_events_ticket_prices(event, ticket)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
     raise('expected an Effective::EventTicket') unless ticket.kind_of?(Effective::EventTicket)
 
-    prices = [
-      (ticket.early_bird_price if event.early_bird?), 
-      (ticket.regular_price if ticket.regular? || ticket.member_or_non_member?),
-      (ticket.member_price if ticket.member_only? || ticket.member_or_non_member?)
-    ].compact.sort.uniq
+    guest_of_member = (ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member)))
 
-    if prices.length > 1
-      "#{(prices.first == 0 ? '$0' : price_to_currency(prices.first))} or #{(prices.last == 0 ? '$0' : price_to_currency(prices.last))}"
-    else
-      (prices.first == 0 ? '$0' : price_to_currency(prices.first))
-    end
+    prices = if event.early_bird? && ticket.early_bird_price.present?
+      [ticket.early_bird_price]
+    elsif ticket.members?
+      [ticket.member_price, (ticket.guest_of_member_price if guest_of_member)].compact
+    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 ')
   end
 
   def effective_events_event_tickets_collection(event, namespace = nil)

data/app/models/effective/event.rb

@@ -210,8 +210,10 @@ module Effective
     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)
+      return false if closed?
+
+      return false if registration_start_at.blank?
+      registration_start_at <= Time.zone.now
     end
 
     def closed?
@@ -228,6 +230,10 @@ module Effective
       event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, except: except, quantity: 1) }
     end
 
+    def waitlist_only?
+      any_waitlist? && event_tickets.none? { |et| et.capacity_available > 0 }
+    end
+
     def upcoming?
       end_at > Time.zone.now
     end
@@ -297,7 +303,7 @@ module Effective
     end
 
     # Can I register/purchase this many new event tickets?
-    def event_ticket_available?(event_ticket, except: nil, quantity: 0)
+    def event_ticket_available?(event_ticket, except: nil, quantity: 1)
       raise('expected an EventTicket') unless event_ticket.kind_of?(Effective::EventTicket)
       raise('expected except to be an EventRegistration') if except && !except.class.try(:effective_events_event_registration?)
       raise('expected quantity to be greater than 0') unless quantity.to_i > 0
@@ -311,7 +317,7 @@ module Effective
     end
 
     # Can I register/purchase this many new event products?
-    def event_product_available?(event_product, quantity:)
+    def event_product_available?(event_product, quantity: 1)
       raise('expected an EventProduct') unless event_product.kind_of?(Effective::EventProduct)
       raise('expected quantity to be greater than 0') unless quantity.to_i > 0
 

data/app/models/effective/event_registrant.rb

@@ -119,7 +119,15 @@ module Effective
       errors.add(:waitlisted, 'is not permitted for a non-waitlist event ticket') if waitlisted? && !event_ticket.waitlist?
     end
 
-    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validate(if: -> { event_ticket&.members? }, unless: -> { purchased? }) do
+      errors.add(:base, "must be a member") unless owner.try(:membership_present?)
+    end
+
+    validate(if: -> { event_ticket&.members? && registrant_validations_enabled? }, unless: -> { purchased? }) do
+      errors.add(:user_id, "registrant must be a member") unless event_ticket.guest_of_member? || member?
+    end
+
+    validates :price, numericality: { greater_than_or_equal_to: 0 }
     validates :email, email: true
 
     # First name, last name and email are always required fields on details
@@ -132,15 +140,6 @@ module Effective
     validates :company, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required }
     validates :organization, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required && EffectiveEvents.organization_enabled? }
 
-    # Member ticket: company name is locked in. you can only add to your own company
-    validate(if: -> { registrant_validations_enabled? && event_ticket&.member_only? }) do
-      if building_user_and_organization && owner.present? && Array(owner.try(:organizations)).exclude?(organization)
-        errors.add(:organization_id, "must be your own for member-only tickets") 
-      end
-
-      errors.add(:user_id, 'must be a member to register for member-only tickets') unless member_present?
-    end
-
     # Copy any user errors from build_user_and_organization() into the registrant
     after_validation(if: -> { user && user.new_record? && user.errors.present? }) do
       errors.add(:first_name, user.errors[:first_name].join(', ')) if user.errors[:first_name].present?
@@ -214,7 +213,8 @@ module Effective
 
     def details
       [
-        (content_tag(:span, 'Member', class: 'badge badge-warning') if member_ticket?),
+        (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?)
       ].compact.join(' ').html_safe
@@ -232,26 +232,49 @@ module Effective
       (first_name.present? && last_name.present?) ? "#{last_name}, #{first_name}" : "GUEST"
     end
 
-    # We create registrants on the tickets step. But don't enforce validations until the details step.
-    def registrant_validations_enabled?
-      return false if blank_registrant? # They want to come back later
-
-      return true if event_registration.blank? # If we're creating in an Admin area
-      return false if event_ticket.blank? # Invalid anyway
+    # Anyone or Members tickets
+    def early_bird?
+      return false if event.blank?
+      return false if event_ticket.blank?
+      return false if event_ticket.early_bird_price.blank?
 
-      event_registration.current_step == :details
+      event.early_bird?
     end
 
-    def member_present?
+    # Anyone or Members tickets
+    def member?
+      return false if event.blank?
+      return false if event_ticket.blank?
+
       user.try(:membership_present?) || organization.try(:membership_present?)
     end
 
-    def member_ticket?
+    # Anyone or Members tickets
+    def guest_of_member?
+      return false if event.blank?
+      return false if event_ticket.blank?
+      return false unless event_ticket.guest_of_member?
+
+      !member? && owner.try(:membership_present?)
+    end
+
+    # Anyone tickets only
+    def non_member?
+      return false if event.blank?
       return false if event_ticket.blank?
-      return true if event_ticket.member_only?
-      return true if event_ticket.member_or_non_member? && member_present?
+      return false unless event_ticket.anyone?
+
+      !member? && !guest_of_member?
+    end
 
-      false
+    # We create registrants on the tickets step. But don't enforce validations until the details step.
+    def registrant_validations_enabled?
+      return false if blank_registrant? # They want to come back later
+
+      return true if event_registration.blank? # If we're creating in an Admin area
+      return false if event_ticket.blank? # Invalid anyway
+
+      event_registration.current_step == :details
     end
 
     def present_registrant?
@@ -417,16 +440,18 @@ module Effective
       raise('expected an event') if event.blank?
       raise('expected an event ticket') if event_ticket.blank?
 
-      if event.early_bird?
-        event_ticket.early_bird_price # Early Bird Pricing
-      elsif event_ticket.regular?
-        event_ticket.regular_price
-      elsif event_ticket.member_only?
+      if early_bird?
+        event_ticket.early_bird_price
+      elsif blank_registrant?
+        event_ticket.maximum_price
+      elsif member?
         event_ticket.member_price
-      elsif event_ticket.member_or_non_member?
-        (member_present? ? event_ticket.member_price : event_ticket.regular_price)
+      elsif guest_of_member?
+        event_ticket.guest_of_member_price
+      elsif non_member?
+        event_ticket.non_member_price
       else
-        raise("Unexpected event ticket price calculation")
+        event_ticket.maximum_price
       end
     end
 

data/app/models/effective/event_ticket.rb

@@ -18,7 +18,7 @@ module Effective
 
     has_rich_text :body
 
-    CATEGORIES = ['Regular', 'Member Only', 'Member or Non-Member']
+    CATEGORIES = ['Anyone', 'Members'] # Purchasable by
 
     effective_resource do
       title                       :string
@@ -27,7 +27,8 @@ module Effective
       display_capacity            :boolean
       waitlist                    :boolean 
 
-      category                    :string
+      category                    :string  # Purchasable by
+      guest_of_member             :boolean # Allow members to purchase a guest ticket
 
       # Questions
       question1                   :text
@@ -36,8 +37,10 @@ module Effective
 
       # Pricing
       early_bird_price            :integer
+
+      non_member_price            :integer      # Used to be regular_price
       member_price                :integer
-      regular_price               :integer
+      guest_of_member_price       :integer
 
       qb_item_name                :string
       tax_exempt                  :boolean
@@ -57,16 +60,18 @@ module Effective
     end
 
     validates :title, presence: true, uniqueness: { scope: [:event_id] }
-    validates :category, presence: true
-
-    validates :regular_price, presence: true, if: -> { member_or_non_member? || regular? }
-    validates :regular_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :category, presence: true, inclusion: { in: CATEGORIES }
 
-    validates :member_price, presence: true, if: -> { member_or_non_member? || member_only? }
+    # Price validations
+    validates :early_bird_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :non_member_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
     validates :member_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :guest_of_member_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
 
-    validates :early_bird_price, presence: true, if: -> { event&.early_bird_end_at.present? }
-    validates :early_bird_price, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :early_bird_price, presence: true, if: -> { early_bird? }
+    validates :non_member_price, presence: true, if: -> { anyone? }
+    validates :member_price, presence: true, if: -> { anyone? || members? }
+    validates :guest_of_member_price, presence: true, if: -> { guest_of_member? }
 
     validates :capacity, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
     validates :capacity, presence: { message: 'must be present when using the waitlist'}, if: -> { waitlist? }
@@ -133,16 +138,23 @@ module Effective
       [question1.presence, question2.presence, question3.presence].compact
     end
 
-    def regular?
-      category == 'Regular'
+    def early_bird?
+      event&.early_bird_end_at.present?
     end
 
-    def member_only?
-      category == 'Member Only'
+    def maximum_price
+      [non_member_price, member_price, (guest_of_member_price if guest_of_member?)].compact.max
     end
 
-    def member_or_non_member?
-      category == 'Member or Non-Member'
+    # “Anyone” can buy tickets have: Member, Non-member, and Guest of Member pricing. Member and Non-member are always required.
+    def anyone?
+      category == 'Anyone'
     end
+
+    # “Members” can buy tickets have: Member and Guest of Member pricing. Member pricing is always required.
+    def members?
+      category == 'Members'
+    end
+
   end
 end

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

@@ -6,56 +6,43 @@
 
     .row
       .col
-        = f.select :category, Effective::EventTicket::CATEGORIES, hint: "Determines who can purchase this ticket at which price. Also determines if the dropdown of related members is displayed to the purchaser."
+        = f.select :category, Effective::EventTicket::CATEGORIES, label: 'Purchasable by', hint: "Determines who can purchase this ticket."
 
-        = f.show_if(:category, 'Regular') do
-          .alert.alert-info.mb-4
-            %strong Regular Ticket:
-            Anyone will be able to purchase this ticket. Only the regular price applies.
+        = f.price_field :early_bird_price, 
+          hint: 'The price charged when registering before the early bird date. This price will be charged instead of any of the prices below. Leave blank for no early bird price.',
+          disabled: !f.object.event&.early_bird_end_at.present?
+
+        = f.show_if(:category, 'Anyone') do
+          = f.price_field :non_member_price, label: 'Non-member price', hint: 'The price charged when registering a non-member.'
+          = f.price_field :member_price, hint: 'The price charged when registering a member.'
+
+        = f.show_if(:category, 'Members') do
+          = f.price_field :member_price, hint: 'The price charged when registering a member.'
 
-        = f.show_if(:category, 'Member Only') do
-          .alert.alert-info.mb-4
-            %strong Member Only Ticket:
-            Only members will be able to purchase this ticket. They must select a member from the dropdown list of all members. Only the member price applies.
+        = f.check_box :guest_of_member, label: 'Allow members to purchase a guest ticket'
 
-        = f.show_if(:category, 'Member or Non-Member') do
-          .alert.alert-info.mb-4
-            %strong Member or Non-Member Ticket:
-            Anyone will be able to purchase this ticket. They can select a member from the dropdown list of all members to receive the member pricing or they can enter a first name and last name to receive the regular pricing.
+        = f.show_if(:guest_of_member, true) do
+          = f.price_field :guest_of_member_price, hint: 'The price charged to members when registering a non-member guest.'
+
+        - if EffectiveOrders.use_item_names?
+          = qb_item_name_field(f)
+
+        = f.check_box :tax_exempt, label: "This #{etd(f.object)} is tax exempt"
 
       .col
         = f.number_field :capacity, hint: "The number of registrations will be limited to capacity. Leave blank for unlimited capacity."
-        = f.check_box :display_capacity, label: "Yes, display the remaining ticket capacity to users during registration", hint: "Leave blank to hide the capacity."
+        = f.check_box :display_capacity, label: "Display the remaining ticket capacity to users during registration", hint: "Leave blank to hide the capacity."
 
         - if EffectiveEvents.delayed?
           - event_delayed = f.object.event&.delayed?
           - f.object.waitlist = false if !event_delayed
 
           = f.check_box :waitlist, 
-            label: "Yes, add to waitlist once capacity is reached",
-            hint: "requires a event with delayed payment. Once capacity is reached, new registrations will be added to the waitlist. Payment information is collected but not charged for waitlisted registrants. To waitlist everyone and promote later, set the capacity to zero.",
+            label: "Add to waitlist once capacity is reached",
+            hint: "Once capacity is reached, new registrations will be added to the waitlist. Payment information is collected but not charged for waitlisted registrants. To waitlist everyone and promote later, set the capacity to zero. Requires an event with delayed payment.",
             disabled: !event_delayed
-    .row
-      .col-md-6
-        = f.price_field :early_bird_price, 
-          hint: 'requires an event with early bird date. A price of $0 will allow a checkout for free. Leave blank for no early bird price.',
-          disabled: !f.object.event&.early_bird_end_at.present?
-
-        = f.show_if_any(:category, ['Regular', 'Member or Non-Member']) do
-          = f.price_field :regular_price, hint: 'A price of $0 will allow a checkout for free.'
-
-        = f.show_if_any(:category, ['Member Only']) do
-          = f.static_field :regular_price, value: 'None'
-
-        = f.show_if_any(:category, ['Member Only', 'Member or Non-Member']) do
-          = f.price_field :member_price, hint: 'A price of $0 will allow a checkout for free when selecting a member.'
-
-    - if EffectiveOrders.use_item_names?
-      .row
-        .col-md-6= qb_item_name_field(f)
 
-    = f.check_box :tax_exempt, label: "Yes, this #{etd(f.object)} is tax exempt"
-    = f.check_box :archived, label: 'Archive this ticket. While archived, it cannot be purchased by users but registrants can only be added by an admin.'
+        = f.check_box :archived, label: 'Archive this ticket', hint: "While archived, it cannot be purchased by users but registrants can still be added by an admin."
 
   = card('Questions') do
     %p

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

@@ -1,5 +1,5 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
-  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this event', hint: 'Sign up is required to register for any event'
+  = f.check_box :authenticate_user, label: 'The user must be be signed in to view this event', hint: 'Sign up is required to register for any event'
 
   - if EffectiveEvents.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object)

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

@@ -28,9 +28,9 @@
       = f.datetime_field :early_bird_end_at, label: "Early bird end",
         hint: 'Event tickets are purchased at early bird pricing before this date. After this date, regular pricing applies.'
 
-      = f.check_box :allow_blank_registrants, label: "Yes, allow blank ticket registrations", hint: "Allow event tickets to be purchased without adding a name. The purchaser may return to add names later."
+      = f.check_box :allow_blank_registrants, label: "Allow blank ticket registrations", hint: "Allow event tickets to be purchased without adding a name. The purchaser may return to add names later."
 
-      = f.check_box :external_registration, label: "Yes, the registration for this event is handled by another website"
+      = f.check_box :external_registration, label: "The registration for this event is handled by another website"
 
       = f.show_if(:external_registration, true) do
         = f.url_field :external_registration_url, hint: "The url for external event registration. Must start with http(s)://"
@@ -40,13 +40,13 @@
         %h2 Delayed Payments
         %p The online payment for this event will be charged as follows:
 
-        = f.check_box :delayed_payment, label: "Yes, this is a delayed payment event", hint: "Allow registrations for this event without paying immediately.<br>A secure token representing their credit card will be saved and charged automatically on the following payment date."
+        = f.check_box :delayed_payment, label: "This is a delayed payment event", hint: "Allow registrations for this event without paying immediately.<br>A secure token representing their credit card will be saved and charged automatically on the following payment date."
 
         = f.hide_if(:delayed_payment, true) do
           = f.hidden_field :delayed_payment_date, value: ''
 
         = f.show_if(:delayed_payment, true) do
-          = f.date_field :delayed_payment_date, label: "Delayed Payment Charge Date", hint: "The date that the credit card will be charged. Expects a date in the future, after the registration end date.<br>Changing this will update the charge date for all existing delayed payment orders."
+          = f.date_field :delayed_payment_date, label: "Delayed payment charge date", hint: "The date that the credit card will be charged. Expects a date in the future, after the registration end date.<br>Changing this will update the charge date for all existing delayed payment orders."
 
   = f.submit do
     = f.save 'Save'

data/app/views/effective/event_registrants/_fields.html.haml

@@ -27,18 +27,17 @@
 
         - organizations = EffectiveMemberships.Organization.sorted.all
 
-        - if event_ticket&.member_only?
+        - if event_ticket && event_ticket.members? && !event_ticket.guest_of_member?
           - organization_id = (f.object.event_registration&.owner || current_user).try(:organizations).try(:first).try(:id)
 
-          = f.select :organization_id, organizations, label: organization_label, placeholder: 'Search by name', input_html: { disabled: disabled },
-            input_js: { minimumInputLength: 1 },
-            hint: "You can only add new members to your own #{organization_label.downcase}",
+          - # Must select any existing member organization
+          = f.select :organization_id, organizations.members, label: organization_label, placeholder: 'Search by name', input_html: { disabled: disabled },
             value: (organization_id if organization_id && f.object.organization_id.blank?)
         - else
           - # This creates a select field organization_id and a text field company
           = f.select_or_text :organization_id, :company, organizations, name: organization_label.downcase, input_html: { disabled: disabled },
             text: { label: "#{organization_label} name", placeholder: "New #{organization_label.downcase} name" },
-            select: { label: organization_label, placeholder: 'Search by name', input_js: { minimumInputLength: 1 } }
+            select: { label: organization_label, placeholder: 'Search by name' }
 
   - if event_ticket.present?
     - if event_ticket.question1.present?

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

@@ -8,13 +8,12 @@
     %p
       = event_ticket
       = ' - '
+      = effective_events_ticket_prices(event, event_ticket)
 
-      - if event_ticket.member_or_non_member? && event_registrant.first_name.blank? && !event.early_bird?
-        = effective_events_ticket_price(event, event_ticket)
-      - else
-        = price_to_currency(event_registrant.price)
-
-      = event_registrant.details
+      -# - if event_ticket.member_or_non_member? && event_registrant.first_name.blank? && !event.early_bird?
+      -#   = effective_events_ticket_price(event, event_ticket)
+      -# - else
+      -#   = price_to_currency(event_registrant.price)
 
     = form.fields_for :event_registrants, event_registrant do |fr|
       - if event.allow_blank_registrants? && (fr.object.user.blank? || fr.object.blank_registrant?)

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

@@ -3,8 +3,8 @@
 - tickets = event.event_tickets.reject(&:archived?)
 - waitlist = tickets.any? { |ticket| ticket.waitlist? }
 
-- all_member_only_tickets = tickets.all? { |ticket| ticket.member_only? }
-- any_member_only_tickets = tickets.any? { |ticket| ticket.member_only? }
+- all_members_tickets = tickets.all? { |ticket| ticket.members? }
+- any_members_tickets = tickets.any? { |ticket| ticket.members? }
 - is_member = current_user.try(:membership_present?)
 
 - if event.early_bird?
@@ -32,33 +32,40 @@
                 before waitlist
         %td
           %ul.list-unstyled.mb-0
-            - # Early Bird
-            - if event.early_bird? && ticket.early_bird_price.to_i > 0 && [ticket.member_price, ticket.regular_price].exclude?(ticket.early_bird_price)
+
+            - if event.early_bird? && ticket.early_bird_price.present?
+              %li
+                = price_to_currency(ticket.early_bird_price)
+                .badge.badge-warning Early Bird
+            - elsif ticket.members?
               %li
-                - if ticket.regular_price.to_i > 0 && (ticket.member_or_non_member? || ticket.regular?)
-                  %div
-                    %s.text-muted
-                      = price_to_currency(ticket.regular_price)
-
-                - if ticket.member_price.to_i > 0 && (ticket.member_or_non_member? || ticket.member_only?)
-                  %div
-                    %s.text-muted
-                      = price_to_currency(ticket.member_price)
-                    .badge.badge-secondary.mr-2 Members
-
-                %div
-                  = price_to_currency(ticket.early_bird_price)
-                  .badge.badge-warning Early Bird
-            - else
-              - if ticket.regular_price.to_i > 0 && (ticket.member_or_non_member? || ticket.regular?)
+                = price_to_currency(ticket.member_price)
+                .badge.badge-secondary Member
+
+              - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
                 %li
-                  = price_to_currency(ticket.regular_price)
+                  = price_to_currency(ticket.guest_of_member_price)
+                  .badge.badge-secondary Guest of Member
+
+            - elsif ticket.anyone?
+              - all_same_price = [ticket.member_price, (ticket.guest_of_member_price if ticket.guest_of_member?), ticket.non_member_price].compact.uniq.length == 1
 
-              - if ticket.member_price.to_i > 0 && (ticket.member_or_non_member? || ticket.member_only?)
+              - if all_same_price
                 %li
                   = price_to_currency(ticket.member_price)
-                  .badge.badge-secondary Members
+              - else
+                %li
+                  = price_to_currency(ticket.member_price)
+                  .badge.badge-secondary Member
 
+                - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
+                  %li
+                    = price_to_currency(ticket.guest_of_member_price)
+                    .badge.badge-secondary Guest of Member
+
+                %li
+                  = price_to_currency(ticket.non_member_price)
+                  .badge.badge-secondary Non-Member
         %td
           - event_ticket_selection = form.object.event_ticket_selection(event_ticket: ticket)
 
@@ -67,7 +74,7 @@
             = f.hidden_field :quantity, value: 0
 
             - capacity = event.capacity_selectable(event_ticket: ticket, event_registration: form.object)
-            - disabled = (ticket.member_only? && !is_member)
+            - disabled = (ticket.members? && !is_member)
 
             - if form.object.selected_expired? && !f.object.errors.present?
               - f.object.assign_attributes(quantity: 0)
@@ -79,7 +86,7 @@
   %p If the ticket capacity has been reached you will be added to the waitlist.
 
 - unless is_member
-  - if all_member_only_tickets
+  - if all_members_tickets
     .alert.alert-info.mb-4 You must be a member to purchase tickets.
-  - elsif any_member_only_tickets
+  - elsif any_members_tickets
     .alert.alert-info.mb-4 You must be a member to purchase some of these tickets.

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

@@ -16,8 +16,9 @@
 
         - if @event.registerable? || (impersonating? && @event.registerable_when_impersonating?)
           .register.mb-4
+            - label = (@event.waitlist_only? ? 'Join Waitlist' : 'Register')
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
+            = link_to label, url, class: 'btn btn-lg btn-primary'
 
         - if @event.file.attached?
           = image_tag url_for(@event.file), class: "effective-events-image d-none d-lg-block float-right", alt: @event.title, width: "350", height: "220"
@@ -67,7 +68,8 @@
 
         - if @event.registerable?
           .register.mb-4
+            - label = (@event.waitlist_only? ? 'Join Waitlist' : 'Register')
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
+            = link_to label, url, class: 'btn btn-lg btn-primary'
 
         = link_to("← #{events_name_label}".html_safe, effective_events.events_path, class: "btn btn-secondary my-4")

data/db/migrate/101_create_effective_events.rb

@@ -45,10 +45,13 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :display_capacity, default: false
 
       t.boolean :waitlist, default: false
+
       t.string :category
+      t.boolean :guest_of_member, default: false
 
-      t.integer :regular_price
+      t.integer :non_member_price
       t.integer :member_price
+      t.integer :guest_of_member_price
       t.integer :early_bird_price
 
       t.text :question1
@@ -113,7 +116,6 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    add_index :event_registrants, [:user_type, :user_id, :owner_type, :owner_id], if_not_exists: true
     add_index :event_registrants, :event_registration_id, if_not_exists: true
     add_index :event_registrants, :event_ticket_id, if_not_exists: true
     add_index :event_registrants, :archived, if_not_exists: true

data/db/seeds.rb

@@ -25,7 +25,7 @@ event = Effective::Event.create!(
 event.event_tickets.create!(
   title: 'Ticket A 10 Seats',
   capacity: 10,
-  regular_price: 100_00,
+  non_member_price: 100_00,
   early_bird_price: 50_00,
   member_price: 75_00,
   qb_item_name: 'Tickets'
@@ -34,7 +34,7 @@ event.event_tickets.create!(
 event.event_tickets.create!(
   title: 'Ticket B 20 Seats',
   capacity: 20,
-  regular_price: 200_00,
+  non_member_price: 200_00,
   early_bird_price: 150_00,
   member_price: 75_00,
   qb_item_name: 'Tickets'
@@ -43,7 +43,7 @@ event.event_tickets.create!(
 event.event_tickets.create!(
   title: 'Ticket C Unlimited Seats',
   capacity: nil,
-  regular_price: 200_00,
+  non_member_price: 200_00,
   early_bird_price: 150_00,
   member_price: 75_00,
   qb_item_name: 'Tickets'

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.35.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

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