effective_events 0.11.3 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12812ed11c2f839cd66a8efd68bd2fe954285ef3ada26fa169082d2c97279359
-  data.tar.gz: ce5e83f092b9373ea720cb03e7524aecae7093a9561a831c68f2088cb7a4a332
+  metadata.gz: 69908c02fe6132b7fdb44a6007367c9545722c35209a8dc49e8929b995a10c55
+  data.tar.gz: 5595e00deceeee4a58ffb8a198ee6b95d4698708d307385822401ba224826238
 SHA512:
-  metadata.gz: 3840af3be1d4ded9d04dccbf66fbee23f196aa251dfcc68d76f6cedd5534f2dfea6e19b8d4da1e3c00e4eae94633e4a2ca09a8ccc1ed4b459e3cbf607b9ebf8a
-  data.tar.gz: d8ab4acd7c5bf18b5a17bc2098bcaca247457ea2705cff91b9da1a2b5f3257f1c392d1d57db6ea1b0436301ec2c2a15811a3004c1953fd5d13d63429bfe29c42
+  metadata.gz: b28faed7b1f567228d0e91f54232e16c9f243c41480f8ec90282ac333d735db98c11de910105a887e92931968d6070a4558b324cbe6cfc89d64fc77bc9a3b798
+  data.tar.gz: e487ba970da311a13f9a70faa8162941e8f00862b1d44de6ef7536fa0849ba15dcef34f4293b631aca82a7d1e1669a07b7adb3c11f48f562bb4e3c54828d8446

data/app/controllers/effective/event_registrations_controller.rb

@@ -16,7 +16,7 @@ module Effective
     # If the event is no longer registerable, do not let them continue
     def redirect_unless_registerable
       return if resource.blank?
-      return if resource.submitted?
+      return if resource.was_submitted?
       return if resource.event.blank?
       return if resource.event.registerable?
       return if resource.submit_order&.deferred?

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -26,12 +26,15 @@ module Admin
 
       col :purchased_order, visible: false
 
+      col :user, label: 'Member'
       col :first_name
       col :last_name
       col :email
-      col :company
-      col :number, label: 'Designations'
-      col :notes, label: 'Restrictions and notes'
+      col :company, visible: false
+
+      col :response1
+      col :response2
+      col :response3
 
       actions_col
     end

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -16,8 +16,11 @@ module Admin
       col :event
 
       col :title
+      col :category, visible: false
+
+      col :early_bird_price, as: :price, visible: event.early_bird_end_at.present?
       col :regular_price, as: :price
-      col :early_bird_price, as: :price
+      col :member_price, as: :price
 
       col :capacity_to_s, label: 'Capacity' do |ticket|
         if ticket.capacity.present?
@@ -25,6 +28,8 @@ module Admin
         end
       end
 
+      col :category, visible: false
+
       col :registered_event_registrants_count, label: 'Registered' do |event|
         event.event_registrants.registered.unarchived.count
       end
@@ -33,8 +38,12 @@ module Admin
         event.event_registrants.purchased.unarchived.count
       end
 
-      col :capacity, visible: false
       col :capacity_available, visible: false
+      col :capacity, label: 'Capacity Total', visible: false
+
+      col :question1, visible: false
+      col :question2, visible: false
+      col :question3, visible: false
 
       actions_col
     end

data/app/datatables/admin/effective_events_datatable.rb

@@ -42,6 +42,8 @@ module Admin
       # col :event_registrants, search: :string
       # col :event_addons, search: :string
 
+      col :allow_blank_registrants
+
       col :roles, visible: false
       col :authenticate_user, visible: false
 

data/app/datatables/effective_event_registrants_datatable.rb

@@ -4,7 +4,13 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
 
     col :name do |er|
-      "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
+      if er.first_name.present?
+        "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
+      elsif er.owner.present?
+        er.owner.to_s + ' - GUEST'
+      else
+        'Unknown'
+      end
     end
 
     col :event_ticket, search: :string, label: 'Ticket' do |er|
@@ -14,13 +20,21 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
       ].compact.join('<br>').html_safe
     end
 
+    col :user, label: 'Member', visible: false
     col :first_name, visible: false
     col :last_name, visible: false
     col :email, visible: false
     col :company, visible: false
