effective_events 0.19.2 → 0.20.0

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

@@ -1,32 +1,30 @@
 = effective_form_with(model: resource, url: effective_events.update_blank_registrants_event_event_registration_path(event_registration.event, event_registration), method: :put) do |f|
   = f.hidden_field :id
 
+  - event = f.object.event
   - event_registrants = f.object.event_registrants.select(&:blank_registrant?)
 
   %p Please update the information for the following #{pluralize(event_registrants.count, 'incomplete ticket')}:
 
   = f.fields_for :event_registrants, event_registrants do |fr|
-    - registrant = fr.object
-    - ticket = registrant.event_ticket
+    - event_registrant = fr.object
+    - event_ticket = event_registrant.event_ticket
 
     = card do
       %p
-        = ticket
+        = event_ticket
         = ' - '
-        = price_to_currency(registrant.event_ticket_price)
+
+        - if event_ticket.member_or_non_member? && event_registrant.first_name.blank? && !event.early_bird?
+          = effective_events_ticket_price(event, event_ticket)
+        - else
+          = price_to_currency(event_registrant.price)
+
+        = event_registrant.details
 
       = fr.check_box :blank_registrant, label: "I will return and add this ticket's information later"
 
       = fr.show_if(:blank_registrant, false) do
-        - if ticket.regular?
-          = render('effective/event_registrants/fields_regular', f: fr)
-        - elsif ticket.member_only?
-          = render('effective/event_registrants/fields_member_only', f: fr)
-        - elsif ticket.member_or_non_member?
-          = render('effective/event_registrants/fields_member_or_non_member', f: fr)
-        - else
-          - raise("Unexpected ticket category: #{ticket.category || 'nil'}")
-
-        = render('effective/event_registrants/fields_questions', f: fr, ticket: ticket)
+        = render('effective/event_registrants/fields', f: fr)
 
   = f.submit 'Save Ticket Information', center: true

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

@@ -1,3 +1,11 @@
 .row
-  .col-lg-3.mb-3= render_wizard_sidebar(resource)
+  .col-lg-3.mb-3
+    = render_wizard_sidebar(resource)
+
+    - if resource.display_countdown?
+      .mt-4
+    
+      = card do
+        %p Your tickets are reserved until #{resource.selected_expires_at.strftime("%I:%M%P %Z")}
+
   .col-lg-9.mb-3= yield

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

@@ -3,7 +3,7 @@
 
   - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
 
-  = card('Billing Address') do
+  = card do
     %p Please enter your billing address
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

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

@@ -0,0 +1,10 @@
+= render 'layout' do
+  = render('effective/event_registrations/content', resource: resource)
+
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+
+    = render('effective/event_registrations/fields_event_registrants', form: f)
+
+    %hr
+    = f.save 'Save and Continue'

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

@@ -1,8 +1,8 @@
 = render 'layout' do
-  = render 'effective/event_registrations/content', resource: resource
-
+  = render('effective/event_registrations/content', resource: resource)
   = render('effective/event_registrations/event_registration', event_registration: resource)
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
+
     = f.save 'Save and Continue'

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

@@ -1,20 +1,10 @@
 = render 'layout' do
-
-  = render 'effective/event_registrations/content', resource: resource
-
-  = render 'effective/event_registrations/event_tickets', resource: resource
+  = render('effective/event_registrations/content', resource: resource)
 
   = 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, 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&.delayed? && resource.submit_order&.deferred?
-      .alert.alert-info If the price of your registration changes, your order will be automatically updated.
+    = card do
+      = render('effective/event_registrations/fields_event_ticket_selections', form: f)
 
-    %hr
-    .mb-4
       = f.save 'Save and Continue'

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

@@ -19,48 +19,48 @@
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
             = link_to 'Register', url, class: 'btn btn-lg btn-primary'
 
-        .row
-          .col
-            %ul.list-unstyled
-              %li.mb-3
-                %label Date and Time
-                %br
-                = effective_events_event_schedule(@event)
+        - if @event.file.attached?
+          = image_tag url_for(@event.file), class: "effective-events-image d-none d-lg-block float-right", alt: @event.title, width: "350", height: "220"
 
-              - if @event.registration_start_at.present?
-                %li.mb-3
-                  %label Registration Opens
-                  %br
-                  = @event.registration_start_at.strftime("%A, %B %d, %Y · %l:%M%P")
+        %ul.list-unstyled.mb-0
+          %li.mb-3
+            %label Date and Time
+            %br
+            = effective_events_event_schedule(@event)
 
