effective_events 2.25.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7653da73f90a91355b58b9da44d32ad5a9c9cfb4cda6c996f08bb052e143714f
-  data.tar.gz: 9f845411770991a68ebd447e7a3007240175489071eb4d21053044414a23e9cd
+  metadata.gz: 93702d0f34b53536a8534ad5d983be17e75f66bf133e8cd67c46e3d38f6ec5dc
+  data.tar.gz: 243eb4b9796e5b0752ec0bfa4d121508253550e5765a62be4252e2835a6391d8
 SHA512:
-  metadata.gz: 67d2066762e9fde6cfbec7c4d3ba73140eb1d284e730a45a49a24a6a397b58763a146e4dee5da75069f7405703a97ce2847dba2774c2aed99e056bde5db4687c
-  data.tar.gz: 3bf8b960cead89efb84a40cf3e27c319987eb5e36d49c71a8f32c46411e40280aa0b139e9c52e37da401ac91575b45ce4e61dc40ea7d2b8215a21ac23077262a
+  metadata.gz: 408c0a3b0d923e692e1c853945e0b2899e83d02743049cc7d834ccb1163f00ca6e941b5291e9ece8abe98177f4d475b99eeaa15c9d3f047aa153f0e0f94cfc15
+  data.tar.gz: d1d0ddeb5f16cfd4d803e76222b27c5450f584f45adc9f63961fe7f0c033490554f1ab2780d964fcea91113d8553ce1e53d55c4de5afc744e0dddd5075b5f178

data/app/datatables/admin/effective_events_datatable.rb

@@ -41,6 +41,9 @@ module Admin
         end
       end
 
+      col :delayed_payment, visible: false
+      col :delayed_payment_date, visible: false
+
       # These show too much information to be useful to admins, rely on the edit screen
       # col :event_tickets, search: :string
       # col :event_products, search: :string

data/app/datatables/effective_event_registrants_datatable.rb

@@ -4,20 +4,7 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
     order :id
 
-    col :name do |er|
-      if er.first_name.present?
-        [
-          "#{er.first_name} #{er.last_name}",
-          ("<small>#{er.organization || er.company}</small>" if er.organization || er.company.present?),
-          ("<small>#{er.email}</small>" if er.email.present?)
-        ].compact.join('<br>').html_safe
-      elsif er.owner.present?
-        er.owner.to_s + ' - GUEST'
-      else
-        'Unknown'
-      end
-    end
-
+    col :full_name, label: 'Name'
     col :id, visible: false
 
     col :event_ticket, search: :string, label: 'Ticket' do |er|
@@ -36,11 +23,7 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
     col :response2, visible: false
     col :response3, visible: false
 
-    col :responses, label: '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 :responses, label: 'Details'
 
     col :price, as: :price
     col :archived, visible: false

data/app/mailers/effective/events_mailer.rb

@@ -4,6 +4,10 @@ module Effective
     include EffectiveMailer
     include EffectiveEmailTemplatesMailer
 
+    helper EffectiveEventsHelper
+    helper EffectiveOrdersHelper
+
+    # For the notifications. No longer used.
     def event_registrant_purchased(resource, opts = {})
       raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
 
@@ -11,6 +15,38 @@ module Effective
       mail(to: resource.email, **headers_for(resource, opts))
     end
 
