effective_events 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46897bd3260153bd17103b73716d32aca3b46d77335c9c8ac80b033ac881041b
-  data.tar.gz: 7da214c575b80246b79edc8c8c0467352e7629dea228a809db80a4c8fc53f14a
+  metadata.gz: 57f83ae2c7ff0c516e104fe18d4f517838bc07eec2a3d10b939946d0c9ed97d6
+  data.tar.gz: 0f5b5cca100cbfc4820940cca910c8cb07e14107227a753135ee5464eecd9611
 SHA512:
-  metadata.gz: cd8c3c426638f64c649408ea2da9ce57a5965c33c33aafde8255327b8c2eecf01ff0e8077b73d772575045e38e86f4648cdf79661f0b44d2d083e3ebab92a3e8
-  data.tar.gz: 4331ea43140b17dce1a0c0850688cf7b57627df10dbefde960d64fdf7cba63d63f3a285f79141a4c73a23f0941dc3f94632f5e1445201fbf0a97eac24c7c26f7
+  metadata.gz: 33e99c1640263a789ff5c26653eb237110163f45d79726bd39a49412ac3e3fa43cda22ca888d02e07ce306e49393c438721c8bc704937a724146d26370870d8f
+  data.tar.gz: 3b9dedff99f782f3e88fffe9080665607c47ee8933ca0c66a58c9ef45448e5a18db05c21abf3052148dc073bba61b82907845c03982fab48942c94b34d75761f

data/README.md

@@ -68,10 +68,34 @@ All authorization checks are handled via the effective_resources gem found in th
 The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
-can :index, Effective::Event
+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::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? }
 
 if user.admin?