-    col :number, visible: false, label: 'Designations'
 
-    col :notes
+    col :response1, visible: false
+    col :response2, visible: false
+    col :response3, visible: false
+
+    col :details do |registrant|
+      [registrant.response1.presence, registrant.response2.presence, registrant.response3.presence].compact.map do |response|
+        content_tag(:div, response)
+      end.join.html_safe
+    end
 
     col :price, as: :price
 

data/app/helpers/effective_events_helper.rb

@@ -7,16 +7,37 @@ module EffectiveEventsHelper
     end
   end
 
+  def effective_events_ticket_price(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
+
+    if prices.length > 1
+      "#{(prices.first == 0 ? '$0' : price_to_currency(prices.first))} to #{(prices.last == 0 ? '$0' : price_to_currency(prices.last))}"
+    else
+      (prices.first == 0 ? '$0' : price_to_currency(prices.first))
+    end
+  end
+
   def effective_events_event_tickets_collection(event, namespace = nil)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
     # Allow an admin to assign archived tickets
     authorized = (namespace == :admin)
+    member = current_user.try(:is_any?, :member)
+
     tickets = (authorized ? event.event_tickets : event.event_tickets.reject(&:archived?))
+    tickets = tickets.reject { |ticket| ticket.member_only? } unless (authorized || member)
 
     tickets.map do |ticket|
       title = ticket.to_s
-      price = (ticket.price == 0 ? '$0' : price_to_currency(ticket.price))
+      price = effective_events_ticket_price(event, ticket)
+
       remaining = (ticket.capacity.present? ? "#{ticket.capacity_available} remaining" : nil)
 
       label = [title, price, remaining].compact.join(' - ')
@@ -44,4 +65,16 @@ module EffectiveEventsHelper
       [label, product.to_param, disabled].compact
     end
   end
+
+  def effective_events_event_tickets_user_hint
+    url = if current_user.class.try(:effective_memberships_organization_user?)
+      organization = current_user.membership_organizations.first || current_user.organizations.first
+      effective_memberships.edit_organization_path(organization, anchor: 'tab-representatives') if organization
+    end
+    
+    return if url.blank?
+
+    "Can't find the person you need? <a href='#{url}' target='blank'>Click here</a> to add them to your organization."
+  end
+
 end

data/app/models/concerns/effective_events_event_registration.rb

@@ -23,7 +23,8 @@ module EffectiveEventsEventRegistration
 
     acts_as_statused(
       :draft,      # Just Started
-      :submitted   # All done
+      :submitted,  # Order has been submitted with a deferred payment processor.
+      :completed   # All done. Order purchased.
     )
 
     acts_as_wizard(
@@ -33,7 +34,8 @@ module EffectiveEventsEventRegistration
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',
-      submitted: 'Submitted'
+      submitted: 'Submitted',
+      complete: 'Completed'
     )
 
     acts_as_purchasable_wizard
@@ -70,6 +72,7 @@ module EffectiveEventsEventRegistration
 
       # Dates
       submitted_at           :datetime
+      completed_at           :datetime
 
       # Acts as Wizard
       wizard_steps           :text, permitted: false
@@ -85,9 +88,9 @@ module EffectiveEventsEventRegistration
     }
 
     scope :sorted, -> { order(:id) }
-
-    scope :in_progress, -> { where.not(status: [:submitted]) }
-    scope :done, -> { where(status: [:submitted]) }
+    
+    scope :in_progress, -> { where(status: [:draft, :submitted]) }
+    scope :done, -> { where(status: :completed) }
 
     scope :for, -> (user) { where(owner: user) }
 
@@ -119,6 +122,16 @@ module EffectiveEventsEventRegistration
       end
     end
 
+    # If we're submitted. Try to move to completed.
+    before_save(if: -> { submitted? }) { try_completed! }
+
+    def can_visit_step?(step)
+      return false if step == :complete && !completed?
+      return true if step == :complete && completed?
+
+      can_revisit_completed_steps(step)
+    end
+
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
       event&.event_products.present? ? wizard_step_keys : (wizard_step_keys - [:addons])