-              - if @event.early_bird_end_at.present?
-                %li.mb-3
-                  %label Early Bird Rate Ends
-                  %br
-                  = @event.early_bird_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
+          - if @event.registration_start_at.present? && @event.registration_start_at > Time.zone.now
+            %li.mb-3
+              %label Registration Opens
+              %br
+              = @event.registration_start_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-              - if @event.registration_end_at.present?
-                %li.mb-3
-                  %label Registration Closes
-                  %br
-                  = @event.registration_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
+          - if @event.early_bird_end_at.present?
+            %li.mb-3
+              %label Early Bird Rate Ends
+              %br
+              = @event.early_bird_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-              -# .col-md-auto
-              -#   - if @event.event_tickets.present?
-              -#     %label Tickets
-              -#     %br
-              -#     %ul
-              -#       - @event.event_tickets.each do |ticket|
-              -#         %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
+          - if @event.registration_end_at.present?
+            %li.mb-3
+              %label Registration Closes
+              %br
+              = @event.registration_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-          - if @event.file.present?
-            .col-lg-4
-              = image_tag url_for(@event.file), class: "effective-events-image d-none d-lg-flex align-self-start", alt: @event.title, width: "350", height: "220"
-
-        .py-3
+          -# .col-md-auto
+          -#   - if @event.event_tickets.present?
+          -#     %label Tickets
+          -#     %br
+          -#     %ul
+          -#       - @event.event_tickets.each do |ticket|
+          -#         %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
 
         - if @event.body.present?
           .effective-event-body.mb-5
             = @event.body.to_s
 
+        - if @event.registerable?
+          .register.mb-4
+            - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
+            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
+
         = link_to("← #{events_name_label}".html_safe, effective_events.events_path, class: "btn btn-secondary my-4")

data/config/effective_events.rb

@@ -12,16 +12,23 @@ EffectiveEvents.setup do |config|
   # Events can be restricted by role
   config.use_effective_roles = true
 
+  # Display effective_memberships organizations on the Ticket Details screen instead of a company field
+  # Create representatives when there is a user and an organization
+  config.organization_enabled = false
+
+  # Create users when you fill out new user information from the Ticket Details screen. 
+  # Otherwise no users will be created. If true a User will be required for all event_registrants.
+  config.create_users = false
+
+  # Turn on the validation. You must have a company or organization when filling out Ticket Details screen.
+  config.company_or_organization_required = false
+
   # Categories
   config.categories = ['Events']
 
   # Hint text for event images attachments
   config.events_hint_text = 'Optional. Shown on the events index and event pages. Dimensions are 220px tall and 350px wide.'
 
-  # 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

@@ -24,6 +24,11 @@ EffectiveEvents::Engine.routes.draw do
         put :update_blank_registrants, on: :member
       end
     end
+
+    resources :event_registrants_select2_ajax, only: [] do
+      get :users, on: :collection
+      get :organizations, on: :collection
+    end
   end
 
   namespace :admin do

data/db/migrate/101_create_effective_events.rb

@@ -77,11 +77,14 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :user_id
       t.string :user_type
 
+      t.integer :organization_id
+      t.string :organization_type
+
       t.string :first_name
       t.string :last_name
       t.string :email
-
       t.string :company
+
       t.string :number
       t.text :notes
 
@@ -91,6 +94,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :waitlisted, default: false
       t.boolean :promoted, default: false
 
+      t.datetime :selected_at
       t.datetime :registered_at
 
       t.text :response1
@@ -172,6 +176,17 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
+    create_table :event_ticket_selections do |t|
+      t.integer :event_registration_id
+      t.string :event_registration_type
+
+      t.string :event_ticket_id
+      t.integer :quantity
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
     add_index :event_registrations, [:owner_id, :owner_type]
     add_index :event_registrations, :status
     add_index :event_registrations, :token

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.19.2'.freeze
+  VERSION = '0.20.0'.freeze
 end

data/lib/effective_events.rb

@@ -6,10 +6,11 @@ module EffectiveEvents
 
   def self.config_keys
     [
-      :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
+      :events_table_name, :event_registrants_table_name, :event_tickets_table_name, :event_ticket_selections_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, :event_registrant_required_fields,
+      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
+      :organization_enabled, :create_users, :company_or_organization_required,
       :event_registration_class_name
     ]
   end
@@ -28,8 +29,9 @@ module EffectiveEvents
     Array(config[:categories]) - [nil, false, '']
   end
 