-  can :manage, Effective::Event
+  can :admin, :effective_events
+
+  can(crud - [:destroy], Effective::Event)
+  can(:destroy, Effective::Event) { |et| et.event_registrants_count == 0 }
+
+  can(crud - [:destroy], Effective::EventRegistrant)
+  can(:mark_paid, Effective::EventRegistrant) { |er| !er.event_registration_id.present? }
+  can(:destroy, Effective::EventRegistrant) { |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_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/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_products_datatable.rb

@@ -12,11 +12,20 @@ module Admin
       col :title
       col :price, as: :price
 
-      #col :capacity
-      col :purchased_event_purchases_count, label: 'Purchased'
+      col :archived
 
-      col :purchased_event_purchases, label: 'Purchased by' do |product|
-        product.purchased_event_purchases.sort_by(&:to_s).map do |purchase|
+      col :capacity_to_s, label: 'Capacity' do |ticket|
+        if ticket.capacity.present?
+          "#{ticket.capacity_available} remaining / #{ticket.capacity} total"
+        end
+      end
+
+      col :purchased_event_addons_count, label: 'Purchased'
+      col :capacity, visible: false
+      col :capacity_available, visible: false
+
+      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_event_tickets_datatable.rb

@@ -13,8 +13,17 @@ module Admin
       col :regular_price, as: :price
       col :early_bird_price, as: :price
 
-      #col :capacity
+      col :archived
+
+      col :capacity_to_s, label: 'Capacity' do |ticket|
+        if ticket.capacity.present?
+          "#{ticket.capacity_available} remaining / #{ticket.capacity} total"
+        end
+      end
+
       col :purchased_event_registrants_count, label: 'Registered'
+      col :capacity, visible: false
+      col :capacity_available, visible: false
 
       col :purchased_event_registrants, label: 'Registrants' do |ticket|
         ticket.purchased_event_registrants.sort_by(&:last_name).map do |registrant|

data/app/datatables/admin/effective_events_datatable.rb

@@ -15,14 +15,13 @@ module Admin
 
       col :title
       col :draft
-      col :start_at, label: 'Event Date'
-
-      col :end_at, visible: false
+      col :start_at, label: 'Event Start Date'
+      col :end_at, label: 'Event End Date', visible: false
       col :excerpt, visible: false
 
-      col :registration_start_at, label: 'Registration opens'
-      col :registration_end_at, label: 'Registration closes'
-      col :early_bird_end_at, label: 'Early bird ends'
+      col :registration_start_at, label: 'Registration opens', visible: false
+      col :registration_end_at, label: 'Registration closes', visible: false
+      col :early_bird_end_at, label: 'Early bird ends', visible: false
 
       col :early_bird do |event|
         if event.early_bird?
@@ -33,7 +32,9 @@ module Admin
       end
 
       col :event_tickets, search: :string
+      col :event_products, search: :string
       col :event_registrants, 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

@@ -16,7 +16,8 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
 
     col :owner, visible: false, search: :string
     col :status, visible: false
-    col :event_registrants, search: :string
+    col :event_registrants, label: 'Registrants', 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/helpers/effective_events_helper.rb

@@ -3,22 +3,30 @@ module EffectiveEventsHelper
   def effective_events_event_tickets_collection(event)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_tickets.map do |ticket|
-      label = ticket.to_s
+    event.event_tickets.reject(&:archived?).map do |ticket|
+      title = ticket.to_s
       price = (ticket.price == 0 ? '$0' : price_to_currency(ticket.price))
+      remaining = (ticket.capacity.present? ? "#{ticket.capacity_available} remaining" : nil)
 
-      ["#{label} - #{price}", ticket.to_param]
+      label = [title, price, remaining].compact.join(' - ')
+      disabled = { disabled: :disabled } unless ticket.available?
+
+      [label, ticket.to_param, disabled].compact
     end
   end
 
   def effective_events_event_products_collection(event)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_products.map do |product|
-      label = product.to_s
+    event.event_products.reject(&:archived?).map do |product|
+      title = product.to_s
       price = (product.price == 0 ? '$0' : price_to_currency(product.price))
+      remaining = (product.capacity.present? ? "#{product.capacity_available} remaining" : nil)
+
+      label = [title, price, remaining].compact.join(' - ')
+      disabled = { disabled: :disabled } unless product.available?
 
-      ["#{label} - #{price}", product.to_param]
+      [label, product.to_param, disabled].compact
     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,18 +91,31 @@ 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
 
+    # Validate all items are available
+    validate(unless: -> { current_step == :checkout || done? }) do
+      event_registrants.reject { |er| er.purchased? || er.event_ticket&.available? }.each do |item|
+        errors.add(:base, "The #{item.event_ticket} ticket is sold out and no longer available for purchase")
+        item.errors.add(:event_ticket_id, "#{item.event_ticket} is unavailable for purchase")
+      end
+
+      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
+    end
+
     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
 
   end
@@ -121,9 +134,15 @@ module EffectiveEventsEventRegistration
   end
 
   # Find or build
-  def event_registrant(first_name:, last_name:, email:)
-    registrant = event_registrants.find { |er| er.first_name == first_name && er.last_name == last_name && er.email == email }
-    registrant || event_registrants.build(event: event, owner: owner, first_name: first_name, last_name: last_name, email: email)
+  def event_registrant(event_ticket:, first_name:, last_name:, email:)
+    registrant = event_registrants.find { |er| er.event_ticket == event_ticket && er.first_name == first_name && er.last_name == last_name && er.email == email }
+    registrant || event_registrants.build(event: event, event_ticket: event_ticket, owner: owner, first_name: first_name, last_name: last_name, email: email)
+  end
+
+  # Find or build. But it's not gonna work with more than 1. This is for testing only really.
+  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

@@ -11,8 +11,8 @@ module Effective
     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
 
     # rich_text_body - Used by the select step
     has_many_rich_texts
@@ -149,12 +149,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_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)
 
@@ -22,12 +22,16 @@ module Effective
       tax_exempt            :boolean
 
       position              :integer
+      archived              :boolean
 
       timestamps
     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) }
 
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_products.map(&:position).compact.max || -1) + 1
@@ -40,13 +44,23 @@ module Effective
       title.presence || 'New Event Product'
     end
 
