effective_events 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3436a306cb79a123bec79007b2730897d0bb3566dc1c0f2dbd6a31c5eb608a74
-  data.tar.gz: 91c60cfc2122eae660a4fc5151f395bf9709bf00c0ccec0f50915e3a2c84f3a9
+  metadata.gz: 5d25eaee6089c0b76752550e6458c502124947d0e244a1d0e7b65584935caa43
+  data.tar.gz: 6b06663b84f26a0ba07324fe601c41bc7070117c42e019527ecffbcbcc0fcd6c
 SHA512:
-  metadata.gz: 972bffdad5a0d13913ec5ab267c82308e1808d5217d0717bd2dba5f823f086974678e32e1c93a9d5ca47165941f006e9877748c2290b681711d5527a9661bbfb
-  data.tar.gz: c268aa57f91a45d32af129d493ebf5a3dfe7dc4941e47cfb13d1efcf02353ce8c7d2fbea1ba01c073d9f1365e8284d2c00e03355deb7e1791ca997440447615c
+  metadata.gz: c599c5411f8c66a3dbe6f4c0ded8f9ef6f202c25d66cbdee33ee141cbbd3d4afd1fbd4a19ae55ccc9fc303a44882b5c971359595b31e30f551e5f35ed3b4f13b
+  data.tar.gz: 77ac6e934e9276331670d270dee9d82b55bf2eb8c2e1ed90ee57a9b1798aa56bcca6142d46dcb98b140adc1dbf61982ff469b9c2950c62a9a7252a0813d08272

data/app/controllers/admin/event_addons_controller.rb

@@ -5,6 +5,6 @@ module Admin
 
     include Effective::CrudController
 
-    submit :mark_paid, 'Save and Mark Paid'
+    submit :mark_registered, 'Save and Mark Registered'
   end
 end

data/app/controllers/admin/event_registrants_controller.rb

@@ -5,7 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    submit :mark_paid, 'Save and Mark Paid'
+    submit :mark_registered, 'Save and Mark Registered'
 
   end
 end

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -4,6 +4,7 @@ module Admin
       scope :unarchived, label: "All"
       scope :purchased
       scope :deferred
+      scope :not_purchased
       scope :archived
     end
 
@@ -35,7 +36,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.purchased_or_deferred.includes(:purchased_order, :owner)
+      scope = Effective::EventAddon.deep.registered.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -4,15 +4,20 @@ module Admin
       scope :unarchived, label: "All"
       scope :purchased
       scope :deferred
+      scope :not_purchased
       scope :archived
     end
 
     datatable do
+      order :registered_at, :asc
+
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
       col :archived, visible: false
 
+      col :registered_at
+
       col :event
 
       col :owner, visible: false
@@ -24,12 +29,36 @@ module Admin
         col :event_ticket, search: :string
       end
 
-      col :purchased_order, visible: false
+      col :waitlisted do |registrant|
+        if registrant.promoted?
+          'Promoted'
+        elsif registrant.waitlisted?
+          'Waitlisted'
+        else
+          '-'
+        end
+      end
+
+      col :promoted, visible: false
 
+      col :name do |er|
+        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 :user, label: 'Member'
-      col :first_name
-      col :last_name
-      col :email
+
+      col :orders, visible: false
+      col :price, as: :price
+
+      col :first_name, visible: false
+      col :last_name, visible: false
+      col :email, visible: false
       col :company, visible: false
 
       col :response1
@@ -40,7 +69,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventRegistrant.deep.purchased_or_deferred
+      scope = Effective::EventRegistrant.deep.registered
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_registrations_datatable.rb

@@ -7,7 +7,8 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :created_at, label: 'Created', visible: false
     col :updated_at, label: 'Updated', visible: false
 
-    col :submitted_at, label: 'Submitted', visible: false, as: :date
+    col :submitted_at, label: 'Submitted', as: :date
+    col :completed_at, label: 'Completed', as: :date
 
     col :event, search: :string
     col :owner
