effective_events 0.12.2 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489d11bf3227576141f53363ed941b1b606915b64a8d7ce234fd084d8497eafb
-  data.tar.gz: c2e8a39859a284a609f8d6fb2e6a54ccbacf2191a0cecf3ea3407442e14865e3
+  metadata.gz: 0db42bb64a1639b358488381a0e7e4ca73814f98c41153cdb929063661b0e947
+  data.tar.gz: ad79f29da0313754aafc31e90a432eefbda54d631062ab9e593448540c6c4a08
 SHA512:
-  metadata.gz: 91b44a32a36e0d1ba81c1addb51978dddafa5e64fa5c13c927f96a8ebb753f8deb17c11e581af64976f8e9cac31612f7ec2558b5c49741cd5d441b18131c7ecf
-  data.tar.gz: 1c389debc53eb354b4e8734ce257bfb4d4f18a8e162e0c2f90c397bbd425318adc849cd4ba8e4e35708b61de8126ce800ca055dffb7960f4e05d5eb338b41e9d
+  metadata.gz: 0ce3f1278268630aab2aec2547f6b9d3ad100b303a42e403b0b1dd93e7be6a21f1f09385f8835147cc768a77d2a8278cf1ca48dab8afbed97df986716a6478e1
+  data.tar.gz: 15459694c87b8208ba7f6bd7feb53dc66030e5f7c0ccc858e2a90d3dbb7ebe5761ede77ba6900e86ebcc28f1e225b1b3b5f65113860e268eedcd50f2f96a2f76

data/app/datatables/effective_event_registrations_datatable.rb

@@ -27,7 +27,12 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
       elsif er.submitted?
         dropdown_link_to('Continue', effective_events.event_event_registration_build_path(er.event, er, er.next_step), 'data-turbolinks' => false)
       elsif er.completed?
-        dropdown_link_to('Show', effective_events.event_event_registration_path(er.event, er))
+
+        if EffectiveResources.authorized?(self, :update_blank_registrants, er)
+          dropdown_link_to('Continue', effective_events.event_event_registration_path(er.event, er))
+        else
+          dropdown_link_to('Show', effective_events.event_event_registration_path(er.event, er))
+        end
 
         # Register Again
         if er.event.registerable?

data/app/helpers/effective_events_helper.rb

@@ -66,7 +66,15 @@ module EffectiveEventsHelper
     end
   end
 
-  def effective_events_event_tickets_user_hint
+  def effective_events_event_registrant_user_collection(event_registrant)
+    raise("expected an Effective::EventRegistrant") unless event_registrant.kind_of?(Effective::EventRegistrant)
+
+    Array(event_registrant.event_registration&.event_ticket_member_users).map do |user|
+      ["<span>#{user}</span> <small>#{user.email}</small>", user.to_param]
+    end
+  end
+
+  def effective_events_event_registrant_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

data/app/models/concerns/effective_events_event_registration.rb

@@ -125,7 +125,7 @@ module EffectiveEventsEventRegistration
     # If we're submitted. Try to move to completed.
     before_save(if: -> { submitted? }) { try_completed! }
 
-    def payment_date_in_future?
+    def future_payment_date?
       false
     end
 
@@ -133,6 +133,11 @@ module EffectiveEventsEventRegistration
       return false if step == :complete && !completed?
       return true if step == :complete && completed?
 
+      # If they submitted payment with a deferred processor then lock down the steps.
+      if submitted? && !future_payment_date?
+        return (step == :submitted) 
+      end
+
       can_revisit_completed_steps(step)
     end
 
@@ -262,6 +267,36 @@ module EffectiveEventsEventRegistration
     unavailable
   end
 