+    # Available for purchase
+    def available?
+      return false if archived?
+      capacity_available?
+    end
+
     def capacity_available?
-      return true if capacity.blank?
-      capacity <= purchased_event_purchases.count
+      capacity.blank? || (capacity_available > 0)
+    end
+
+    def capacity_available
+      return nil if capacity.blank?
+      [(capacity - purchased_event_addons_count), 0].max
     end
 
-    def purchased_event_purchases_count
-      purchased_event_purchases.count
+    def purchased_event_addons_count
+      purchased_event_addons.length
     end
 
   end

data/app/models/effective/event_ticket.rb

@@ -23,6 +23,7 @@ module Effective
       tax_exempt            :boolean
 
       position              :integer
+      archived              :boolean
 
       timestamps
     end
@@ -30,6 +31,9 @@ module Effective
     scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(:purchased_event_registrants) }
 
+    scope :archived, -> { where(archived: true) }
+    scope :unarchived, -> { where(archived: false) }
+
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_tickets.map(&:position).compact.max || -1) + 1
     end
@@ -46,13 +50,23 @@ module Effective
       event.early_bird? ? early_bird_price : regular_price
     end
 
+    # Available for purchase
+    def available?
+      return false if archived?
+      capacity_available?
+    end
+
     def capacity_available?
-      return true if capacity.blank?
-      capacity <= purchased_event_registrants.count
+      capacity.blank? || (capacity_available > 0)
+    end
+
+    def capacity_available
+      return nil if capacity.blank?
+      [(capacity - purchased_event_registrants_count), 0].max
     end
 
     def purchased_event_registrants_count
-      purchased_event_registrants.count
+      purchased_event_registrants.length
     end
 
   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_products/_form.html.haml

@@ -2,8 +2,14 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
-  = f.price_field :price
-  = f.text_field :qb_item_name
+  = f.number_field :capacity, hint: 'The number of addons will be limited to this capacity. Leave blank for unlimited capacity.'
+
+  = 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,10 +2,15 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
-  = f.price_field :regular_price
-  = f.price_field :early_bird_price
-  = f.text_field :qb_item_name
+  = f.number_field :capacity, hint: 'The number of registrations will be limited to capacity. Leave blank for unlimited capacity.'
+
+  = 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
-  /= f.number_field :capacity, hint: 'The number of online purchases will be loosely limited to capacity.'
+
+  - 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)
@@ -28,9 +26,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/_summary.html.haml

@@ -1,29 +1,26 @@
-.card
-  .card-body
-    %h5 Event Registration
+= card('Event Registration') do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %th.border-0 Event
+        %td.border-0
+          = link_to(event_registration.event, effective_events.event_path(event_registration.event))
 
-    %table.table.table-sm
-      %tbody
+      - if request.path.start_with?('/admin')
         %tr
-          %th.border-0 Event
-          %td.border-0
-            = link_to(event_registration.event, effective_events.event_path(event_registration.event))
-
-        - if request.path.start_with?('/admin')
-          %tr
-            %th Registered by
-            %td
-              - url = (polymorphic_admin_path(event_registration.owner) rescue "/admin/users/#{event_registration.owner.to_param}/edit")
-              = link_to(event_registration.owner, url)
-        - else
-          %tr
-            %th Registered by
-            %td= event_registration.owner
+          %th Registered by
+          %td
+            - url = (polymorphic_admin_path(event_registration.owner) rescue "/admin/users/#{event_registration.owner.to_param}/edit")
+            = link_to(event_registration.owner, url)
+      - else
+        %tr
+          %th Registered by
+          %td= event_registration.owner
 
 
-        - if event_registration.orders.present?
-          %tr
-            %th Order
-            %td
-              - event_registration.orders.each do |order|
-                = link_to(order, effective_orders.order_path(order))
+      - if event_registration.orders.present?
+        %tr
+          %th Order
+          %td
+            - event_registration.orders.each do |order|
+              = link_to(order, effective_orders.order_path(order))

data/app/views/effective/event_registrations/_tickets.haml