@@ -20,7 +21,7 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveEvents.EventRegistration.all.deep.done
+    EffectiveEvents.EventRegistration.all.deep.where.not(status: :draft)
   end
 
 end

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -40,6 +40,7 @@ module Admin
 
       col :capacity_available, visible: false
       col :capacity, label: 'Capacity Total', visible: false
+      col :waitlist, visible: false
 
       col :question1, visible: false
       col :question2, visible: false

data/app/datatables/effective_event_registrants_datatable.rb

@@ -2,6 +2,7 @@
 
 class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
+    order :id
 
     col :name do |er|
       if er.first_name.present?
@@ -13,9 +14,12 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
       end
     end
 
+    col :id, visible: false
+
     col :event_ticket, search: :string, label: 'Ticket' do |er|
       [
         er.event_ticket.to_s,
+        (content_tag(:span, 'Waitlist', class: 'badge badge-warning') if er.waitlisted_not_promoted?),
         (content_tag(:span, 'Archived', class: 'badge badge-warning') if er.event_ticket&.archived?)
       ].compact.join('<br>').html_safe
     end
@@ -36,8 +40,8 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
       end.join.html_safe
     end
 
-    col :price, as: :price
-
+    # This is the non-waitlisted full price
+    col :event_ticket_price, as: :price, label: 'Price'
     col :archived, visible: false
 
     # no actions_col

data/app/helpers/effective_events_helper.rb

@@ -38,10 +38,9 @@ module EffectiveEventsHelper
       title = ticket.to_s
       price = effective_events_ticket_price(event, ticket)
 
-      remaining = (ticket.capacity.present? ? "#{ticket.capacity_available} remaining" : nil)
+      label = [title, price].compact.join(' - ')
 
-      label = [title, price, remaining].compact.join(' - ')
-      disabled = { disabled: :disabled } unless (authorized || event.event_ticket_available?(ticket, quantity: 1))
+      disabled = { disabled: :disabled } unless (authorized || ticket.waitlist? || event.event_ticket_available?(ticket, quantity: 1))
 
       [label, ticket.to_param, disabled].compact
     end

data/app/models/concerns/effective_events_event_registration.rb

@@ -18,6 +18,9 @@ module EffectiveEventsEventRegistration
   end
 
   included do
+    # Needs to be first up here. Before the acts_as_purchasable_parent one voids the order
+    around_destroy :around_destroy_deferred_event_registration, if: -> { submit_order&.deferred? }
+
     acts_as_purchasable_parent
     acts_as_tokened
 
@@ -128,6 +131,15 @@ module EffectiveEventsEventRegistration
     # If we're submitted. Try to move to completed.
     before_save(if: -> { submitted? }) { try_completed! }
 
+    def around_destroy_deferred_event_registration
+      raise('expecting a deferred submit order') unless submit_order&.deferred?
+
+      waitlisted_event_tickets_was = event_tickets().select(&:waitlist?)
+      yield
+      waitlisted_event_tickets_was.each { |event_ticket| event_ticket.update_waitlist! }
+      true
+    end
+
     def delayed_payment_date_upcoming?
       event&.delayed_payment_date_upcoming?
     end
@@ -180,7 +192,13 @@ module EffectiveEventsEventRegistration
       true
     end
 
+    def after_submit_deferred!
+      update_deferred_event_registration!
+    end
+
     def after_submit_purchased!
+      event_registrants.each { |event_registrant| event_registrant.registered! }
+
       notifications = event.event_notifications.select(&:registrant_purchased?)
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
     end
@@ -200,12 +218,19 @@ module EffectiveEventsEventRegistration
   end
 
   def tickets!
-    after_commit { update_submit_fees_and_order! } if submit_order.present?
+    after_commit do
+      update_submit_fees_and_order! if submit_order.present?
+      update_deferred_event_registration! if submit_order&.deferred?
+    end
+
     save!
   end
 
   def addons!
