effective_events 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19f4a303dbab49f23b15a28c71bce29f9d55036371c533a27f36ad3ac70ca1b4
-  data.tar.gz: ad51623c2087ccf9a1c2a2a97d1623f89224be38cd7aae06b246aedb2108e2e3
+  metadata.gz: cd744d00aed47ee8fe88bbfa4f9224f6dea924726a9d7f42be397e88315e5a0f
+  data.tar.gz: b24c00d8bc3a54e3ccad2f43db728ede8a53b5aaff618646386c3ad179c827ed
 SHA512:
-  metadata.gz: 7d51690029093356830ee881f54881054b4eafa9b0aaf99d2389c9d8966a2d76b2d8456f11e9ef45ef7df92cddce73c89961094802c21a198a766b04373b0eb8
-  data.tar.gz: 68e1785f75da39ad9916a065c89dc79a3995602c250315276e165b58f4abf43bc4ab116c45698e1ee36cccfa7b7fe2c364efefab73d382deb58bd623e8064325
+  metadata.gz: bee221260b8e2aad273c9b79250707bf4c053dc64a937c3eff477eb345e8bc3a10afb4b9504d45f2d2be778a842a62ffc7dc4a9ac76138915575eff8c295524c
+  data.tar.gz: 305c28be0450a00d070e15d32d0af3dc2de4c72bdbad1e345948c00851ccb882566b84b9a256d9c62786573902cced56a63a658204fd671614d4e59ebc3a58f2

data/README.md

@@ -71,7 +71,7 @@ The permissions you actually want to define are as follows (using CanCan):
 can([:index, :show], Effective::Event) { |event| !event.draft? }
 can([:new, :create], EffectiveEvents.EventRegistration)
 can([:show, :index], Effective::EventRegistrant) { |registrant| registrant.owner == user || registrant.owner.blank? }
-can([:show, :index], Effective::EventPurchase) { |purchase| purchase.owner == user || purchase.owner.blank? }
+can([:show, :index], Effective::EventAddon) { |addon| addon.owner == user || addon.owner.blank? }
 can([:show, :index], EffectiveEvents.EventRegistration) { |registration| registration.owner == user }
 can([:update, :destroy], EffectiveEvents.EventRegistration) { |registration| registration.owner == user && !registration.was_submitted? }
 
@@ -85,15 +85,15 @@ if user.admin?
   can(:mark_paid, Effective::EventRegistrant) { |er| !er.event_registration_id.present? }
   can(:destroy, Effective::EventRegistrant) { |er| !er.purchased? }
 
-  can(crud - [:destroy], Effective::EventPurchase)
-  can(:mark_paid, Effective::EventPurchase) { |er| !er.event_registration_id.present? }
-  can(:destroy, Effective::EventPurchase) { |er| !er.purchased? }
+  can(crud - [:destroy], Effective::EventAddon)
+  can(:mark_paid, Effective::EventAddon) { |er| !er.event_registration_id.present? }
+  can(:destroy, Effective::EventAddon) { |er| !er.purchased? }
 
   can(crud - [:destroy], Effective::EventTicket)
   can(:destroy, Effective::EventTicket) { |et| et.purchased_event_registrants_count == 0 }
 
   can(crud - [:destroy], Effective::EventProduct)
-  can(:destroy, Effective::EventProduct) { |et| et.purchased_event_purchases_count == 0 }
+  can(:destroy, Effective::EventProduct) { |et| et.purchased_event_addons_count == 0 }
 
   can([:index, :show], EffectiveEvents.EventRegistration)
 end

data/app/controllers/admin/{event_purchases_controller.rb → event_addons_controller.rb}

@@ -1,11 +1,10 @@
 module Admin
-  class EventPurchasesController < ApplicationController
+  class EventAddonsController < ApplicationController
     before_action(:authenticate_user!) if defined?(Devise)
     before_action { EffectiveResources.authorize!(self, :admin, :effective_events) }
 
     include Effective::CrudController
 
     submit :mark_paid, 'Save and Mark Paid'
-
   end
 end

data/app/controllers/admin/event_notifications_controller.rb

@@ -0,0 +1,8 @@
+module Admin
+  class EventNotificationsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_events) }
+
+    include Effective::CrudController
+  end
+end

data/app/controllers/effective/event_registrations_controller.rb

@@ -39,7 +39,6 @@ module Effective
 
     def permitted_params
       model = (params.key?(:effective_event_registration) ? :effective_event_registration : :event_registration)
-
       params.require(model).permit!.except(:status, :status_steps, :wizard_steps, :submitted_at)
     end
 

data/app/controllers/effective/events_controller.rb

@@ -8,7 +8,7 @@ module Effective
     }
 
     def index
-      @events ||= resource_scope
+      @events ||= resource_scope.published
 
       @events = @events.paginate(page: params[:page])
 

data/app/datatables/admin/{effective_event_purchases_datatable.rb → effective_event_addons_datatable.rb}

@@ -1,5 +1,5 @@
 module Admin
-  class EffectiveEventPurchasesDatatable < Effective::Datatable
+  class EffectiveEventAddonsDatatable < Effective::Datatable
     datatable do
       col :updated_at, visible: false
       col :created_at, visible: false
@@ -23,7 +23,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventPurchase.deep.purchased
+      scope = Effective::EventAddon.deep.purchased
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_notifications_datatable.rb