@@ -137,6 +150,14 @@ module EffectiveEventsEventRegistration
       end
     end
 
+    # When the submit_order is deferred or purchased, we call submit!
+    # When the order is a deferred payment processor, we continue to the :submitted step
+    # When the order is a regular processor, the before_save will call complete! and we continue to the :complete step
+    # Purchasing the order later on will automatically call 
+    def submit_wizard_on_deferred_order?
+      true
+    end
+
     def after_submit_purchased!
       notifications = event.event_notifications.select(&:registrant_purchased?)
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
@@ -149,11 +170,29 @@ module EffectiveEventsEventRegistration
   end
 
   def in_progress?
-    draft?
+    draft? || submitted?
   end
 
   def done?
-    submitted?
+    completed?
+  end
+
+  def try_completed!
+    return false unless submitted?
+    return false unless submit_order&.purchased?
+    complete!
+  end
+
+  def complete!
+    raise('event registration must be submitted to complete!') unless submitted?
+    raise('expected a purchased order') unless submit_order&.purchased?
+
+    wizard_steps[:checkout] ||= Time.zone.now
+    wizard_steps[:submitted] ||= Time.zone.now
+    wizard_steps[:complete] = Time.zone.now
+
+    completed!
+    true
   end
 
   # Find or build
@@ -178,7 +217,6 @@ module EffectiveEventsEventRegistration
         last_name: owner.try(:last_name),
         email: owner.try(:email),
         company: owner.try(:company),
-        number: owner.try(:membership).try(:number) || owner.try(:number)
       )
     end
 
@@ -203,7 +241,9 @@ module EffectiveEventsEventRegistration
   def unavailable_event_tickets
     unavailable = []
 
-    present_event_registrants.map(&:event_ticket).group_by { |t| t }.each do |event_ticket, event_tickets|
+    changed_event_registrants = present_event_registrants.select { |er| er.new_record? || er.event_ticket_id_changed? }
+
+    changed_event_registrants.map(&:event_ticket).group_by { |t| t }.each do |event_ticket, event_tickets|
       unavailable << event_ticket unless event.event_ticket_available?(event_ticket, quantity: event_tickets.length)
     end
 
@@ -213,7 +253,9 @@ module EffectiveEventsEventRegistration
   def unavailable_event_products
     unavailable = []
 
-    present_event_addons.map(&:event_product).group_by { |p| p }.each do |event_product, event_products|
+    changed_event_products = present_event_addons.select { |er| er.new_record? || er.event_product_id_changed? }
+
+    changed_event_products.map(&:event_product).group_by { |p| p }.each do |event_product, event_products|
       unavailable << event_product unless event.event_product_available?(event_product, quantity: event_products.length)
     end
 

data/app/models/effective/event.rb

@@ -66,6 +66,8 @@ module Effective
       external_registration       :boolean
       external_registration_url   :string
 
+      allow_blank_registrants     :boolean
+
       # Access
       roles_mask             :integer
       authenticate_user      :boolean
@@ -82,7 +84,7 @@ module Effective
     }
 
     scope :published, -> { where(draft: false).where(arel_table[:published_at].lt(Time.zone.now)) }
-    scope :unpublished, -> { where(draft: true).where(arel_table[:published_at].gteq(Time.zone.now)) }
+    scope :unpublished, -> { where(draft: true).or(where(arel_table[:published_at].gteq(Time.zone.now))) }
 
     scope :upcoming, -> { where(arel_table[:end_at].gt(Time.zone.now)) }
     scope :past, -> { where(arel_table[:end_at].lteq(Time.zone.now)) }
@@ -134,27 +136,27 @@ module Effective
     validates :registration_end_at, presence: true, unless: -> { external_registration? }
 
     validate(if: -> { start_at && end_at }) do
-      self.errors.add(:end_at, 'must be after start date') unless start_at < end_at
+      errors.add(:end_at, 'must be after start date') unless start_at < end_at
     end
 
     validate(if: -> { start_at && registration_start_at }) do
-      self.errors.add(:registration_start_at, 'must be before start date') unless registration_start_at < start_at
+      errors.add(:registration_start_at, 'must be before start date') unless registration_start_at < start_at
     end
 
     validate(if: -> { registration_start_at && registration_end_at }) do