-    after_commit { update_submit_fees_and_order! } if submit_order.present?
+    after_commit do
+      update_submit_fees_and_order! if submit_order.present?
+    end
+
     save!
   end
 
@@ -265,11 +290,17 @@ module EffectiveEventsEventRegistration
     event_addons
   end
 
+  def event_tickets
+    present_event_registrants.map(&:event_ticket).uniq
+  end
+
   def unavailable_event_tickets
     unavailable = []
 
     present_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)
+      unless event_ticket.waitlist? || event.event_ticket_available?(event_ticket, quantity: event_tickets.length)
+        unavailable << event_ticket 
+      end
     end
 
     unavailable
@@ -317,6 +348,18 @@ module EffectiveEventsEventRegistration
 
   private
 
+  def update_deferred_event_registration!
+    raise('expected a deferred submit order') unless submit_order&.deferred?
+
+    # Mark registered anyone who hasn't been registered yet. They are now!
+    event_registrants.reject(&:registered?).each { |event_registrant| event_registrant.registered! }
+
+    # Update the waitlist for any event tickets
+    event_tickets.select(&:waitlist?).each { |event_ticket| event_ticket.update_waitlist! }
+
+    true
+  end
+
   def present_event_registrants
     event_registrants.reject(&:marked_for_destruction?).reject(&:archived?)
   end

data/app/models/effective/event.rb

@@ -15,18 +15,18 @@ module Effective
     has_many :event_products, -> { EventProduct.sorted }, inverse_of: :event, dependent: :destroy
     accepts_nested_attributes_for :event_products, allow_destroy: true
 
-    has_many :event_registrants, -> { order(:event_ticket_id, :created_at) }, inverse_of: :event
+    has_many :event_registrants, -> { order(:event_ticket_id).order(:id) }, inverse_of: :event
     accepts_nested_attributes_for :event_registrants, allow_destroy: true
 
-    has_many :event_addons, -> { order(:event_product_id, :created_at) }, inverse_of: :event
+    has_many :event_addons, -> { order(:event_product_id).order(:id) }, inverse_of: :event
     accepts_nested_attributes_for :event_addons, allow_destroy: true
 
     has_many :event_notifications, -> { order(:id) }, inverse_of: :event, dependent: :destroy
     accepts_nested_attributes_for :event_notifications, allow_destroy: true
 
     # Used by the registration_available checks
-    has_many :registered_event_registrants, -> { EventRegistrant.registered }, class_name: 'Effective::EventRegistrant', inverse_of: :event
-    has_many :registered_event_addons, -> { EventAddon.registered }, class_name: 'Effective::EventAddon', inverse_of: :event
+    has_many :registered_event_registrants, -> { EventRegistrant.registered.unarchived }, class_name: 'Effective::EventRegistrant', inverse_of: :event
+    has_many :registered_event_addons, -> { EventAddon.registered.unarchived }, class_name: 'Effective::EventAddon', inverse_of: :event
 
     # rich_text_body - Used by the select step
     has_many_rich_texts
@@ -192,6 +192,10 @@ module Effective
       rich_text_excerpt
     end
 
+    def any_waitlist?
+      event_tickets.any? { |et| et.waitlist? }
+    end
+
     def published?
       return false if draft?
       return false if published_at.blank?
@@ -214,6 +218,7 @@ module Effective
 
     def sold_out?
       return false unless event_tickets.present?
+      return false if any_waitlist?
       event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, quantity: 1) }
     end
 

data/app/models/effective/event_addon.rb

@@ -42,7 +42,7 @@ module Effective
 
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:event, :event_product) }
-    scope :registered, -> { purchased_or_deferred.unarchived }
+    scope :registered, -> { purchased_or_deferred }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
@@ -84,8 +84,12 @@ module Effective
       event_product.qb_item_name
     end
 