@@ -0,0 +1,52 @@
+class Admin::EffectiveEventNotificationsDatatable < Effective::Datatable
+  # filters do
+  #   scope :all
+  #   scope :started
+  #   scope :completed
+  # end
+
+  datatable do
+    col :updated_at, visible: false
+    col :created_at, visible: false
+    col :id, visible: false
+
+    col :event
+    col :category
+
+    col :from do |event|
+      html_escape(event.from)
+    end
+
+    # col :reminder do |poll_notification|
+    #   case poll_notification.category
+    #   when 'When poll starts'
+    #     poll_notification.poll.start_at&.strftime('%F %H:%M')
+    #   when 'When poll ends'
+    #     poll_notification.poll.end_at&.strftime('%F %H:%M')
+    #   when 'Upcoming reminder'
+    #     Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
+    #   when 'Reminder'
+    #     Effective::PollNotification::REMINDERS.invert[poll_notification.reminder]
+    #   when 'Before poll ends'
+    #     Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
+    #   else
+    #     raise('unexpected category')
+    #   end
+    # end
+
+    col :subject
+
+    col :body do |notification|
+      simple_format(notification.body)
+    end
+
+    # col :started_at, visible: false
+    # col :completed_at
+
+    actions_col
+  end
+
+  collection do
+    Effective::EventNotification.all.deep
+  end
+end

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -20,12 +20,12 @@ module Admin
         end
       end
 
-      col :purchased_event_purchases_count, label: 'Purchased'
+      col :purchased_event_addons_count, label: 'Purchased'
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :purchased_event_purchases, label: 'Purchased by' do |product|
-        product.purchased_event_purchases.sort_by(&:to_s).map do |purchase|
+      col :purchased_event_addons, label: 'Purchased by' do |product|
+        product.purchased_event_addons.sort_by(&:to_s).map do |purchase|
           content_tag(:div, purchase.owner.to_s, class: 'col-resource_item')
         end.join.html_safe
       end

data/app/datatables/admin/effective_event_registrations_datatable.rb

@@ -13,7 +13,7 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :owner
 
     col :event_registrants, search: :string
-    col :event_purchases, search: :string
+    col :event_addons, search: :string
     col :orders, label: 'Order'
 
     actions_col

data/app/datatables/admin/effective_events_datatable.rb

@@ -14,6 +14,8 @@ module Admin
       col :id, visible: false
 
       col :title
+      col :slug, visible: false
+
       col :draft
       col :start_at, label: 'Event Start Date'
       col :end_at, label: 'Event End Date', visible: false
@@ -34,7 +36,7 @@ module Admin
       col :event_tickets, search: :string
       col :event_products, search: :string
       col :event_registrants, search: :string
-      col :event_purchases, search: :string
+      col :event_addons, search: :string
 
       col :roles, visible: false
       col :authenticate_user, visible: false

data/app/datatables/{effective_event_purchases_datatable.rb → effective_event_addons_datatable.rb}

@@ -1,16 +1,16 @@
-# Used on the Event Registrations purchases step
+# Used on the Event Registrations Addons step
 
-class EffectiveEventPurchasesDatatable < Effective::Datatable
+class EffectiveEventAddonsDatatable < Effective::Datatable
   datatable do
 
-    col :event_product, search: :string
+    col :event_product, search: :string, label: 'Product'
     col :price, as: :price
-    col :notes
+    # col :notes
     # no actions_col
   end
 
   collection do
-    scope = Effective::EventPurchase.deep.all
+    scope = Effective::EventAddon.deep.all
 
     if event.present?
       scope = scope.where(event: event)

data/app/datatables/effective_event_registrants_datatable.rb

@@ -3,7 +3,7 @@
 class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
 
-    col :event_ticket, search: :string
+    col :event_ticket, search: :string, label: 'Ticket'
 
     col :name do |er|
       "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"

data/app/datatables/effective_event_registrations_datatable.rb

@@ -17,7 +17,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :owner, visible: false, search: :string
     col :status, visible: false
     col :event_registrants, label: 'Registrants', search: :string
-    col :event_purchases, label: 'Purchases', search: :string
+    col :event_addons, label: 'Add-ons', search: :string
     col :orders, action: :show, visible: false, search: :string
 
     actions_col(actions: []) do |er|

data/app/datatables/effective_events_datatable.rb

@@ -10,9 +10,9 @@ class EffectiveEventsDatatable < Effective::Datatable
     order :title
     col :id, visible: false
 
-    col :start_at, label: 'Event Date', as: :date
+    col :start_at, label: 'Date', as: :date
 
-    col :title, label: 'Event' do |event|
+    col :title, label: 'Title' do |event|
       if event.registerable?
         link_to(event.to_s, effective_events.new_event_event_registration_path(event))
       else

data/app/mailers/effective/events_mailer.rb

