effective_events 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc4eb59591259776d458e3fc0d6328ba9790249e07d1ad9409d95a4eb18871b
-  data.tar.gz: f85c9a53cfea60042cc37b81956186f6c2ad943ae3a2e2b001225176e9966ce4
+  metadata.gz: 6adf869c67bd082b19c66a82b5e3ac530a80b97c19e0047f13bdca69f7f1a98e
+  data.tar.gz: a1d8cd3df41996b18c2afcf4f2370a69e9d2b353e3bf3ca356808f3802ade723
 SHA512:
-  metadata.gz: 0c83eddb719ba7e8d32d91f4be0474d76a224ca6980bce71d12cbe60bfe737774eb3b20ac005c6a870777f96946bb6e212ddf9693e80ed152728c6a87e0cd5fe
-  data.tar.gz: 7d5809a96b668b4a2afd459e894216d6077a64e444dba188ec615030dda1a68d076f8759e017cb23424f38840c43be1833070fabc939b3330a5b43ade9475f14
+  metadata.gz: b5cb43f659f86669874ea2edca7aa0159aad83c25a85065d2c69ee10d4aaf8392ea8aa1ebc3a171ab95b40f93e8ec3dd2e59aeb9161c8957a94aab60d5247e26
+  data.tar.gz: aba17ab942159ea4b5b0cf9c62511f876dbd54b56a864ce584115c07ce2bcd01c02310ceebadafb3548a983b9eeebddd1ccd55dfccde669c231152a35c67c9a8

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -18,10 +18,14 @@ module Admin
       col :title
       col :category, visible: false
 
-      col :early_bird_price, as: :price, visible: event.early_bird_end_at.present?
+      col :early_bird_price, as: :price, visible: event&.early_bird_end_at.present?
       col :regular_price, as: :price
       col :member_price, as: :price
 
+      col :waitlist
+      col :capacity_available, visible: false
+      col :capacity, label: 'Capacity Total', visible: false
+
       col :capacity_to_s, label: 'Capacity' do |ticket|
         if ticket.capacity.present? && ticket.waitlist?
           "#{ticket.capacity_available} remaining / #{ticket.capacity} total. #{ticket.waitlisted_event_registrants_count} waitlisted."
@@ -44,9 +48,6 @@ module Admin
         event.event_registrants.purchased.unarchived.count
       end
 
-      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/mailers/effective/events_mailer.rb

@@ -8,7 +8,7 @@ module Effective
       raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
 
       @assigns = assigns_for(resource)
-      mail(to: resource.email, **headers_for(resource, opts))
+      mail(to: resource.member_email, **headers_for(resource, opts))
     end
 
     protected

data/app/models/effective/event.rb

@@ -166,10 +166,6 @@ module Effective
       errors.add(:delayed_payment, 'no delayed payment processor available') unless EffectiveOrders.try(:delayed?)
     end
 
-    validate(if: -> { delayed_payment_date && registration_end_at }) do
-      errors.add(:delayed_payment_date, 'must be after registration end date') unless registration_end_at < delayed_payment_date
-    end
-
     validate(if: -> { file.attached? }) do
       errors.add(:file, 'must be an image') unless file.image?
     end

data/app/models/effective/event_notification.rb

@@ -150,6 +150,8 @@ module Effective
       update_column(:started_at, Time.zone.now)
 
       event_registrants.each do |event_registrant|
+        next if event_registrant.member_email.blank?
+
         begin
           EffectiveEvents.send_email(email_template, event_registrant, email_notification_params)
         rescue => e

data/app/models/effective/event_registrant.rb

@@ -32,7 +32,6 @@ module Effective
       company               :string
 
       blank_registrant      :boolean
-      member_registrant     :boolean
 
       waitlisted            :boolean
       promoted              :boolean      # An admin marked this registrant as promoted from the waitlist
@@ -59,8 +58,6 @@ module Effective
 
     scope :sorted, -> { order(:last_name) }
     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
@@ -69,7 +66,7 @@ module Effective
     end
 
     before_validation(if: -> { blank_registrant? }) do
-      assign_attributes(user: nil, first_name: nil, last_name: nil, email: nil)
+      assign_attributes(user: nil, first_name: nil, last_name: nil, email: nil, company: nil)
     end
 
     before_validation(if: -> { user.present? }) do
@@ -89,22 +86,24 @@ module Effective
     validates :email, email: true
 
     # Member Only Ticket