-    # This is the Admin Save and Mark Paid action
-    def mark_paid!
+    def registered?
+      purchased_or_deferred?
+    end
+
+    # This is the Admin Save and Mark Registered historic action
+    def mark_registered!
       raise('expected a blank event registration') if event_registration.present?
 
       save!

data/app/models/effective/event_registrant.rb

@@ -34,6 +34,10 @@ module Effective
       blank_registrant      :boolean
       member_registrant     :boolean
 
+      waitlisted            :boolean
+      promoted              :boolean      # An admin marked this registrant as promoted from the waitlist
+      registered_at         :datetime     # When the order is deferred or purchased
+
       # Question Responses
       question1             :text
       question2             :text
@@ -54,8 +58,10 @@ module Effective
     end
 
     scope :sorted, -> { order(:last_name) }
-    scope :deep, -> { includes(:event, :event_ticket) }
-    scope :registered, -> { purchased_or_deferred.unarchived }
+    scope :deep, -> { includes(:event, :event_ticket, :owner) }
+
+    #scope :registered, -> { purchased_or_deferred.unarchived }
+    scope :registered, -> { where.not(registered_at: nil) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
@@ -74,6 +80,10 @@ module Effective
       assign_price()
     end
 
+    validate(if: -> { event_ticket.present? }, unless: -> { purchased? }) do
+      errors.add(:waitlisted, 'is not permitted for a non-waitlist event ticket') if waitlisted? && !event_ticket.waitlist?
+    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
@@ -97,16 +107,30 @@ module Effective
       validates :email, presence: true, unless: -> { user.present? }
     end
 
+    after_defer do
+      registered! if event_registration.blank? && !registered?
+    end
+
+    after_purchase do
+      registered! if event_registration.blank? && !registered?
+    end
+
     def to_s
       persisted? ? title : 'registrant'
     end
 
     def title
-      "#{event_ticket} - #{last_first_name}"
+      [event_ticket.to_s, name, ('WAITLIST' if waitlisted_not_promoted?)].compact.join(' - ')
     end
 
     def name
-      first_name.present? ? "#{first_name} #{last_name}" : "GUEST"
+      if first_name.present?
+        "#{first_name} #{last_name}"
+      elsif owner.present?
+        owner.to_s + ' - GUEST'
+      else
+        'GUEST'
+      end
     end
 
     def last_first_name
@@ -125,27 +149,48 @@ module Effective
       event_ticket&.qb_item_name
     end
 
-    # This is the Admin Save and Mark Paid action
-    def mark_paid!
-      raise('expected a blank event registration') if event_registration.present?
+    def registered?
+      registered_at.present?
+    end
 
+    # Called by an event_registration after_defer and after_purchase
+    def registered!
+      self.registered_at ||= Time.zone.now
       save!
+    end
 
-      order = Effective::Order.new(items: self, user: owner)
-      order.mark_as_purchased!
+    # This is the Admin Save and Mark Registered action
+    def mark_registered!
+      registered!
+    end
+
+    def promote!
+      raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
+
+      update!(promoted: true)
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
 
       true
     end
 
-    private
+    def unpromote!
+      raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
 
-    def assign_price
-      raise('is already purchased') if purchased?
+      update!(promoted: false)
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
+
+      true
+    end
+
+    def registered?
+      registered_at.present?
+    end
 
+    def event_ticket_price
       raise('expected an event') if event.blank?
       raise('expected an event ticket') if event_ticket.blank?
 
-      price = if event.early_bird?
+      if event.early_bird?
         event_ticket.early_bird_price # Early Bird Pricing
       elsif event_ticket.regular?
         event_ticket.regular_price
@@ -156,6 +201,18 @@ module Effective
       else
         raise("Unexpected event ticket price calculation")
       end
+    end
+
+    def waitlisted_not_promoted?
+      (waitlisted? && !promoted?)
+    end
+
+    private
+
+    def assign_price
+      raise('is already purchased') if purchased?
+
+      price = waitlisted_not_promoted? ? 0 : event_ticket_price
 
       assign_attributes(price: price)
     end

data/app/models/effective/event_ticket.rb

@@ -8,9 +8,11 @@ module Effective
 
     belongs_to :event
 
-    has_many :event_registrants
+    has_many :event_registrants, -> { order(:id) }, inverse_of: :event_ticket
+    accepts_nested_attributes_for :event_registrants
+
     has_many :purchased_event_registrants, -> { EventRegistrant.purchased.unarchived }, class_name: 'Effective::EventRegistrant'
-    has_many :registered_event_registrants, -> { EventRegistrant.registered.unarchived }, class_name: 'Effective::EventRegistrant'
+    has_many :registered_event_registrants, -> { EventRegistrant.registered.unarchived.order(:registered_at).order(:id) }, class_name: 'Effective::EventRegistrant'
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -20,7 +22,9 @@ module Effective
 
     effective_resource do
       title                       :string
+
       capacity                    :integer
+      waitlist                    :boolean 
 
       category                    :string
 
@@ -63,10 +67,34 @@ module Effective
     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 :capacity, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
+    validates :capacity, numericality: { greater_than_or_equal_to: 1, message: 'must have a non-zero capacity when using waitlist' }, if: -> { waitlist? }
+
     def to_s
       title.presence || 'New Event Ticket'
     end
 
+    # This is supposed to be an indempotent big update the world thing
+    def update_waitlist!
+      return false unless waitlist?
+
+      changed_event_registrants = registered_event_registrants.each_with_index.map do |event_registrant, index|
+        next if event_registrant.purchased?
+
+        waitlisted_was = event_registrant.waitlisted?
+        waitlisted = (waitlist? && index >= capacity)
+        next if waitlisted == waitlisted_was
+
+        event_registrant.update!(waitlisted: waitlisted) # Updates price
+        event_registrant
+      end.compact
+
+      orders = changed_event_registrants.flat_map { |event_registrant| event_registrant.deferred_orders }.compact.uniq
+      orders.each { |order| order.update_purchasable_attributes! }
+
+      true
+    end
+
     def capacity_available
       return nil if capacity.blank?
       [(capacity - registered_event_registrants_count), 0].max
@@ -95,5 +123,6 @@ module Effective
     def member_or_non_member?
       category == 'Member or Non-Member'
     end
+
   end
 end

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

@@ -16,6 +16,6 @@
   = f.check_box :archived, label: "Archive this addon. It will be displayed as archived on the owner's event registration"
 
   - if f.object.new_record?
-    = f.submit 'Save and Mark Paid'
+    = f.submit 'Save and Mark Registered'
   - else
     = f.submit 'Save'

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

@@ -11,11 +11,13 @@
   - else
     = f.static_field :owner
 
+  = f.datetime_field :registered_at
+
   = render 'effective/event_registrants/fields', f: f, event: event_registrant.event, namespace: :admin
 
   = f.check_box :archived, label: "Archive this registrant. It will be displayed as archived on the owner's event registration"
 
   - if f.object.new_record?
-    = f.submit 'Save and Mark Paid'
+    = f.submit 'Save and Mark Registered'
   - else
     = f.submit 'Save'

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

@@ -5,25 +5,32 @@
     = f.text_field :title
 
     .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."
-      .col= f.number_field :capacity, hint: "The number of registrations will be limited to capacity.<br>Leave blank for unlimited capacity."
-
-    = 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 related members. Only the regular price applies.
-
-    = 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 related 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 related members to receive the member pricing.
-        Or, they can enter a first name, last name and email to receive the regular pricing.
-
+      .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.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 related members. Only the regular price applies.
+
+        = 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 related 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 related members to receive the member pricing.
+            Or, they can enter a first name, last name and email to receive the regular pricing.
+
+      .col
+        = f.number_field :capacity, hint: "The number of registrations will be limited to capacity.<br>Leave blank for unlimited capacity."
+
+        - if f.object.event&.delayed?
+          = f.check_box :waitlist, 
+            label: "Yes, add to waitlist once capacity is reached",
+            hint: "requires a delayed payment event. Once capacity is reached, new registrations will be added to the waitlist. Payment information is collected but not charged for waitlisted registrants."
     .row
       .col-md-6
         - if f.object.event&.early_bird_end_at.present?
@@ -37,9 +44,9 @@
 
     .row
       - if defined?(EffectiveQbSync)
-        .col= f.text_field :qb_item_name, label: 'QuickBooks item name'
-      .col= f.check_box :tax_exempt
+        .col-md-6= f.text_field :qb_item_name, label: 'QuickBooks item name'
 
+    = f.check_box :tax_exempt
     = f.check_box :archived, label: 'Archive this ticket. It will be unavailable for purchase.'
 
   = card('Questions') do

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

@@ -0,0 +1,43 @@
+.card.mb-4
+  .card-body
+    - tickets = resource.event.event_tickets.reject(&:archived?)
+
+    - member_column = tickets.any? { |ticket| ticket.member_only? || ticket.member_or_non_member? }
+    - waitlist = tickets.any? { |ticket| ticket.waitlist? }
+
+    %p This event has the following tickets available for purchase:
+
+    %table.table
+      %thead
+        %tr
+          %th Ticket
+          - if member_column
+            %th Member Price
+          %th #{'Regualar ' if member_column}Price
+
+      %tbody
+        - tickets.each do |ticket|
+          %tr
+            %td
+              = ticket.to_s
+              - if ticket.capacity.present?
+                %br
+                %small
+                  #{ticket.capacity_available} remaining
+                  - if ticket.waitlist?
+                    before waitlist
+
+            - if member_column
+              %td
+                - if ticket.member_price.present?
+                  = price_to_currency(ticket.member_price)
+                - else
+                  = '-'
+            %td
+              - if ticket.regular_price.present?
+                = price_to_currency(ticket.regular_price)
+              - else
+                = '-'
+
+    - if waitlist
+      %p If the ticket capacity has been reached you will be added to the waitlist.

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

@@ -13,7 +13,7 @@
       %p
         = ticket
         = ' - '
-        = price_to_currency(registrant.price)
+        = price_to_currency(registrant.event_ticket_price)
 
       = fr.check_box :blank_registrant, label: "I will return and add this ticket's information later"
 

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

@@ -8,16 +8,14 @@
 
   = render 'effective/event_registrations/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
 
-        = f.has_many :event_addons, f.object.build_event_addons do |fp|
-          = render('effective/event_addons/fields', f: fp, event: f.object.event)
+    = f.has_many :event_addons, f.object.build_event_addons, reorder: false do |fp|
+      = render('effective/event_addons/fields', f: fp, event: f.object.event)
 
-        - if resource.delayed_payment_date_upcoming? && resource.submit_order.present?
-          .alert.alert-info If the price of your registration changes, your order will be automatically updated.
+    - if resource.delayed_payment_date_upcoming? && resource.submit_order&.delayed? && resource.submit_order&.deferred?
+      .alert.alert-info If the price of your registration changes, your order will be automatically updated.
 
-        %hr
-        = f.save 'Save and Continue'
+    %hr
+    = f.save 'Save and Continue'

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

@@ -3,17 +3,17 @@
 
   - if resource.submit_order.deferred?
     = card do
-      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), 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), skip_order: resource.submit_order.delayed?)
   - elsif resource.event.registerable? == false
     .alert.alert-danger Your selected event is no longer available for registration.
   - elsif resource.unavailable_event_tickets.present?
     .alert.alert-danger Your selected number of event tickets are no longer available.
   - elsif resource.unavailable_event_products.present?
     .alert.alert-danger Your selected number of event add-ons are no longer available.