@@ -0,0 +1,56 @@
+module Effective
+  class EventsMailer < EffectiveResources.parent_mailer_class
+    default from: -> { EffectiveResources.mailer_sender }
+    layout -> { EffectiveResources.mailer_layout }
+
+    include EffectiveEmailTemplatesMailer if EffectiveEvents.use_effective_email_templates
+
+    def event_registrant_purchased(event_registrant, opts = {})
+      @assigns = assigns_for(event_registrant)
+      @event_registrant = event_registrant
+
+      mail(to: event_registrant.email, **headers_for(event_registrant, opts))
+    end
+
+    protected
+
+    def headers_for(resource, opts = {})
+      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+    end
+
+    def assigns_for(resource)
+      if resource.kind_of?(EventRegistrant)
+        return event_registrant_assigns(resource).merge(event_assigns(resource.event)).merge(event_ticket_assigns(resource.event_ticket))
+      end
+
+      raise('unexpected resource')
+    end
+
+    def event_assigns(resource)
+      raise('expected an event') unless resource.kind_of?(Event)
+
+      values = {
+        name: resource.title,
+        date: resource.start_at.strftime('%F %H:%M'),
+        url: effective_events.event_url(resource)
+      }
+
+      { event: values }
+    end
+
+    def event_ticket_assigns(resource)
+      raise('expected an event ticket') unless resource.kind_of?(EventTicket)
+
+      values = { name: resource.title }
+      { ticket: values }
+    end
+
+    def event_registrant_assigns(resource)
+      raise('expected an event registrant') unless resource.kind_of?(EventRegistrant)
+
+      values = { name: resource.name, email: resource.email }
+      { registrant: values }
+    end
+
+  end
+end

data/app/models/concerns/effective_events_event_registration.rb