-    with_options(if: -> { event_ticket&.member_only? }, unless: -> { blank_registrant? }) do
+    with_options(if: -> { event_ticket&.member_only? && present_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
+    with_options(if: -> { event_ticket&.regular? && present_registrant? }) do
+      validates :first_name, presence: true, unless: -> { EffectiveEvents.event_registrant_required_fields.exclude?(:first_name) }
+      validates :last_name, presence: true, unless: -> { EffectiveEvents.event_registrant_required_fields.exclude?(:last_name) }
+      validates :email, presence: true, unless: -> { EffectiveEvents.event_registrant_required_fields.exclude?(:email) }
+      validates :company, presence: true, unless: -> { EffectiveEvents.event_registrant_required_fields.exclude?(:company) }
     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? }
+    with_options(if: -> { event_ticket&.member_or_non_member? && present_registrant? }) do
+      validates :user_id, presence: { message: 'Please select a member' }, unless: -> { first_name.present? || last_name.present? }
+      validates :first_name, presence: true, unless: -> { user.present? || EffectiveEvents.event_registrant_required_fields.exclude?(:first_name) }
+      validates :last_name, presence: true, unless: -> { user.present? || EffectiveEvents.event_registrant_required_fields.exclude?(:last_name) }
+      validates :email, presence: true, unless: -> { user.present? || EffectiveEvents.event_registrant_required_fields.exclude?(:email) }
+      validates :company, presence: true, unless: -> { user.present? || EffectiveEvents.event_registrant_required_fields.exclude?(:company) }
     end
 
     after_defer do
@@ -138,7 +137,15 @@ module Effective
     end
 
     def member_present?
-      user&.is?(:member) || (blank_registrant? && member_registrant?)
+      user&.is?(:member)
+    end
+
+    def member_email
+      email.presence || user&.email
+    end
+
+    def present_registrant?
+      !blank_registrant?
     end
 
     def tax_exempt
@@ -164,6 +171,24 @@ module Effective
       registered!
     end
 
+    def waitlist!
+      raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
+
+      update!(waitlisted: true)
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
+
+      true
+    end
+
+    def unwaitlist!
+      raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
+
+      update!(waitlisted: false)
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
+
+      true
+    end
+
     def promote!
       raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
 

data/app/models/effective/event_ticket.rb

@@ -68,7 +68,6 @@ module Effective
     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'

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

@@ -1,4 +1,10 @@
 = effective_form_with(model: [:admin, event_addon], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :event_id
+  - else
+    = f.select :event_id, Effective::Event.sorted.all,
+      'data-load-ajax-url': effective_events.new_admin_event_addon_path,
+      'data-load-ajax-div': '#effective-events-event-addon-ajax'
   = f.hidden_field :event_id
 
   - if f.object.new_record?
@@ -11,11 +17,10 @@
   - else
     = f.static_field :owner
 
-  = render 'admin/event_addons/fields', f: f, event: event_addon.event
+  #effective-events-event-addon-ajax
+    - if f.object.event.present?
+      = render 'admin/event_addons/fields', f: f, event: event_addon.event
 
   = 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 Registered'
-  - else
-    = f.submit 'Save'
+  = f.submit 'Save'

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

@@ -1,5 +1,10 @@
 = effective_form_with(model: [:admin, event_registrant], engine: true) do |f|
-  = f.hidden_field :event_id
+  - if inline_datatable?
+    = f.hidden_field :event_id
+  - else
+    = f.select :event_id, Effective::Event.sorted.all,
+      'data-load-ajax-url': effective_events.new_admin_event_registrant_path,
+      'data-load-ajax-div': '#effective-events-event-registrant-ajax'
 
   - if f.object.new_record?
     -# User
@@ -13,11 +18,10 @@
 
   = f.datetime_field :registered_at, required: true
 
-  = render 'effective/event_registrants/fields', f: f, event: event_registrant.event, namespace: :admin
+  #effective-events-event-registrant-ajax
+    - if f.object.event.present?
+      = 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 Registered'
-  - else
-    = f.submit 'Save'
+  = f.submit 'Save'

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

@@ -11,18 +11,17 @@
         = 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.
+            Anyone will be able to purchase this ticket. They will be asked for a first and last name. Will not display the dropdown list of all 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.
+            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 related members to receive the member pricing.
-            Or, they can enter a first name, last name and email to receive the regular pricing.
+            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.
 
       .col
         = f.number_field :capacity, hint: "The number of registrations will be limited to capacity.<br>Leave blank for unlimited capacity."

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

@@ -5,7 +5,7 @@
   = f.hide_if(:save_as_draft, true) do
     .row
       .col-md-6
-        = f.datetime_field :published_start_at, hint: 'The event will be available starting on this date and time.'
+        = f.datetime_field :published_start_at, hint: 'The event will be available starting on this date and time. Leave blank to use the current date and time.'
       .col-md-6
         = f.datetime_field :published_end_at, hint: 'The event will no longer be available after this date and time. Leave blank for no end date.', date_linked: false
 

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

@@ -17,10 +17,6 @@
         - 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
           %hr
 

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

@@ -1,3 +1,10 @@
-- # Choose member
-= f.hidden_field :user_type, value: current_user.class.name
-= f.select :user_id, effective_events_event_registrant_user_collection(f.object), required: true, hint: effective_events_event_registrant_user_hint()
+- # Choose ANY 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_registrant_user_hint()
+
+- # Choose RELATED ORGANIZATION member
+-# = f.hidden_field :user_type, value: current_user.class.name
+-# = f.select :user_id, effective_events_event_registrant_user_collection(f.object), required: true, hint: effective_events_event_registrant_user_hint()

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

@@ -1,6 +1,13 @@
-- # Choose member
-= f.hidden_field :user_type, value: current_user.class.name
-= f.select :user_id, effective_events_event_registrant_user_collection(f.object), hint: effective_events_event_registrant_user_hint()
+- # Choose ANY 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_registrant_user_hint()
+
+- # Choose RELATED ORGANIZATION member
+-# = f.hidden_field :user_type, value: current_user.class.name
+-# = f.select :user_id, effective_events_event_registrant_user_collection(f.object), hint: effective_events_event_registrant_user_hint()
 
 = f.show_if(:user_id, '', nested: true) do
   %p.text-center - or -

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

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

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

@@ -13,7 +13,7 @@
           %th Ticket
           - if member_column
             %th Member Price
-          %th #{'Regualar ' if member_column}Price
+          %th #{'Regular ' if member_column}Price
 
       %tbody
         - tickets.each do |ticket|

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

@@ -3,17 +3,16 @@
 
   - 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), skip_order: resource.submit_order.delayed?)