-      self.errors.add(:registration_end_at, 'must be after start registration date') unless registration_start_at < registration_end_at
+      errors.add(:registration_end_at, 'must be after start registration date') unless registration_start_at < registration_end_at
     end
 
     validate(if: -> { start_at && early_bird_end_at }) do
-      self.errors.add(:early_bird_end_at, 'must be before start date') unless early_bird_end_at < start_at
+      errors.add(:early_bird_end_at, 'must be before start date') unless early_bird_end_at < start_at
     end
 
     validate(if: -> { file.attached? }) do
-      self.errors.add(:file, 'must be an image') unless file.image?
+      errors.add(:file, 'must be an image') unless file.image?
     end
 
     validate(if: -> { category.present? }) do
-      self.errors.add(:category, 'is not included in the list') unless EffectiveEvents.categories.include?(category)
+      errors.add(:category, 'is not included in the list') unless EffectiveEvents.categories.include?(category)
     end
 
     def to_s

data/app/models/effective/event_registrant.rb

@@ -20,21 +20,33 @@ module Effective
     # This fee when checked out through the event registration
     belongs_to :event_registration, polymorphic: true, optional: true
 
+    # Required for member-only tickets. The user attending.
+    belongs_to :user, polymorphic: true, optional: true
+
     effective_resource do
-      first_name    :string
-      last_name     :string
-      email         :string
+      first_name            :string
+      last_name             :string
+      email                 :string
+      company               :string
+
+      blank_registrant      :boolean
+      member_registrant     :boolean
 
-      company       :string
-      number        :string
-      notes         :text
+      # Question Responses
+      question1             :text
+      question2             :text
+      question3             :text
 
-      archived      :boolean
+      archived              :boolean
 
       # Acts as Purchasable
-      price             :integer
-      qb_item_name      :string
-      tax_exempt        :boolean
+      price                 :integer
+      qb_item_name          :string
+      tax_exempt            :boolean
+
+      # Historical. Not used anymore. TO BE DELETED.
+      number                :string
+      notes                 :text
 
       timestamps
     end
@@ -43,17 +55,44 @@ module Effective
     scope :deep, -> { includes(:event, :event_ticket) }
     scope :registered, -> { purchased_or_deferred.unarchived }
 
-    validates :first_name, presence: true
-    validates :last_name, presence: true
-    validates :email, presence: true, email: true
-
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
       self.owner ||= event_registration.owner
     end
 
-    before_validation(if: -> { event_ticket.present? }) do
-      assign_attributes(price: event_ticket.price) unless purchased?
+    before_validation(if: -> { blank_registrant? }) do
+      assign_attributes(user: nil, first_name: nil, last_name: nil, email: nil)
+    end
+
+    before_validation(if: -> { user.present? }) do
+      assign_attributes(first_name: user.first_name, last_name: user.last_name, email: user.email)
+    end
+
+    before_validation(if: -> { event_ticket.present? }, unless: -> { purchased? }) do
+      assign_price()
+    end
+
+    validates :user_id, uniqueness: { scope: [:event_id], allow_blank: true, message: 'is already registered for this event' }
+    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :email, email: true
+
+    # Member Only Ticket
+    with_options(if: -> { event_ticket&.member_only? }, unless: -> { blank_registrant? }) do
+      validates :user_id, presence: { message: 'Please select a member' }
+    end
+
+    # Regular Ticket
+    with_options(if: -> { event_ticket&.regular? }, unless: -> { blank_registrant? }) do
+      validates :first_name, presence: true
+      validates :last_name, presence: true
+      validates :email, presence: true
+    end
+
+    with_options(if: -> { event_ticket&.member_or_non_member? && !blank_registrant? }) do
+      validates :user_id, presence: { message: 'Please select a member' }, unless: -> { first_name.present? || last_name.present? || email.present? }
+      validates :first_name, presence: true, unless: -> { user.present? }
+      validates :last_name, presence: true, unless: -> { user.present? }
+      validates :email, presence: true, unless: -> { user.present? }
     end
 
     def to_s
@@ -65,11 +104,15 @@ module Effective
     end
 
     def name