@@ -36,8 +36,8 @@ module EffectiveEventsEventRegistration
 
     acts_as_wizard(
       start: 'Start',
-      registrants: 'Registrants',
-      purchases: 'Purchases',
+      tickets: 'Tickets',
+      addons: 'Add-ons',
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',
@@ -58,8 +58,8 @@ module EffectiveEventsEventRegistration
     has_many :event_registrants, -> { order(:id) }, class_name: 'Effective::EventRegistrant', inverse_of: :event_registration, dependent: :destroy
     accepts_nested_attributes_for :event_registrants, reject_if: :all_blank, allow_destroy: true
 
-    has_many :event_purchases, -> { order(:id) }, class_name: 'Effective::EventPurchase', inverse_of: :event_registration, dependent: :destroy
-    accepts_nested_attributes_for :event_purchases, reject_if: :all_blank, allow_destroy: true
+    has_many :event_addons, -> { order(:id) }, class_name: 'Effective::EventAddon', inverse_of: :event_registration, dependent: :destroy
+    accepts_nested_attributes_for :event_addons, reject_if: :all_blank, allow_destroy: true
 
     has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
@@ -91,7 +91,7 @@ module EffectiveEventsEventRegistration
     validates :event, presence: true
 
     # Registrants Step
-    validate(if: -> { current_step == :registrants }) do
+    validate(if: -> { current_step == :tickets }) do
       self.errors.add(:event_registrants, "can't be blank") unless present_event_registrants.present?
     end
 
@@ -102,7 +102,7 @@ module EffectiveEventsEventRegistration
         item.errors.add(:event_ticket_id, "#{item.event_ticket} is unavailable for purchase")
       end
 
-      event_purchases.reject { |ep| ep.purchased? || ep.event_product&.available? }.each do |item|
+      event_addons.reject { |ep| ep.purchased? || ep.event_product&.available? }.each do |item|
         errors.add(:base, "The #{item.event_product} product is sold out and no longer available for purchase")
         item.errors.add(:event_product_id, "#{item.event_product} is unavailable for purchase")
       end
@@ -110,19 +110,24 @@ module EffectiveEventsEventRegistration
 
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      event&.event_products.present? ? wizard_step_keys : (wizard_step_keys - [:purchases])
+      event&.event_products.present? ? wizard_step_keys : (wizard_step_keys - [:addons])
     end
 
     # All Fees and Orders
     def submit_fees
-      (event_registrants + event_purchases)
+      (event_registrants + event_addons)
+    end
+
+    def after_submit_purchased!
+      notifications = event.event_notifications.select(&:registrant_purchased?)
+      notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
     end
 
   end
 
   # Instance Methods
   def to_s
-    persisted? ? "Registration ##{id}" : 'Event Registration'
+    'registration'
   end
 
   def in_progress?
@@ -140,9 +145,9 @@ module EffectiveEventsEventRegistration
   end
 
   # Find or build. But it's not gonna work with more than 1. This is for testing only really.
-  def event_purchase(event_product:)
-    purchase = event_purchases.find { |ep| ep.event_product == event_product }
-    purchase || event_purchases.build(event_product: event_product, owner: owner)
+  def event_addon(event_product:)
+    addon = event_addons.find { |ep| ep.event_product == event_product }
+    addon || event_addons.build(event_product: event_product, owner: owner)
   end
 
   # This builds the default event registrants used by the wizard form

data/app/models/effective/event.rb

@@ -2,17 +2,20 @@
 
 module Effective
   class Event < ActiveRecord::Base
-    has_many :event_tickets, -> { EventTicket.sorted }, inverse_of: :event
+    has_many :event_tickets, -> { EventTicket.sorted }, inverse_of: :event, dependent: :destroy
     accepts_nested_attributes_for :event_tickets, allow_destroy: true
 
-    has_many :event_products, -> { EventProduct.sorted }, inverse_of: :event
+    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
     accepts_nested_attributes_for :event_registrants, allow_destroy: true
 
-    has_many :event_purchases, -> { order(:event_product_id, :created_at) }, inverse_of: :event
-    accepts_nested_attributes_for :event_purchases, allow_destroy: true
+    has_many :event_addons, -> { order(:event_product_id, :created_at) }, 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
 
     # rich_text_body - Used by the select step
     has_many_rich_texts
@@ -149,12 +152,12 @@ module Effective
 
     def early_bird?
       return false if early_bird_end_at.blank?
-      early_bird_end_at < Time.zone.now
+      early_bird_end_at > Time.zone.now
     end
 
     def early_bird_past?
       return false if early_bird_end_at.blank?
-      early_bird_end_at >= Time.zone.now
+      early_bird_end_at <= Time.zone.now
     end
 
     def early_bird_status

data/app/models/effective/{event_purchase.rb → event_addon.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Just like each EventRegistration has EventTickets and EventRegistrants
-# An Event Registration has EventProducts and EventPurchases
+# An Event Registration has EventProducts and EventAddons
 
 module Effective
-  class EventPurchase < ActiveRecord::Base
+  class EventAddon < ActiveRecord::Base
     acts_as_purchasable
 
     log_changes(to: :event) if respond_to?(:log_changes)

data/app/models/effective/event_notification.rb

@@ -0,0 +1,160 @@
+module Effective
+  class EventNotification < ActiveRecord::Base
+    log_changes(to: :event) if respond_to?(:log_changes)
+
+    belongs_to :event
+
+    CATEGORIES = ['Registrant purchased']
+    EMAIL_TEMPLATE_VARIABLES = ['event.name', 'event.date', 'event.url', 'ticket.name', 'registrant.name', 'registrant.email']
+
+    #CATEGORIES = ['Upcoming reminder', 'When event starts', 'Reminder', 'Before event ends', 'When event ends']
+
+    # UPCOMING_REMINDERS = {
+    #   '1 hour before' => 1.hours.to_i,
+    #   '3 hours before' => 3.hours.to_i,
+    #   '6 hours before' => 6.hours.to_i,
+    #   '12 hours before' => 12.hours.to_i,
+    #   '1 day before' => 1.days.to_i,
+    #   '2 days before' => 2.days.to_i,
+    #   '3 days before' => 3.days.to_i,
+    #   '4 days before' => 4.days.to_i,
+    #   '5 days before' => 5.days.to_i,
+    #   '6 days before' => 6.days.to_i,
+    #   '1 week before' => 1.weeks.to_i,
+    #   '2 weeks before' => 2.weeks.to_i,
+    #   '3 weeks before' => 3.weeks.to_i,
+    #   '1 month before' => 1.month.to_i
+    # }
+
+    # REMINDERS = {
+    #   '1 hour after' => 1.hours.to_i,
+    #   '3 hours after' => 3.hours.to_i,
+    #   '6 hours after' => 6.hours.to_i,
+    #   '12 hours after' => 12.hours.to_i,
+    #   '1 day after' => 1.days.to_i,
+    #   '2 days after' => 2.days.to_i,
+    #   '3 days after' => 3.days.to_i,
+    #   '4 days after' => 4.days.to_i,
+    #   '5 days after' => 5.days.to_i,
+    #   '6 days after' => 6.days.to_i,
+    #   '1 week after' => 1.weeks.to_i,
+    #   '2 weeks after' => 2.weeks.to_i,
+    #   '3 weeks after' => 3.weeks.to_i,
+    #   '1 month after' => 1.month.to_i
+    # }
+
+    effective_resource do
+      category          :string
+      reminder          :integer  # Number of seconds before event.start_at
+
+      # Email
+      from              :string
+      subject           :string
+      body              :text
+
+      # Tracking background jobs email send out
+      started_at        :datetime
+      completed_at      :datetime
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:id) }
+    scope :deep, -> { includes(:event) }
+
+    scope :started, -> { where.not(started_at: nil) }
+    scope :completed, -> { where.not(completed_at: nil) }
+
+    # Called by a future event_notifier rake task
+    scope :notifiable, -> { where(started_at: nil, completed_at: nil) }
+
+    validates :category, presence: true, inclusion: { in: CATEGORIES }
+
+    validates :from, presence: true, email: true
+    validates :subject, presence: true
+    validates :body, presence: true
+
+    if EffectiveEvents.use_effective_email_templates
+      validates :body, liquid: true
+      validates :subject, liquid: true
+    end
+
+    # validates :reminder, if: -> { reminder? || upcoming_reminder? || before_event_ends? },
+    #   presence: true, uniqueness: { scope: [:event_id, :category], message: 'already exists' }
+
+    def to_s
+      'event notification'
+    end
+
+    def email_template
+      'event_' + category.to_s.parameterize.underscore
+    end
+
+    def registrant_purchased?
+      category == 'Registrant purchased'
+    end
+
+    # def upcoming_reminder?
+    #   category == 'Upcoming reminder'
+    # end
+
+    # def event_start?
+    #   category == 'When event starts'
+    # end
+
+    # def reminder?
+    #   category == 'Reminder'
+    # end
+
+    # def before_event_ends?
+    #   category == 'Before event ends'
+    # end
+
+    # def event_end?
+    #   category == 'When event ends'
+    # end
+
+    # def notifiable?
+    #   started_at.blank? && completed_at.blank?
+    # end
+
+    def notify_now?
+      true
+
+      #return false unless notifiable?
+
+      # case category
+      # when 'When event starts'
+      #   event.available?
+      # when 'When event ends'
+      #   event.ended?
+      # when 'Upcoming reminder'
+      #   !event.started? && event.start_at < (Time.zone.now + reminder)
+      # when 'Reminder'
+      #   !event.ended? && event.start_at < (Time.zone.now - reminder)
+      # when 'Before event ends'
+      #   !event.ended? && event.end_at.present? && event.end_at < (Time.zone.now + reminder)
+      # else
+      #   raise('unexpected category')
+      # end
+    end
+
+    def notify!(force: false, event_registrants: nil)
+      return false unless (notify_now? || force)
+
+      # We send one email to each registrant
+      event_registrants ||= event.event_registrants.purchased
+
+      update_column(:started_at, Time.zone.now)
+
+      opts = { from: from, subject: subject, body: body }
+
+      event_registrants.each do |event_registrant|
+        EffectiveEvents.send_email(email_template, event_registrant, opts)
+      end
+
+      update_column(:completed_at, Time.zone.now)
+    end
+
+  end
+end