+      = 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?
     .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), skip_order: resource.submit_order.delayed?)
+      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
 
   - 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

@@ -4,8 +4,8 @@
   - raise('expected a submitted event_registration') unless resource.submitted?
   - raise('expected a deffered event_registration submit_order') unless resource.submit_order&.deferred?
 
-  - if resource.event.delayed?
-    - raise('expected event delayed_payment_date to match order delayed_payment_date') unless resource.event.delayed_payment_date == resource.submit_order.delayed_payment_date
+  -# - if resource.event.delayed?
+  -#   - raise('expected event delayed_payment_date to match order delayed_payment_date') unless resource.event.delayed_payment_date == resource.submit_order.delayed_payment_date
 
   .mb-4
     = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/config/effective_events.rb

@@ -18,6 +18,10 @@ EffectiveEvents.setup do |config|
   # Hint text for event images attachments
   config.events_hint_text = 'Hint text that includes required image dimensions'
 
+  # Validations for Event Registrants
+  # config.event_registrant_required_fields = [:first_name, :last_name, :email, :company]
+  config.event_registrant_required_fields = [:first_name, :last_name, :email]
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/config/routes.rb

@@ -44,6 +44,8 @@ EffectiveEvents::Engine.routes.draw do
     resources :event_registrants, except: [:show] do
       post :promote, on: :member
       post :unpromote, on: :member
+      post :waitlist, on: :member
+      post :unwaitlist, on: :member
 
       post :archive, on: :member
       post :unarchive, on: :member

data/db/migrate/101_create_effective_events.rb

@@ -84,7 +84,6 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.text :notes
 
       t.boolean :blank_registrant, default: false
-      t.boolean :member_registrant, default: false
 
       t.boolean :waitlisted, default: false
       t.boolean :promoted, default: false

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.0'.freeze
 end

data/lib/effective_events.rb

@@ -9,7 +9,7 @@ module EffectiveEvents
       :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
       :event_registrations_table_name, :event_products_table_name, :event_addons_table_name, :event_notifications_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
-      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
+      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text, :event_registrant_required_fields,
       :event_registration_class_name
     ]
   end
@@ -28,4 +28,8 @@ module EffectiveEvents
     Array(config[:categories]) - [nil, false, '']
   end
 
+  def event_registrant_required_fields
+    (Array(config[:event_registrant_required_fields]) - [nil, false, '']).map(&:to_sym)
+  end
+
 end

metadata

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