-      "#{first_name} #{last_name}"
+      first_name.present? ? "#{first_name} #{last_name}" : "GUEST"
     end
 
     def last_first_name
-      "#{last_name}, #{first_name}"
+      first_name.present? ? "#{last_name}, #{first_name}" : "GUEST"
+    end
+
+    def member_present?
+      user&.is?(:member) || (blank_registrant? && member_registrant?)
     end
 
     def tax_exempt
@@ -92,5 +135,28 @@ module Effective
       true
     end
 
+    private
+
+    def assign_price
+      raise('is already purchased') if purchased?
+
+      raise('expected an event') if event.blank?
+      raise('expected an event ticket') if event_ticket.blank?
+
+      price = 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?
+        event_ticket.member_price
+      elsif event_ticket.member_or_non_member?
+        (member_present? ? event_ticket.member_price : event_ticket.regular_price)
+      else
+        raise("Unexpected event ticket price calculation")
+      end
+
+      assign_attributes(price: price)
+    end
+
   end
 end

data/app/models/effective/event_ticket.rb

@@ -16,19 +16,29 @@ module Effective
 
     has_rich_text :body
 
+    CATEGORIES = ['Regular', 'Member Only', 'Member or Non-Member']
+
     effective_resource do
-      title                 :string
-      capacity              :integer
+      title                       :string
+      capacity                    :integer
+
+      category                    :string
+
+      # Questions
+      question1                   :text
+      question2                   :text
+      question3                   :text
 
       # Pricing
-      regular_price         :integer
-      early_bird_price      :integer
+      early_bird_price            :integer
+      member_price                :integer
+      regular_price               :integer
 
-      qb_item_name          :string
-      tax_exempt            :boolean
+      qb_item_name                :string
+      tax_exempt                  :boolean
 
-      position              :integer
-      archived              :boolean
+      position                    :integer
+      archived                    :boolean
 
       timestamps
     end
@@ -37,21 +47,26 @@ module Effective
     scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
     before_validation(if: -> { event.present? }) do
+      self.category ||= CATEGORIES.first
       self.position ||= (event.event_tickets.map(&:position).compact.max || -1) + 1
     end
 
     validates :title, presence: true, uniqueness: { scope: [:event_id] }
-    validates :regular_price, presence: true
+    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 :member_price, presence: true, if: -> { member_or_non_member? || member_only? }
+    validates :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 }
 
     def to_s
       title.presence || 'New Event Ticket'
     end
 
-    def price
-      event.early_bird? ? early_bird_price : regular_price
-    end
-
     def capacity_available
       return nil if capacity.blank?
       [(capacity - registered_event_registrants_count), 0].max
@@ -65,5 +80,20 @@ module Effective
       purchased_event_registrants.length
     end
 
+    def questions
+      [question1.presence, question2.presence, question3.presence].compact
+    end
+
+    def regular?
+      category == 'Regular'
+    end
+
+    def member_only?
+      category == 'Member Only'
+    end
+
+    def member_or_non_member?
+      category == 'Member or Non-Member'
+    end
   end
 end

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

@@ -1,16 +1,52 @@
 = effective_form_with(model: [:admin, event_ticket], engine: true) do |f|
   = f.hidden_field :event_id
 
-  = f.text_field :title
-  = f.number_field :capacity, hint: 'The number of registrations will be limited to capacity. Leave blank for unlimited capacity.'
+  = card(et(Effective::EventTicket)) do
+    = f.text_field :title
 
-  = f.price_field :regular_price, hint: 'A price of $0 will allow a checkout for free.'
-  = f.price_field :early_bird_price, hint: 'A price of $0 will allow a checkout for free.'
-  = f.check_box :tax_exempt
+    .row
+      .col= f.select :category, Effective::EventTicket::CATEGORIES, hint: "Determines who can purchase this ticket at which price. Also determines if the dropdown of all members is displayed to the purchaser."
+      .col= f.number_field :capacity, hint: "The number of registrations will be limited to capacity.<br>Leave blank for unlimited capacity."
 