data/app/models/effective/event_product.rb

@@ -4,8 +4,8 @@ module Effective
   class EventProduct < ActiveRecord::Base
     belongs_to :event
 
-    has_many :event_purchases
-    has_many :purchased_event_purchases, -> { EventPurchase.purchased }, class_name: 'Effective::EventPurchase'
+    has_many :event_addons
+    has_many :purchased_event_addons, -> { EventAddon.purchased }, class_name: 'Effective::EventAddon'
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -28,7 +28,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:position) }
-    scope :deep, -> { with_rich_text_body.includes(:purchased_event_purchases) }
+    scope :deep, -> { with_rich_text_body.includes(:purchased_event_addons) }
 
     scope :archived, -> { where(archived: true) }
     scope :unarchived, -> { where(archived: false) }
@@ -56,11 +56,11 @@ module Effective
 
     def capacity_available
       return nil if capacity.blank?
-      [(capacity - purchased_event_purchases_count), 0].max
+      [(capacity - purchased_event_addons_count), 0].max
     end
 
-    def purchased_event_purchases_count
-      purchased_event_purchases.length
+    def purchased_event_addons_count
+      purchased_event_addons.length
     end
 
   end

data/app/models/effective/event_registrant.rb

@@ -58,6 +58,10 @@ module Effective
       "#{event_ticket} - #{last_first_name}"
     end
 
+    def name
+      "#{first_name} #{last_name}"
+    end
+
     def last_first_name
       "#{last_name}, #{first_name}"
     end

data/app/views/admin/{event_purchases → event_addons}/_form.html.haml

@@ -1,4 +1,4 @@
-= effective_form_with(model: [:admin, event_purchase], engine: true) do |f|
+= effective_form_with(model: [:admin, event_addon], engine: true) do |f|
   = f.hidden_field :event_id
 
   - if f.object.new_record?
@@ -6,7 +6,7 @@
   - else
     = f.static_field :owner
 
-  = render 'effective/event_purchases/fields', f: f, event: event_purchase.event
+  = render 'effective/event_addons/fields', f: f, event: event_addon.event
 
   - if f.object.new_record?
     = f.submit 'Save and Mark Paid'

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