+
   - else
     = card do
-      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), 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), skip_order: resource.submit_order.delayed?)
 
   - if resource.submit_order.delayed? && resource.submit_order.deferred?
     = link_to 'Save and Continue', wizard_path(:submitted), class: 'btn btn-primary'

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

@@ -22,8 +22,12 @@
 
     = card do
       %h3 All done
-      %p Your registration for #{resource.event} has been submitted. You're all done!
+      %p The registration for #{resource.event} has been submitted. You're all done!
       %p= resource.submit_order.delayed_payment_info
+
+      - if resource.event_registrants.any?(&:waitlisted?)
+        %p Any waitlist tickets are not charged. If you are moved off the waitlist, the full price will be charged.
+
       %p You can #{link_to('change your registration', wizard_path(:tickets))} until the payment date.
 
   = render 'effective/event_registrations/event_registration', event_registration: resource

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

@@ -5,4 +5,4 @@
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.submit 'Save and Continue', class: 'btn btn-primary'
+    = f.save 'Save and Continue'

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

@@ -1,16 +1,19 @@
 = render 'layout' do
+
+  = render 'effective/event_registrations/event_tickets', resource: resource
+
   = render 'effective/event_registrations/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+
+    %p Please select one or more tickets to register for this event:
 
-        = f.has_many :event_registrants, f.object.build_event_registrants do |fr|
-          = render('effective/event_registrants/fields', f: fr, event: f.object.event, namespace: :events)
+    = f.has_many :event_registrants, f.object.build_event_registrants, reorder: false do |fr|
+      = render('effective/event_registrants/fields', f: fr, event: f.object.event, namespace: :events)
 