-  - if defined?(EffectiveQbSync)
-    = f.text_field :qb_item_name, label: 'QuickBooks item name'
+    = f.show_if(:category, 'Regular') do
+      .alert.alert-info.mb-4
+        %strong Regular Ticket:
+        Anyone will be able to purchase this ticket. They will be asked for a first name, last name and email. Will not display the dropdown list of all members. Only the regular price applies.
 
-  = f.check_box :archived, label: 'Archive this ticket. It will be unavailable for purchase.'
+    = 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.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, last name and email to receive the regular pricing.
+
+    .row
+      .col-md-6
+        - if f.object.event&.early_bird_end_at.present?
+          = f.price_field :early_bird_price, hint: 'A price of $0 will allow a checkout for free. Leave blank for no early bird price.'
+
+        = 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', '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.'
+
+    .row
+      - if defined?(EffectiveQbSync)
+        .col= f.text_field :qb_item_name, label: 'QuickBooks item name'
+      .col= f.check_box :tax_exempt
+
+    = f.check_box :archived, label: 'Archive this ticket. It will be unavailable for purchase.'
+
+  = card('Questions') do
+    %p Add upto 3 questions
+
+    = f.text_field :question1, label: 'Question 1'
+    = f.text_field :question2, label: 'Question 2'
+    = f.text_field :question3, label: 'Question 3'
 
   = effective_submit(f)

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

@@ -1,30 +1,36 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
   = f.text_field :title, label: "Title"
 
-  - categories = EffectiveEvents.categories
-  - if categories.present?
-    = f.select :category, categories, hint: 'optional category'
-
-  - if event.class.respond_to?(:acts_as_tagged?)
-    = render 'effective/tags/fields', f: f
-
-  = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
-  = f.check_box :draft, hint: 'Save this event as a draft. It will not be accessible on the website.'
-
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = (effective_events.event_url(f.object) rescue nil)
     = f.text_field :slug, hint: "The slug controls this event's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This event is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
 
-  = f.datetime_field :start_at, label: "Event Start"
-  = f.datetime_field :end_at, label: "Event End"
+  .row
+    .col
+      - categories = EffectiveEvents.categories
+      - if categories.present?
+        = f.select :category, categories, hint: 'optional category'
+    .col
+      - if event.class.respond_to?(:acts_as_tagged?)
+        = render 'effective/tags/fields', f: f
 
-  %h2 Registration Opens
+  = f.check_box :draft, hint: 'Save this event as a draft. It will not be accessible on the website.'
+  .row
+    .col-md-6= f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
+
+  .row
+    .col-md-6= f.datetime_field :start_at, label: "Event Start"
+    .col-md-6= f.datetime_field :end_at, label: "Event End"
+
+  %h2 Registration
   %p The online registration and purchase for this event will be available between:
   = f.datetime_field :registration_start_at, label: "Registration Start"
   = f.datetime_field :registration_end_at, label: "Registration End"
   = f.datetime_field :early_bird_end_at, label: "Early Bird End",
     hint: 'Event tickets can be purchased for early bird pricing before this date. Afterwards 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 :external_registration, label: "Yes, the registration for this event is handled by another website"
 
   = f.show_if(:external_registration, true) do

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

@@ -8,13 +8,28 @@
     - if f.object.purchased? && namespace == :admin
       = f.select :event_ticket_id, effective_events_event_tickets_collection(event, namespace), label: 'Change Ticket', hint: 'Admin only. Change the purchased ticket. This will not create charges, alter the original order, or consider ticket capacity.'
 
-    .row
-      .col-lg= f.text_field :first_name
-      .col-lg= f.text_field :last_name
-      .col-lg= f.text_field :number, label: 'Professional Designations', hint: 'member or registrant number'
+    - event.event_tickets.each do |ticket|
+      - next if ticket.member_only? && !current_user&.is?(:member)
 