@@ -0,0 +1,44 @@
+= effective_form_with(model: [:admin, event_notification], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :event_id
+  - else
+    = f.select :event_id, Effective::Event.sorted.all
+
+  = f.select :category, Effective::EventNotification::CATEGORIES,
+    label: 'Send an email notification'
+
+  - # Render email templates
+  - Effective::EventNotification::CATEGORIES.each do |category|
+    - template = 'event_' + category.parameterize.underscore
+
+    = f.show_if :category, category do
+      = render "/admin/event_notifications/form_#{template}", f: f
+
+      - if f.object.category == category && f.object.persisted?
+        = f.text_field :from
+        = f.text_field :subject
+        = f.text_area :body, rows: 10
+
+      - elsif EffectiveEvents.use_effective_email_templates == false
+        = f.text_field :from, value: EffectiveResources.mailer_sender
+        = f.text_field :subject, value: ''
+        = f.text_area :body, rows: 10, value: ''
+
+      - else
+        - email_template = Effective::EmailTemplate.where(template_name: template).first!
+
+        = f.text_field :from, value: email_template.from
+        = f.text_field :subject, value: email_template.subject
+        = f.text_area :body, rows: 10, value: email_template.body
+
+      - if EffectiveEvents.use_effective_email_templates
+
+        %p The available variables are:
+
+        %ul
+          - Effective::EventNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
+            %li {{ #{variable} }}
+
+        %small.text-muted Only a developer can add additional variables
+
+  = effective_submit(f)

data/app/views/admin/event_notifications/_form_event_registrant_purchased.html.haml

@@ -0,0 +1,3 @@
+.alert.alert-warning
+  %strong When registrant purchased
+  notifications will be sent to each registrant at time of purchase.

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

@@ -2,11 +2,14 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
-  = f.number_field :capacity, hint: 'The number of online purchases will be limited to capacity.'
-  = f.check_box :archived, label: 'Yes, archive this product and make it unavailable for purchase'
+  = f.number_field :capacity, hint: 'The number of addons will be limited to this capacity. Leave blank for unlimited capacity.'
 
-  = f.price_field :price
-  = f.text_field :qb_item_name, label: 'Quickbooks item name'
+  = f.price_field :price, hint: 'A price of $0 will allow a checkout for free.'
   = f.check_box :tax_exempt
 
+  - if defined?(EffectiveQbSync)
+    = f.text_field :qb_item_name, label: 'QuickBooks item name'
+
+  = f.check_box :archived, label: 'Archive this product. It will be unavailable for purchase.'
+
   = effective_submit(f)

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

@@ -2,13 +2,15 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
-  = f.number_field :capacity, hint: 'The number of online purchases will be limited to capacity.'
-  = f.check_box :archived, label: 'Yes, archive this ticket and make it unavailable for purchase'
+  = f.number_field :capacity, hint: 'The number of registrations will be limited to capacity. Leave blank for unlimited capacity.'
 
-  = f.price_field :regular_price
-  = f.price_field :early_bird_price
-  = f.text_field :qb_item_name, label: 'Quickbooks item name'
+  = f.price_field :regular_price, hint: 'A price of $0 will allow a checkout for free.'
+  = f.price_field :early_bird_price, hint: 'A price of $0 will allow a checkout for free.'
   = f.check_box :tax_exempt
 
+  - if defined?(EffectiveQbSync)
+    = f.text_field :qb_item_name, label: 'QuickBooks item name'
+
+  = f.check_box :archived, label: 'Archive this ticket. It will be unavailable for purchase.'
 
   = effective_submit(f)

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

@@ -7,8 +7,6 @@
       = render '/admin/events/form_content', event: event
 
     = tab 'Tickets' do
-      %p An event must have tickets before registration can begin
-
       %h2 Tickets
       - datatable = Admin::EffectiveEventTicketsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
@@ -18,6 +16,12 @@
       - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
+    = 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)
+
     = tab 'Registrations' do
       %h2 Registrations
       - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
@@ -28,9 +32,10 @@
       - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
 
-      %h2 Purchases
-      - datatable = Admin::EffectiveEventPurchasesDatatable.new(event_id: event.id)
-      = render_inline_datatable(datatable)
+    = tab 'Add-ons' do
+      %h2 Add-ons
+      - datatable = Admin::EffectiveEventAddonsDatatable.new(event_id: event.id)
+      .mb-4= render_inline_datatable(datatable)
 
     = tab 'Wizard' do
       = render '/admin/events/form_event_registration_content', event: event

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

@@ -0,0 +1,8 @@
+.card.mb-4
+  .card-body
+    - if f.object.purchased?
+      = f.static_field :event_product, label: 'Purchased event add-ons'
+    - else
+      = f.select :event_product_id, effective_events_event_products_collection(event), label: false
+
+    -# = f.text_area :notes, label: 'Notes'

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

@@ -1,11 +1,9 @@
-.card
+.card.mb-4
   .card-body
-    %h5.card-title Event Registrant
-
     - if f.object.purchased?
-      = f.static_field :event_ticket, label: 'Purchased event ticket'
+      = f.static_field :event_ticket, label: 'Purchased ticket'
     - else
-      = f.select :event_ticket_id, effective_events_event_tickets_collection(event)
+      = f.select :event_ticket_id, effective_events_event_tickets_collection(event), label: 'Ticket'
 
     .row
       .col-lg= f.text_field :first_name

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

@@ -0,0 +1,9 @@
+= card do
+  .row
+    .col-sm
+      %h5.card-title= event_registration.wizard_step_title(:addons)
+    .col-sm-auto.text-right
+      = link_to('Edit', wizard_path(:addons)) if edit_effective_event_registrations_wizard?
+
+  - datatable = EffectiveEventAddonsDatatable.new(event_registration: event_registration)
+  .mb-4= render_simple_datatable(datatable)

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

@@ -2,9 +2,9 @@
 - step_content = resource.event&.send("rich_text_#{step}_content")
 
 - if all_steps_content.present?
-  .card
+  .card.mb-4
     .card-body= all_steps_content
 
 - if step_content.present?
-  .card
+  .card.mb-4
     .card-body= step_content

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

@@ -17,7 +17,7 @@
     = link_to('Abandon registration', effective_events.event_event_registration_path(registration.event, registration), 'data-confirm': "Really delete #{registration}?", 'data-method': :delete, class: 'btn btn-danger')
     to register for another event.
 
-    %hr
+  %hr
 
 %h2 Event Registrations
 

data/app/views/effective/event_registrations/{_registrants.html.haml → _tickets.haml}

@@ -1,9 +1,9 @@
 = card do
   .row
     .col-sm
-      %h5.card-title= event_registration.wizard_step_title(:registrants)
+      %h5.card-title= event_registration.wizard_step_title(:tickets)
     .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:registrants)) if edit_effective_event_registrations_wizard?
+      = link_to('Edit', wizard_path(:tickets)) if edit_effective_event_registrations_wizard?
 
   - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
   .mb-4= render_simple_datatable(datatable)

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

@@ -0,0 +1,19 @@
+= render 'layout' do
+  .card.mb-4
+    .card-body
+      %p
+        Add-ons are free or paid additional items that can be included in your registration.
+        %br
+        If you are registering for multiple people, you need to include an add-on for each person.
+
+  = 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
+
+        = f.has_many :event_addons do |fp|
+          = render('effective/event_addons/fields', f: fp, event: f.object.event)
+
+        = f.save 'Save and Continue'