@@ -0,0 +1,9 @@
+= card do
+  .row
+    .col-sm
+      %h5.card-title= event_registration.wizard_step_title(:tickets)
+    .col-sm-auto.text-right
+      = 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/billing.html.haml

@@ -3,12 +3,13 @@
 
   - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card('Billing Address') do
+    %p Please enter your billing address
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = effective_address_fields(fu, :billing)
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.save 'Save and Continue'
+      = f.fields_for(:owner, f.object.owner) do |fu|
+        = effective_address_fields(fu, :billing)
+
+      = 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/config/effective_events.rb

@@ -1,7 +1,9 @@
 EffectiveEvents.setup do |config|
   config.events_table_name = :events
   config.event_tickets_table_name = :event_tickets
+  config.event_products_table_name = :event_products
   config.event_registrants_table_name = :event_registrants
+  config.event_addons_table_name = :event_addons
   config.event_registrations_table_name = :event_registrations
 
   # Layout Settings
@@ -11,7 +13,9 @@ 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
 end

data/config/routes.rb

@@ -19,7 +19,7 @@ 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]
   end
 

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

@@ -1,6 +1,6 @@
 class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
   def change
-    create_table :events do |t|
+    create_table <%= @events_table_name %> do |t|
       t.string :title
 
       t.string :slug
@@ -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
@@ -22,10 +22,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    add_index :events, :title
-    add_index :events, :end_at
+    add_index <%= @events_table_name %>, :title
+    add_index <%= @events_table_name %>, :end_at
 
-    create_table :event_tickets do |t|
+    create_table <%= @event_tickets_table_name %> do |t|
       t.integer :event_id
 
       t.string :title
@@ -38,11 +38,12 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :tax_exempt, default: false
 
       t.integer :position
+      t.boolean :archived, default: false
 
       t.timestamps
     end
 
-    create_table :event_registrants do |t|
+    create_table <%= @event_registrants_table_name %> do |t|
       t.integer :event_id
       t.integer :event_ticket_id
 
@@ -66,7 +67,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_products do |t|
+    create_table <%= @event_products_table_name %> do |t|
       t.integer :event_id
 
       t.string :title
@@ -78,11 +79,12 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :tax_exempt, default: false
 
       t.integer :position
+      t.boolean :archived, default: false
 
       t.timestamps
     end
 
-    create_table :event_purchases do |t|
+    create_table <%= @event_addons_table_name %> do |t|
       t.integer :event_id
       t.integer :event_product_id
 
@@ -100,7 +102,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_registrations do |t|
+    create_table <%= @event_registrations_table_name %> do |t|
       t.string :token
 
       t.integer :event_id
@@ -125,9 +127,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :event_registrations, [:owner_id, :owner_type]
-    add_index :event_registrations, :status
-    add_index :event_registrations, :token
+    add_index <%= @event_registrations_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @event_registrations_table_name %>, :status
+    add_index <%= @event_registrations_table_name %>, :token
 
   end
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.9'.freeze
 end

data/lib/effective_events.rb

@@ -6,7 +6,8 @@ module EffectiveEvents
 
   def self.config_keys
     [
-      :events_table_name, :event_registrants_table_name, :event_tickets_table_name, :event_registrations_table_name,
+      :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
+      :event_registrations_table_name, :event_products_table_name, :event_addons_table_name,
       :layout, :per_page, :use_effective_roles,
       :event_registration_class_name
     ]

data/lib/generators/effective_events/install_generator.rb

@@ -21,6 +21,11 @@ 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_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
 
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_events.rb.erb', 'db/migrate/create_effective_events.rb'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,34 +179,34 @@ 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_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_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/models/concerns/effective_events_event_registration.rb
 - app/models/effective/event.rb
+- app/models/effective/event_addon.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_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,23 +214,23 @@ 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

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,10 +0,0 @@
-.card
-  .card-body
-    .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/_registrants.html.haml

@@ -1,10 +0,0 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= event_registration.wizard_step_title(:registrants)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:registrants)) 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/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'