-  def self.event_registrant_required_fields
-    (Array(config[:event_registrant_required_fields]) - [nil, false, '']).map(&:to_sym)
+  def self.organization_enabled?
+    raise('missing the effective_memberships gem') if organization_enabled && !defined?(EffectiveMemberships)
+    organization_enabled == true
   end
 
   # If we can create delayed payment events at all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,6 +229,7 @@ files:
 - app/controllers/admin/event_registrations_controller.rb
 - app/controllers/admin/event_tickets_controller.rb
 - app/controllers/admin/events_controller.rb
+- app/controllers/effective/event_registrants_select2_ajax_controller.rb
 - app/controllers/effective/event_registrations_controller.rb
 - app/controllers/effective/events_controller.rb
 - app/datatables/admin/effective_event_addons_datatable.rb
@@ -253,6 +254,7 @@ files:
 - app/models/effective/event_registration.rb
 - app/models/effective/event_search.rb
 - app/models/effective/event_ticket.rb
+- app/models/effective/event_ticket_selection.rb
 - app/views/admin/event_addons/_fields.html.haml
 - app/views/admin/event_addons/_form.html.haml
 - app/views/admin/event_notifications/_form.html.haml
@@ -267,15 +269,13 @@ 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
+- app/views/effective/event_registrations/_details.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/_fields_event_registrants.html.haml
+- app/views/effective/event_registrations/_fields_event_ticket_selections.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
@@ -285,6 +285,7 @@ files:
 - 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/details.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

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

@@ -1,10 +0,0 @@
-- # 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,34 +0,0 @@
-- if current_user.try(:is_any?, :member, :admin)
-  = f.radios :member_or_non_member_choice, Effective::EventRegistrant::MEMBER_OR_NON_MEMBER_CHOICES, label: false, inline: true
-- else
-  = f.hidden_field :member_or_non_member_choice, value: 'Add a regular registration'
-
-= f.show_if(:member_or_non_member_choice, 'Add a member registration', nested: true) do
-  = f.hidden_field :first_name, value: nil
-  = f.hidden_field :last_name, value: nil
-  = f.hidden_field :email, value: nil
-  = f.hidden_field :company, value: nil
-
-  - # 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(:member_or_non_member_choice, 'Add a regular registration', nested: true) do
-  = f.hidden_field :user_type, value: nil
-  = f.hidden_field :user_id, value: nil
-
-  - # 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

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

@@ -1,8 +0,0 @@
-- 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

@@ -1,8 +0,0 @@
-- # 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

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

@@ -1,68 +0,0 @@
-- 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? }
-
-- all_member_only_tickets = tickets.all? { |ticket| ticket.member_only? }
-- any_member_only_tickets = tickets.any? { |ticket| ticket.member_only? }
-
-= card do
-  - if resource.event.early_bird?
-    .alert.alert-warning.mb-3
-      Early Bird rates end on
-      = resource.event.early_bird_end_at.strftime("%A, %B %d, %Y at %l:%M%P.")
-
-  %table.table.table-sm.table-striped
-    %thead
-      %tr
-        %th Ticket
-        %th Price
-
-    %tbody
-      - tickets.each do |ticket|
-        %tr
-          %td
-            = ticket.to_s
-            - if ticket.capacity.present? && ticket.display_capacity?
-              %br
-              %small
-                #{ticket.capacity_available} remaining
-                - if ticket.waitlist?
-                  before waitlist
-
-          %td
-            %ul.list-unstyled.mb-0
-              - if resource.event.early_bird? && ticket.early_bird_price.present? && ticket.early_bird_price != 0 && ticket.early_bird_price != ticket.member_price && ticket.early_bird_price != ticket.regular_price
-                %li
-                  - if ticket.regular_price.present? && ticket.regular_price != 0
-                    %div
-                      %s.text-muted
-                        = price_to_currency(ticket.regular_price)
-
-                  - if ticket.member_price.present? && ticket.member_price != 0
-                    %div
-                      %s.text-muted
-                        = price_to_currency(ticket.member_price)
-                      .badge.badge-secondary.mr-2 Members
-
-                  %div
-                    = price_to_currency(ticket.early_bird_price)
-                    .badge.badge-warning Early Bird
-
-              - else
-                - if ticket.regular_price.present?
-                  %li
-                    = price_to_currency(ticket.regular_price)
-
-                - if ticket.member_price.present?
-                  %li
-                    = price_to_currency(ticket.member_price)
-                    .badge.badge-secondary Members
-
-  - if waitlist
-    %p If the ticket capacity has been reached you will be added to the waitlist.
-
-- unless current_user.try(:is?, :member)
-  - if all_member_only_tickets
-    .alert.alert-info.mb-4 You must be a member to purchase tickets.
-  - elsif any_member_only_tickets
-    .alert.alert-info.mb-4 You must be a member to purchase some of these tickets.