data/app/views/effective/event_registrations/{registrants.html.haml → tickets.haml}

@@ -3,8 +3,6 @@
 
   .card
     .card-body
-      %p Please add one or more registrant.
-
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 

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

@@ -2,12 +2,6 @@
 
 - upcoming = Effective::Event.events(user: current_user).upcoming.count
 
-%p
-  - if upcoming == 1
-    There is 1 upcoming event.
-  - else
-    There are #{upcoming} upcoming events.
-
 - datatable = EffectiveEventsDatatable.new(self, namespace: :effective)
 = render_datatable(datatable, simple: true)
 

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

@@ -1,5 +1,5 @@
 .effective-event
-  %table.table.effective-events-table
+  %table.table.effective-event-table
     %tbody
       %tr
         %td Starts

data/app/views/effective/events_mailer/event_registrant_purchased.liquid

@@ -0,0 +1,17 @@
+---
+subject: 'You have been registered for {{ event.title }}'
+from: 'admin@example.com'
+---
+Hello {{ registrant.name }},
+
+Your ticket {{ ticket.name }} has been purchased.
+
+You are registered for {{ event.name }}
+
+The event starts on {{ event.date }}
+
+{{ event.url }}
+
+Thank you.
+
+Please contact us for assistance.

data/config/effective_events.rb

@@ -3,7 +3,7 @@ EffectiveEvents.setup do |config|
   config.event_tickets_table_name = :event_tickets
   config.event_products_table_name = :event_products
   config.event_registrants_table_name = :event_registrants
-  config.event_purchases_table_name = :event_purchases
+  config.event_addons_table_name = :event_addons
   config.event_registrations_table_name = :event_registrations
 
   # Layout Settings
@@ -13,7 +13,20 @@ EffectiveEvents.setup do |config|
   # Event Settings
   # config.event_registrations_class_name = 'Effective::EventRegistration'
 
+  # Pagination length on the Events#index page
   config.per_page = 10
 
+  # Events can be restricted by role
   config.use_effective_roles = true
+
+  # Mailer Configuration
+  #
+  # Additional mailer settings for parent_mailer, delivery_method, layout, sender and admin
+  # are required fields in config/initializers/effective_resources.rb
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Effective::EventsMailer'
+
+  # Use effective email templates for event notifications
+  config.use_effective_email_templates = true
 end

data/config/routes.rb

@@ -19,8 +19,9 @@ EffectiveEvents::Engine.routes.draw do
     resources :event_tickets, except: [:show]
     resources :event_products, except: [:show]
     resources :event_registrants, except: [:show]
-    resources :event_purchases, except: [:show]
+    resources :event_addons, except: [:show]
     resources :event_registrations, only: [:index, :show]
+    resources :event_notifications, except: [:show]
   end
 
 end

data/db/migrate/01_create_effective_events.rb.erb

@@ -14,7 +14,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :early_bird_end_at
 
       t.integer :event_registrants_count, default: 0
-      t.integer :event_purchases_count, default: 0
+      t.integer :event_addons_count, default: 0
 
       t.integer :roles_mask
       t.boolean :authenticate_user, default: false
@@ -84,7 +84,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @event_purchases_table_name %> do |t|
+    create_table <%= @event_addons_table_name %> do |t|
       t.integer :event_id
       t.integer :event_product_id
 
@@ -131,5 +131,22 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
     add_index <%= @event_registrations_table_name %>, :status
     add_index <%= @event_registrations_table_name %>, :token
 
+    create_table <%= @event_notifications_table_name %> do |t|
+      t.references :event
+
+      t.string :category
+      t.integer :reminder
+
+      t.string :from
+      t.string :subject
+      t.text :body
+
+      t.datetime :started_at
+      t.datetime :completed_at
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
   end
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/effective_events.rb

@@ -7,9 +7,10 @@ module EffectiveEvents
   def self.config_keys
     [
       :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
-      :event_registrations_table_name, :event_products_table_name, :event_purchases_table_name,
+      :event_registrations_table_name, :event_products_table_name, :event_addons_table_name,
       :layout, :per_page, :use_effective_roles,
-      :event_registration_class_name
+      :event_registration_class_name,
+      :mailer, :use_effective_email_templates
     ]
   end
 
@@ -19,4 +20,8 @@ module EffectiveEvents
     event_registration_class_name&.constantize || Effective::EventRegistration
   end
 
+  def self.mailer_class
+    mailer&.constantize || Effective::EventsMailer
+  end
+
 end

data/lib/generators/effective_events/install_generator.rb

@@ -22,7 +22,7 @@ module EffectiveEvents
       def create_migration_file
         @events_table_name  = ':' + EffectiveEvents.events_table_name.to_s
         @event_products_table_name  = ':' + EffectiveEvents.event_products_table_name.to_s
-        @event_purchases_table_name  = ':' + EffectiveEvents.event_purchases_table_name.to_s
+        @event_addons_table_name  = ':' + EffectiveEvents.event_addons_table_name.to_s
         @event_registrants_table_name  = ':' + EffectiveEvents.event_registrants_table_name.to_s
         @event_registrations_table_name  = ':' + EffectiveEvents.event_registrations_table_name.to_s
         @event_tickets_table_name = ':' + EffectiveEvents.event_tickets_table_name.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_email_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Event registrations, tickets and products
 email:
 - info@codeandeffect.com