-    .row
-      .col-lg= f.email_field :email
-      .col-lg= f.text_field :company
+      = f.show_if(:event_ticket_id, ticket.id) do
+        - if event.allow_blank_registrants? && (f.object.new_record? || f.object.blank_registrant?)
+          = f.check_box :blank_registrant, label: "I will return and add this ticket's information later"
+        - else
+          = f.hidden_field :blank_registrant, value: false
+
+        - if ticket.member_or_non_member?
+          = f.show_if(:blank_registrant, true, nested: true) do 
+            = f.check_box :member_registrant, label: 'Yes, this ticket will be for a member'
+
+        = f.show_if(:blank_registrant, false, nested: true) do
+          - if ticket.regular?
+            = render('effective/event_registrants/fields_regular', f: f)
+          - elsif ticket.member_only?
+            = render('effective/event_registrants/fields_member_only', f: f)
+          - elsif ticket.member_or_non_member?
+            = render('effective/event_registrants/fields_member_or_non_member', f: f)
+          - else
+            - raise("Unexpected ticket category: #{ticket.category || 'nil'}")
+
+          = render('effective/event_registrants/fields_questions', f: f, ticket: ticket)
 
-    = f.text_area :notes, label: 'Dietary restrictions or other notes'

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

@@ -0,0 +1,6 @@
+- # Choose member
+- klass = (f.object.user || current_user).class
+- ajax_url = (@select2_users_ajax_path || effective_memberships.member_users_membership_select2_ajax_index_path) unless Rails.env.test?
+
+= f.hidden_field :user_type, value: klass.name
+= f.select :user_id, klass.all, ajax_url: ajax_url, label: 'Member', required: true, hint: effective_events_event_tickets_user_hint()

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

@@ -0,0 +1,20 @@
+- # Choose member
+- klass = (f.object.user || current_user).class
+- ajax_url = (@select2_users_ajax_path || effective_memberships.member_users_membership_select2_ajax_index_path) unless Rails.env.test?
+
+= f.hidden_field :user_type, value: klass.name
+= f.select :user_id, klass.all, ajax_url: ajax_url, label: 'Member', hint: effective_events_event_tickets_user_hint()
+
+= f.show_if(:user_id, '', nested: true) do
+  %p.text-center - or -
+
+  - # Choose non-member
+  .row
+    .col-md= f.text_field :first_name
+    .col-md= f.text_field :last_name
+
+  .row
+    .col-md= f.email_field :email
+    .col-md= f.text_field :company
+
+  %hr

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

@@ -0,0 +1,11 @@
+- if ticket.questions.present?
+  %p Please answer the following questions (optional):
+
+  - if ticket.question1.present?
+    = f.text_field :response1, label: ticket.question1
+
+  - if ticket.question2.present?
+    = f.text_field :response2, label: ticket.question2
+
+  - if ticket.question3.present?
+    = f.text_field :response3, label: ticket.question3

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

@@ -0,0 +1,8 @@
+- # Choose non-member
+.row
+  .col-md= f.text_field :first_name, required: true
+  .col-md= f.text_field :last_name, required: true
+
+.row
+  .col-md= f.email_field :email, required: true
+  .col-md= f.text_field :company

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

@@ -1,4 +1,4 @@
-- if event_registration.submit_order&.purchased?
+- if event_registration.submit_order.present?
   .card.mb-4
     .card-body
       = render(event_registration.submit_order)

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

@@ -4,7 +4,7 @@
   - if resource.submit_order.deferred?
     .card
       .card-body
-        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+        = 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
     .alert.alert-danger Your selected event is no longer available for registration.
   - elsif resource.unavailable_event_tickets.present?
@@ -14,5 +14,5 @@
   - else
     .card
       .card-body
-        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
 

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

@@ -0,0 +1,18 @@
+= render 'layout' do
+  = render 'effective/event_registrations/content', resource: resource
+
+  - raise('expected a completed event_registration') unless resource.completed?
+  - raise('expected a purchased event_registration submit_order') unless resource.submit_order&.purchased?
+
+  .alert.alert-warning.mb-4
+    Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
+
+  .mb-4
+    = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+
+  = render 'effective/event_registrations/summary', event_registration: resource
+  = render 'effective/event_registrations/event_registration', event_registration: resource
+  = render 'effective/event_registrations/orders', event_registration: resource
+
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+

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

@@ -1,11 +1,8 @@
 = render 'layout' do
   = render 'effective/event_registrations/content', resource: resource
 