-        - if resource.delayed_payment_date_upcoming? && resource.submit_order.present?
-          .alert.alert-info If the price of your registration changes, your order will be automatically updated.
+    - if resource.delayed_payment_date_upcoming? && resource.submit_order&.delayed? && resource.submit_order&.deferred?
+      .alert.alert-info If the price of your registration changes, your order will be automatically updated.
 
-        %hr
-        = f.save 'Save and Continue'
+    %hr
+    = f.save 'Save and Continue'

data/config/locales/effective_events.en.yml

@@ -0,0 +1,13 @@
+en:
+  effective_events:
+    name: 'Effective Events'
+    acronym: 'Events'
+
+  activerecord:
+    models:
+      effective/event: 'Event'
+      effective/event_registrant: 'Event Registrant'
+
+    attributes:
+      effective/event_registrant:
+        user: 'Member'

data/config/routes.rb

@@ -42,6 +42,9 @@ EffectiveEvents::Engine.routes.draw do
     end
 
     resources :event_registrants, except: [:show] do
+      post :promote, on: :member
+      post :unpromote, on: :member
+
       post :archive, on: :member
       post :unarchive, on: :member
     end

data/db/migrate/101_create_effective_events.rb

@@ -41,6 +41,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
 
       t.string :title
       t.integer :capacity
+      t.boolean :waitlist, default: false
       t.string :category
 
       t.integer :regular_price
@@ -84,6 +85,11 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :blank_registrant, default: false
       t.boolean :member_registrant, default: false
 
+      t.boolean :waitlisted, default: false
+      t.boolean :promoted, default: false
+
+      t.datetime :registered_at
+
       t.text :response1
       t.text :response2
       t.text :response3

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.13.1'.freeze
+  VERSION = '0.14.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -275,6 +275,7 @@ files:
 - app/views/effective/event_registrations/_content.html.haml
 - app/views/effective/event_registrations/_dashboard.html.haml
 - app/views/effective/event_registrations/_event_registration.html.haml
+- app/views/effective/event_registrations/_event_tickets.html.haml
 - app/views/effective/event_registrations/_form_blank_registrants.html.haml
 - app/views/effective/event_registrations/_layout.html.haml
 - app/views/effective/event_registrations/_orders.html.haml
@@ -298,6 +299,7 @@ files:
 - app/views/effective/events_mailer/event_registrant_purchased.liquid
 - app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
+- config/locales/effective_events.en.yml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/101_create_effective_events.rb