@@ -179,34 +193,40 @@ files:
 - app/assets/javascripts/effective_events/base.js
 - app/assets/stylesheets/effective_events.scss
 - app/assets/stylesheets/effective_events/base.scss
+- app/controllers/admin/event_addons_controller.rb
+- app/controllers/admin/event_notifications_controller.rb
 - app/controllers/admin/event_products_controller.rb
-- app/controllers/admin/event_purchases_controller.rb
 - app/controllers/admin/event_registrants_controller.rb
 - app/controllers/admin/event_registrations_controller.rb
 - app/controllers/admin/event_tickets_controller.rb
 - app/controllers/admin/events_controller.rb
 - app/controllers/effective/event_registrations_controller.rb
 - app/controllers/effective/events_controller.rb
+- app/datatables/admin/effective_event_addons_datatable.rb
+- app/datatables/admin/effective_event_notifications_datatable.rb
 - app/datatables/admin/effective_event_products_datatable.rb
-- app/datatables/admin/effective_event_purchases_datatable.rb
 - app/datatables/admin/effective_event_registrants_datatable.rb
 - app/datatables/admin/effective_event_registrations_datatable.rb
 - app/datatables/admin/effective_event_tickets_datatable.rb
 - app/datatables/admin/effective_events_datatable.rb
-- app/datatables/effective_event_purchases_datatable.rb
+- app/datatables/effective_event_addons_datatable.rb
 - app/datatables/effective_event_registrants_datatable.rb
 - app/datatables/effective_event_registrations_datatable.rb
 - app/datatables/effective_events_datatable.rb
 - app/helpers/effective_events_helper.rb
+- app/mailers/effective/events_mailer.rb
 - app/models/concerns/effective_events_event_registration.rb
 - app/models/effective/event.rb
+- app/models/effective/event_addon.rb
+- app/models/effective/event_notification.rb
 - app/models/effective/event_product.rb
-- app/models/effective/event_purchase.rb
 - app/models/effective/event_registrant.rb
 - app/models/effective/event_registration.rb
 - app/models/effective/event_ticket.rb
+- app/views/admin/event_addons/_form.html.haml
+- app/views/admin/event_notifications/_form.html.haml
+- app/views/admin/event_notifications/_form_event_registrant_purchased.html.haml
 - app/views/admin/event_products/_form.html.haml
-- app/views/admin/event_purchases/_form.html.haml
 - app/views/admin/event_registrants/_form.html.haml
 - app/views/admin/event_tickets/_form.html.haml
 - app/views/admin/events/_form.html.haml
@@ -214,29 +234,30 @@ files:
 - app/views/admin/events/_form_content.html.haml
 - app/views/admin/events/_form_event.html.haml
 - app/views/admin/events/_form_event_registration_content.html.haml
-- app/views/effective/event_purchases/_fields.html.haml
+- app/views/effective/event_addons/_fields.html.haml
 - app/views/effective/event_registrants/_fields.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/_event_registration.html.haml
 - app/views/effective/event_registrations/_layout.html.haml
 - app/views/effective/event_registrations/_orders.html.haml
-- app/views/effective/event_registrations/_purchases.html.haml
-- app/views/effective/event_registrations/_registrants.html.haml
 - app/views/effective/event_registrations/_summary.html.haml
+- app/views/effective/event_registrations/_tickets.haml
+- app/views/effective/event_registrations/addons.html.haml
 - app/views/effective/event_registrations/billing.html.haml
 - app/views/effective/event_registrations/checkout.html.haml
-- app/views/effective/event_registrations/purchases.html.haml
-- app/views/effective/event_registrations/registrants.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
+- app/views/effective/event_registrations/tickets.haml
 - app/views/effective/events/_dashboard.html.haml
 - app/views/effective/events/_event.html.haml
 - app/views/effective/events/_layout.html.haml
 - app/views/effective/events/_spacer.html.haml
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
+- app/views/effective/events_mailer/event_registrant_purchased.liquid
 - config/effective_events.rb
 - config/routes.rb
 - db/migrate/01_create_effective_events.rb.erb

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

@@ -1,10 +0,0 @@
-.card
-  .card-body
-    %h5.card-title Event Purchase
-
-    - if f.object.purchased?
-      = f.static_field :event_product, label: 'Purchased event product'
-    - else
-      = f.select :event_product_id, effective_events_event_products_collection(event)
-
-    = f.text_area :notes, label: 'Notes'

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

@@ -1,9 +0,0 @@
-= card do
-  .row
-    .col-sm
-      %h5.card-title= event_registration.wizard_step_title(:purchases)
-    .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:purchases)) if edit_effective_event_registrations_wizard?
-
-  - datatable = EffectiveEventPurchasesDatatable.new(event_registration: event_registration)
-  .mb-4= render_simple_datatable(datatable)

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

@@ -1,14 +0,0 @@
-= render 'layout' do
-  = render 'effective/event_registrations/content', resource: resource
-
-  .card
-    .card-body
-      %p Please add one or more products.
-
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
-
-        = f.has_many :event_purchases do |fp|
-          = render('effective/event_purchases/fields', f: fp, event: f.object.event)
-
-        = f.save 'Save and Continue'