-  - raise('expected a submitted event_registration') unless resource.was_submitted?
-  - raise('expected a purchased event_registration submit_order') unless resource.submit_order&.was_purchased?
-
-  .alert.alert-warning.mb-4
-    Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
+  - raise('expected a submitted event_registration') unless resource.submitted?
+  - raise('expected a deffered event_registration submit_order') unless resource.submit_order&.deferred?
 
   .mb-4
     = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -40,7 +40,7 @@
               %br
               = @event.registration_end_at.strftime("%b %d, %Y %I:%M%P")
 
-        - if @event.event_tickets.present? #|| @event.event_products.present?
+        - if @event.event_tickets.present?
           %ul.list-unstyled
             - if @event.event_tickets.present?
               %li
@@ -48,15 +48,7 @@
                 %br
                 %ul
                   - @event.event_tickets.each do |ticket|
-                    %li= "#{ticket} (#{price_to_currency(ticket.price)})"
-
-            -# - if @event.event_products.present?
-            -#   %li
-            -#     %label Add-ons
-            -#     %br
-            -#     %ul
-            -#       - @event.event_products.each do |product|
-            -#         %li= "#{product} (#{price_to_currency(product.price)})"
+                    %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
 
         %hr
 

data/db/migrate/101_create_effective_events.rb

@@ -22,6 +22,8 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :external_registration, default: false
       t.string :external_registration_url
 
+      t.boolean :allow_blank_registrants, default: false
+
       t.integer :roles_mask
       t.boolean :authenticate_user, default: false
 
@@ -36,10 +38,16 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
 
       t.string :title
       t.integer :capacity
+      t.string :category
 
       t.integer :regular_price
+      t.integer :member_price
       t.integer :early_bird_price
 
+      t.text :question1
+      t.text :question2
+      t.text :question3
+
       t.string :qb_item_name
       t.boolean :tax_exempt, default: false
 
@@ -59,6 +67,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :event_registration_id
       t.string :event_registration_type
 
+      t.integer :user_id
+      t.string :user_type
+
       t.string :first_name
       t.string :last_name
       t.string :email
@@ -67,6 +78,13 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.string :number
       t.text :notes
 
+      t.boolean :blank_registrant, default: false
+      t.boolean :member_registrant, default: false
+
+      t.text :response1
+      t.text :response2
+      t.text :response3
+
       t.integer :purchased_order_id
       t.integer :price
 
@@ -136,6 +154,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
 
       # Dates
       t.datetime :submitted_at
+      t.datetime :completed_at
 
       t.datetime :updated_at
       t.datetime :created_at

data/db/seeds.rb

@@ -27,6 +27,7 @@ event.event_tickets.create!(
   capacity: 10,
   regular_price: 100_00,
   early_bird_price: 50_00,
+  member_price: 75_00,
   qb_item_name: 'Tickets'
 )
 
@@ -35,6 +36,7 @@ event.event_tickets.create!(
   capacity: 20,
   regular_price: 200_00,
   early_bird_price: 150_00,
+  member_price: 75_00,
   qb_item_name: 'Tickets'
 )
 
@@ -43,6 +45,7 @@ event.event_tickets.create!(
   capacity: nil,
   regular_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 = '0.11.3'.freeze
+  VERSION = '0.12.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,10 @@ files:
 - app/views/admin/events/_form_event_registration_content.html.haml
 - app/views/effective/event_addons/_fields.html.haml
 - app/views/effective/event_registrants/_fields.html.haml
+- app/views/effective/event_registrants/_fields_member_only.html.haml
+- app/views/effective/event_registrants/_fields_member_or_non_member.html.haml
+- app/views/effective/event_registrants/_fields_questions.html.haml
+- app/views/effective/event_registrants/_fields_regular.html.haml
 - app/views/effective/event_registrations/_addons.html.haml
 - app/views/effective/event_registrations/_content.html.haml
 - app/views/effective/event_registrations/_dashboard.html.haml
@@ -278,6 +282,7 @@ files:
 - app/views/effective/event_registrations/addons.html.haml
 - app/views/effective/event_registrations/billing.html.haml
 - app/views/effective/event_registrations/checkout.html.haml
+- app/views/effective/event_registrations/complete.html.haml
 - app/views/effective/event_registrations/start.html.haml
 - app/views/effective/event_registrations/submitted.html.haml
 - app/views/effective/event_registrations/summary.html.haml