+    # Sent on registration purchase
+    # Sent on delayed payment date registration submitted
+    # Sent on delayed payment date registration update 
+    # Sent on update blank registrants
+    def event_registration_confirmation(resource, opts = {})
+      raise('expected an event registration') unless resource.class.try(:effective_events_event_registration?)
+
+      @event_registration = resource
+      @event = resource.event
+      @event_registrants = resource.event_registrants
+      @event_addons = resource.event_addons
+
+      subject = subject_for(__method__, "Event Confirmation - #{@event}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.owner.email, subject: subject, **headers)
+    end
+
+    # Sent manually by an admin to one registrant
+    def event_registrant_confirmation(resource, opts = {})
+      raise('expected an event registrant') unless resource.kind_of?(Effective::EventRegistrant)
+
+      @event_registrant = resource
+      @event = resource.event
+      @event_registration = resource.event_registration # Optional
+
+      subject = subject_for(__method__, "Event Registrant Confirmation - #{@event}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.email, subject: subject, **headers)
+    end
+
     protected
 
     def assigns_for(resource)

data/app/models/concerns/effective_events_event_registration.rb

@@ -220,6 +220,7 @@ module EffectiveEventsEventRegistration
 
     def after_submit_deferred!
       update_deferred_event_registration!
+      send_event_registration_confirmation!
     end
 
     def after_submit_purchased!
@@ -227,12 +228,14 @@ module EffectiveEventsEventRegistration
 
       notifications = event.event_notifications.select(&:registrant_purchased?)
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
+
+      send_event_registration_confirmation! unless submit_order&.delayed?
     end
   end
 
   # Instance Methods
   def to_s
-    'registration'
+    event.present? ? "Event registration - #{event}" : model_name.human
   end
 
   def in_progress?
@@ -342,6 +345,14 @@ module EffectiveEventsEventRegistration
     save!
   end
 
+  def details!
+    after_commit do
+      update_submit_fees_and_order! if submit_order.present?
+    end
+
+    save!
+  end
+
   def addons!
     after_commit do
       update_submit_fees_and_order! if submit_order.present?
@@ -350,6 +361,17 @@ module EffectiveEventsEventRegistration
     save!
   end
 
+  # Not involved in money processing
+  # This will only be called when the order is previously delayed and deferred
+  # And we're going through the registration again with a saved card
+  def checkout!
+    if submit_order.present? && submit_order.delayed? && submit_order.deferred?
+      send_event_registration_confirmation!
+    end
+
+    save!
+  end
+
   def try_completed!
     return false unless submitted?
     return false unless submit_order&.purchased?
@@ -454,9 +476,21 @@ module EffectiveEventsEventRegistration
 
     update_submit_fees_and_order! if submit_order.present? && !submit_order.purchased?
 
+    after_commit do
+      send_event_registration_confirmation!
+    end
+
     true
   end
 
+  # Sent on registration purchase
+  # Sent on delayed payment date registration submitted
+  # Sent on delayed payment date registration update 
+  # Sent on update blank registrants
+  def send_event_registration_confirmation!
+    EffectiveEvents.send_email(:event_registration_confirmation, self)
+  end
+
   private
 
   def update_deferred_event_registration!

data/app/models/effective/event.rb

@@ -33,6 +33,7 @@ module Effective
 
     # rich_text_body
     # rich_text_excerpt
+    # rich_text_confirmation_email
 
     # rich_text_all_steps_content
     # rich_text_start_content

data/app/models/effective/event_registrant.rb

@@ -178,6 +178,21 @@ module Effective
       end
     end
 
+    # Used in email and tickets datatable
+    def full_name
+      if first_name.present?
+        [
+          name,
+          ("<small>#{organization || company}</small>" if organization || company.present?),
+          ("<small>#{email}</small>" if email.present?)
+        ].compact.join('<br>').html_safe
+      elsif owner.present?
+        owner.to_s + ' - GUEST'
+      else
+        'GUEST'
+      end
+    end
+
     def details
       [
         (content_tag(:span, 'Member', class: 'badge badge-warning') if member_ticket?),
@@ -186,6 +201,10 @@ module Effective
       ].compact.join(' ').html_safe
     end
 
+    def responses
+      [response1.presence, response2.presence, response3.presence].compact.join('<br>').html_safe
+    end
+
     def purchasable_name
       ["#{event_ticket} - #{name}", details.presence].compact.join('<br>').html_safe
     end
@@ -321,6 +340,11 @@ module Effective
       (waitlisted? && !promoted?)
     end
 
+    # Manual admin action only
+    def send_confirmation_email!
+      EffectiveEvents.send_email(:event_registrant_confirmation, self)
+    end
+
     private
 
     def build_user

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

@@ -31,11 +31,11 @@
     = tab 'Wizard' do
       = render '/admin/events/form_event_registration_content', event: event
 
-    = tab 'Email' do
-      %p Click New to add one or more emails.
+    -# = tab 'Email' do
+    -#   %p Click New to add one or more emails.
 
-      - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
-      = render_datatable(datatable, inline: true, simple: true)
+    -#   - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
+    -#   = render_datatable(datatable, inline: true, simple: true)
 
     = tab 'Access' do
       = render '/admin/events/form_access', event: event

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

@@ -4,8 +4,10 @@
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :rich_text_excerpt, label: 'Excerpt', hint: 'Will be used for the events excerpt on index pages.'
     = f.article_editor :rich_text_body, label: 'Body', hint: 'The main body of your event'
+    = f.article_editor :rich_text_confirmation_email, label: 'Confirmation email', hint: 'Include this content in the event registration confirmation email'
   - else
     = f.rich_text_area :rich_text_excerpt, label: 'Excerpt', hint: 'Will be used for the events excerpt on index pages.'
     = f.rich_text_area :rich_text_body, label: 'Body', hint: 'The main body of your event'
+    = f.rich_text_area :rich_text_confirmation_email, label: 'Confirmation email', hint: 'Include this content in the event registration confirmation email'
 
   = f.submit

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

@@ -15,5 +15,7 @@
       = 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'
+    = 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/submitted.html.haml

@@ -2,7 +2,7 @@
   = render 'effective/event_registrations/content', resource: resource
 
   - raise('expected a submitted event_registration') unless resource.submitted?
-  - raise('expected a deffered event_registration submit_order') unless resource.submit_order&.deferred?
+  - raise('expected a deffered event_registration submit_order') unless resource.submit_order&.was_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

data/app/views/effective/events_mailer/event_registrant_confirmation.html.haml

@@ -0,0 +1,22 @@
+%h2 Event Registrant Confirmation
+
+%p Event: #{@event.title}
+%p Date: #{effective_events_event_schedule(@event)}
+%p Ticket: #{@event_registrant.purchasable_name.gsub('<br>', ' - ').html_safe} - #{price_to_currency(@event_registrant.price)}
+
+- if @event_registrant.responses.present?
+  %p= @event_registrant.responses
+
+- if @event_registration.present? && @event_registrant.user == @event_registration.owner
+  %p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
+
+- if @event.rich_text_confirmation_email.present?
+  %hr
+  = @event.rich_text_confirmation_email.to_s.html_safe
+
+- if @event.delayed_payment?
+  %strong Please note:
+  %ul
+    %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")} 
+    %li Changes and cancellations must be made before this date.
+    %li A receipt will be sent to you after the transaction is completed.

data/app/views/effective/events_mailer/event_registration_confirmation.html.haml

@@ -0,0 +1,45 @@
+%h2 Event Registration Confirmation
+
+%p Event: #{@event.title}
+%p Date: #{effective_events_event_schedule(@event)}
+%p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
+
+- if @event.rich_text_confirmation_email.present?
+  %hr
+  = @event.rich_text_confirmation_email.to_s.html_safe
+
+- if @event.delayed_payment?
+  %strong Please note:
+  %ul
+    %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")} 
+    %li Changes and cancellations must be made before this date.
+    %li A receipt will be sent to you after the transaction is completed.
+
+%hr
+
+- responses = Array(@event_registrants).any? { |er| er.responses.present? }
+
+%table.table
+  %thead
+    %tr
+      %th Qty
+      %th Ticket
+      - if responses
+        %th Details
+      %th Price
+  %tbody
+    - Array(@event_registrants).each do |er|
+      %tr
+        %td 1
+        %td= er.purchasable_name
+        - if responses
+          %td= er.responses
+        %td= price_to_currency(er.price)
+
+    - Array(@event_addons).each do |ea|
+      %tr
+        %td 1
+        %td= ea.purchasable_name
+        - if responses
+          %td= ea.notes
+        %td= price_to_currency(ea.price)

data/config/routes.rb

@@ -49,6 +49,8 @@ EffectiveEvents::Engine.routes.draw do
 
       post :archive, on: :member
       post :unarchive, on: :member
+
+      post :send_confirmation_email, on: :member
     end
 
     resources :event_addons, except: [:show] do

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.25.0'.freeze
+  VERSION = '2.26.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -296,7 +296,9 @@ files:
 - app/views/effective/events/_sidebar.html.haml
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
+- app/views/effective/events_mailer/event_registrant_confirmation.html.haml
 - app/views/effective/events_mailer/event_registrant_purchased.liquid
+- app/views/effective/events_mailer/event_registration_confirmation.html.haml
 - app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
 - config/locales/effective_events.en.yml