+  def event_ticket_member_users
+    raise("expected owner to be a user") if owner.class.try(:effective_memberships_organization?)
+    users = [owner] + (owner.try(:organizations).try(:flat_map, &:users) || [])
+
+    users.select { |user| user.is_any?(:member) }.uniq
+  end
+
+  def update_blank_registrants!
+    # This method is called by the user on a submitted or completed event registration.
+    # Allow them to update blank registrants
+    # Don't let them hack the form and change any information.
+    if changes.present? || previous_changes.present?
+      raise('unable to make changes to event while updating blank registrants')
+    end
+
+    if event_registrants.any? { |er| (er.changes.keys - Effective::EventRegistrant::PERMITTED_BLANK_REGISTRANT_CHANGES).present? }
+      raise('unable to make changes to event registrants while updating blank registrants')
+    end
+
+    if event_registrants.any? { |er| er.blank_registrant_was == false && er.changes.present? }
+      raise('unable to make changes to non-blank registrant while updating blank registrants')
+    end
+
+    if event_addons.any? { |ea| ea.changes.present? }
+      raise('unable to make changes to event addons while updating blank registrants')
+    end
+
+    save!
+  end
+
   private
 
   def present_event_registrants

data/app/models/effective/event_registrant.rb

@@ -4,6 +4,8 @@ module Effective
   class EventRegistrant < ActiveRecord::Base
     self.table_name = (EffectiveEvents.event_registrants_table_name || :event_registrants).to_s
 
+    PERMITTED_BLANK_REGISTRANT_CHANGES = ["first_name", "last_name", "email", "company", "user_id", "user_type", "blank_registrant", "response1", "response2", "response3"]
+
     acts_as_purchasable
     acts_as_archived
 

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

@@ -5,23 +5,23 @@
     = 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 all members is displayed to the purchaser."
+      .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 all members. Only the regular price applies.
+        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 all 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 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 all members to receive the member pricing.
+        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.
 
     .row

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

@@ -1,6 +1,3 @@
 - # 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()
+= 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,9 +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', hint: effective_events_event_tickets_user_hint()
+= 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()
 
 = f.show_if(:user_id, '', nested: true) do
   %p.text-center - or -

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

@@ -0,0 +1,34 @@
+= 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_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
+
+    = card do
+      %p
+        = ticket
+        = ' - '
+        = price_to_currency(registrant.price)
+
+      = 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? && registrant.member_registrant?
+          = render('effective/event_registrants/fields_member_only', f: fr)
+        - elsif ticket.member_or_non_member? && !registrant.member_registrant?
+          = render('effective/event_registrants/fields_regular', f: fr)
+        - else
+          - raise("Unexpected ticket category: #{ticket.category || 'nil'}")
+
+        = render('effective/event_registrants/fields_questions', f: fr, ticket: ticket)
+
+  = f.submit 'Save Ticket Information', center: true

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

@@ -11,6 +11,12 @@
     = 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
+
+  - if resource.event.allow_blank_registrants? && EffectiveResources.authorized?(self, :update_blank_registrants, resource)
+    = card do
+      %h3 Incomplete Ticket Information
+      = render 'effective/event_registrations/form_blank_registrants', event_registration: resource
+
   = render 'effective/event_registrations/event_registration', event_registration: resource
   = render 'effective/event_registrations/orders', event_registration: resource
 

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

@@ -8,6 +8,12 @@
     = 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
+
+  - if resource.event.allow_blank_registrants? && EffectiveResources.authorized?(self, :update_blank_registrants, resource)
+    = card do
+      %h3 Incomplete Ticket Information
+      = render 'effective/event_registrations/form_blank_registrants', event_registration: resource
+
   = render 'effective/event_registrations/event_registration', event_registration: resource
   = render 'effective/event_registrations/orders', event_registration: resource
 

data/config/routes.rb

@@ -20,6 +20,8 @@ EffectiveEvents::Engine.routes.draw do
     resources :events, only: [:index, :show] do
       resources :event_registrations, only: [:new, :show, :destroy] do
         resources :build, controller: :event_registrations, only: [:show, :update]
+
+        put :update_blank_registrants, on: :member
       end
     end
   end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.12.2'.freeze
+  VERSION = '0.12.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-05-27 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/_form_blank_registrants.html.haml
 - app/views/effective/event_registrations/_layout.html.haml
 - app/views/effective/event_registrations/_orders.html.haml
 - app/views/effective/event_registrations/_summary.html.haml