effective_events 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a6d166ba053eb00016f2ea09e4f9fe64ebf8e2ddd3778261553891f664b81b
-  data.tar.gz: ebb4c682a522a196dcc9714cacd50cfb9cac974e8f92b3412fca65ea7a470f7c
+  metadata.gz: 44c51f928a7db75214d362f3809a5249cdebb8a22e9239f5cc74e0ea19db958b
+  data.tar.gz: '099acc31c59746278f78b679b6605430f128f40fa22bfe441c92c84cff974e15'
 SHA512:
-  metadata.gz: c44d5e9c255466984eda2b7470f7690810982d176ca4ef8c6c29225c3703ceb25d6c263e9ebc7792aa710450a54ad0370899a5295182665743e725ebe1d6b2c4
-  data.tar.gz: 726518bd5c9fb10b52d4d1b92d03ff1ca7f08a8c474b0494fbc6c55cf4da9d573dbd43d13905076305415f0208a6ea17a9c0a42e4332fe1a4884e2103d5c9397
+  metadata.gz: 623603bcfb7c8ad11228d10a6526c1799c92482fb57e0b258ff43d75c39f40d014a3449946edd11d745026987d62f5da7739667bfc5b2f427acb348341edac17
+  data.tar.gz: 8eac487ea782b237e1efb89163c799a0f95224f5682d82e08ad4d16930b0e0f953ba7ab6f7f9b8f5e44ad9b82443adbdb29786145bd1ce16f0a1062b762bf1d0

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_addons_controller.rb

@@ -0,0 +1,10 @@
+module Admin
+  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_products_controller.rb

@@ -0,0 +1,8 @@
+module Admin
+  class EventProductsController < 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

@@ -40,9 +40,7 @@ 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
-      )
+      params.require(model).permit!.except(:status, :status_steps, :wizard_steps, :submitted_at)
     end
 
   end

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -0,0 +1,41 @@
+module Admin
+  class EffectiveEventAddonsDatatable < Effective::Datatable
+    datatable do
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :event
+
+      col :event_registration, visible: false
+
+      if attributes[:event_id]
+        col :event_product, search: Effective::EventProduct.where(event: event).all
+      else
+        col :event_product, search: :string
+      end
+
+      col :purchased_order
+      col :owner
+      col :notes, label: 'Notes'
+
+      actions_col
+    end
+
+    collection do
+      scope = Effective::EventAddon.deep.purchased
+
+      if attributes[:event_id].present?
+        scope = scope.where(event: event)
+      end
+
+      scope
+    end
+
+    def event
+      @event ||= if attributes[:event_id]
+        Effective::Event.find(attributes[:event_id])
+      end
+    end
+  end
+end

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -0,0 +1,50 @@
+module Admin
+  class EffectiveEventProductsDatatable < Effective::Datatable
+    datatable do
+      reorder :position
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :event
+
+      col :title
+      col :price, as: :price
+
+      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_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
+
+      actions_col
+    end
+
+    collection do
+      scope = Effective::EventProduct.deep.all
+
+      if attributes[:event_id]
+        scope = scope.where(event: event)
+      end
+
+      scope
+    end
+
+    def event
+      Effective::Event.find(attributes[:event_id])
+    end
+  end
+end

data/app/datatables/admin/effective_event_registrations_datatable.rb

@@ -9,10 +9,11 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
 
     col :submitted_at, label: 'Submitted', visible: false, as: :date
 
-    col :event
+    col :event, search: :string
     col :owner
 
     col :event_registrants, 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_addons_datatable.rb

@@ -0,0 +1,38 @@
+# Used on the Event Registrations Addons step
+
+class EffectiveEventAddonsDatatable < Effective::Datatable
+  datatable do
+
+    col :event_product, search: :string, label: 'Product'
+    col :price, as: :price
+    # col :notes
+    # no actions_col
+  end
+
+  collection do
+    scope = Effective::EventAddon.deep.all
+
+    if event.present?
+      scope = scope.where(event: event)
+    end
+
+    if event_registration.present?
+      scope = scope.where(event_registration_id: event_registration)
+    end
+
+    scope
+  end
+
+  def event
+    @event ||= if attributes[:event_id]
+      Effective::Event.find(attributes[:event_id])
+    end
+  end
+
+  def event_registration
+    @event_registration ||= if attributes[:event_registration_id]
+      EffectiveEvents.EventRegistration.find_by_id(attributes[:event_registration_id])
+    end
+  end
+
+end

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,11 +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.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, product.to_param, disabled].compact
     end
   end
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -37,12 +37,15 @@ module EffectiveEventsEventRegistration
     acts_as_wizard(
       start: 'Start',
       registrants: 'Registrants',
+      addons: 'Add-ons',
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',
       submitted: 'Submitted'
     )
 
+    acts_as_purchasable_wizard
+
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     # Application Namespace
@@ -50,11 +53,14 @@ module EffectiveEventsEventRegistration
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    belongs_to :event
+    belongs_to :event, class_name: 'Effective::Event'
 
-    has_many :event_registrants, -> { order(:id) }, inverse_of: :event_registration, dependent: :destroy
+    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_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
 
@@ -89,17 +95,29 @@ module EffectiveEventsEventRegistration
       self.errors.add(:event_registrants, "can't be blank") unless present_event_registrants.present?
     end
 
-    # Billing Step
-    validate(if: -> { current_step == :billing && owner.present? }) do
-      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
-      self.errors.add(:base, "must have an email") unless owner.email.present?
+    # 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
 
-    after_purchase do |_|
-      raise('expected submit_order to be purchased') unless submit_order&.purchased?
-      submit_purchased!
-      after_submit_purchased!
+    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 - [:addons])
     end
+
+    # All Fees and Orders
+    def submit_fees
+      (event_registrants + event_addons)
+    end
+
   end
 
   # Instance Methods
@@ -115,14 +133,16 @@ module EffectiveEventsEventRegistration
     submitted?
   end
 
-  def can_visit_step?(step)
-    can_revisit_completed_steps(step)
+  # Find or build
+  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
-  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)
+  # 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
@@ -139,90 +159,6 @@ module EffectiveEventsEventRegistration
     event_registrants
   end
 
-  # All Fees and Orders
-  def submit_fees
-    event_registrants
-  end
-
-  def submit_order
-    orders.first
-  end
-
-  def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
-
-    # Adds fees, but does not overwrite any existing price.
-    fees.each do |fee|
-      order.add(fee) unless order.purchasables.include?(fee)
-    end
-
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
-    end
-
-    # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
-
-    # Important to add/remove anything
-    order.save
-
-    order
-  end
-
-  # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
-
-    fees = submit_fees()
-    raise('already has purchased submit fees') if fees.any?(&:purchased?)
-
-    order = find_or_build_submit_order()
-    raise('already has purchased submit order') if order.purchased?
-
-    true
-  end
-
-  # If they go back and change registrants. Update the order right away.
-  def registrants!
-    save!
-    build_submit_fees_and_order if submit_order.present?
-    true
-  end
-
-  # Owner clicks on the Billing step. Next step is Checkout
-  def billing!
-    ready!
-  end
-
-  # Ready to check out
-  def ready!
-    build_submit_fees_and_order
-    save!
-  end
-
-  # Called automatically via after_purchase hook above
-  def submit_purchased!
-    return false if was_submitted?
-
-    wizard_steps[:checkout] = Time.zone.now
-    submit!
-  end
-
-  # A hook to extend
-  def after_submit_purchased!
-  end
-
-  # Draft -> Submitted requirements
-  def submit!
-    raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
-
-    wizard_steps[:checkout] ||= Time.zone.now
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
-  end
-
   private
 
   def present_event_registrants

data/app/models/effective/event.rb

@@ -2,11 +2,17 @@
 
 module Effective
   class Event < ActiveRecord::Base
+    has_many :event_tickets, -> { EventTicket.sorted }, inverse_of: :event
+    accepts_nested_attributes_for :event_tickets, allow_destroy: true
+
+    has_many :event_products, -> { EventProduct.sorted }, inverse_of: :event
+    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_tickets, -> { order(:id) }, inverse_of: :event
-    accepts_nested_attributes_for :event_tickets, 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

data/app/models/effective/event_addon.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# Just like each EventRegistration has EventTickets and EventRegistrants
+# An Event Registration has EventProducts and EventAddons
+
+module Effective
+  class EventAddon < ActiveRecord::Base
+    acts_as_purchasable
+
+    log_changes(to: :event) if respond_to?(:log_changes)
+
+    belongs_to :event, counter_cache: true
+
+    # Basically a category containing all the pricing and unique info about this product purchase
+    belongs_to :event_product
+
+    # Every event registrant is charged to a owner
+    belongs_to :owner, polymorphic: true
+
+    # This fee when checked out through the event registration
+    belongs_to :event_registration, polymorphic: true, optional: true
+
+    effective_resource do
+      notes             :text
+
+      # Acts as Purchasable
+      price             :integer
+      qb_item_name      :string
+      tax_exempt        :boolean
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:id) }
+    scope :deep, -> { all }
+
+    before_validation(if: -> { event_registration.present? }) do
+      self.event ||= event_registration.event
+      self.owner ||= event_registration.owner
+    end
+
+    before_validation(if: -> { event_product.present? }) do
+      self.price ||= event_product.price
+    end
+
+    def to_s
+      persisted? ? event_product.to_s : 'product'
+    end
+
+    def tax_exempt
+      event_product.tax_exempt
+    end
+
+    def qb_item_name
+      event_product.qb_item_name
+    end
+
+    # This is the Admin Save and Mark Paid action
+    def mark_paid!
+      raise('expected a blank event registration') if event_registration.present?
+
+      save!
+
+      order = Effective::Order.new(items: self, user: owner)
+      order.purchase!(skip_buyer_validations: true, email: false)
+
+      true
+    end
+
+  end
+end

data/app/models/effective/event_product.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Effective
+  class EventProduct < ActiveRecord::Base
+    belongs_to :event
+
+    has_many :event_addons
+    has_many :purchased_event_addons, -> { EventAddon.purchased }, class_name: 'Effective::EventAddon'
+
+    log_changes(to: :event) if respond_to?(:log_changes)
+
+    has_rich_text :body
+
+    effective_resource do
+      title                 :string
+      capacity              :integer
+
+      # Pricing
+      price                 :integer
+
+      qb_item_name          :string
+      tax_exempt            :boolean
+
+      position              :integer
+      archived              :boolean
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:position) }
+    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
+    end
+
+    validates :title, presence: true, uniqueness: { scope: [:event_id] }
+    validates :price, presence: true
+
+    def to_s
+      title.presence || 'New Event Product'
+    end
+
+    # Available for purchase
+    def available?
+      return false if archived?
+      capacity_available?
+    end
+
+    def capacity_available?
+      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_addons_count
+      purchased_event_addons.length
+    end
+
+  end
+end

data/app/models/effective/event_registrant.rb

@@ -3,6 +3,7 @@
 module Effective
   class EventRegistrant < ActiveRecord::Base
     acts_as_purchasable
+
     log_changes(to: :event) if respond_to?(:log_changes)
 
     belongs_to :event, counter_cache: true

data/app/models/effective/event_ticket.rb

@@ -23,6 +23,7 @@ module Effective
       tax_exempt            :boolean
 
       position              :integer
+      archived              :boolean
 
       timestamps
     end
@@ -30,11 +31,14 @@ 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
 
-    validates :title, presence: true
+    validates :title, presence: true, uniqueness: { scope: [:event_id] }
     validates :regular_price, presence: true
     validates :early_bird_price, presence: true, if: -> { event&.early_bird_end_at.present? }
 
@@ -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_addons/_form.html.haml

@@ -0,0 +1,14 @@
+= effective_form_with(model: [:admin, event_addon], engine: true) do |f|
+  = f.hidden_field :event_id
+
+  - if f.object.new_record?
+    = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
+  - else
+    = f.static_field :owner
+
+  = render 'effective/event_addons/fields', f: f, event: event_addon.event
+
+  - if f.object.new_record?
+    = f.submit 'Save and Mark Paid'
+  - else
+    = f.submit 'Save'

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

@@ -0,0 +1,15 @@
+= effective_form_with(model: [:admin, event_product], engine: true) do |f|
+  = f.hidden_field :event_id
+
+  = f.text_field :title
+  = 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

@@ -1,7 +1,16 @@
 = effective_form_with(model: [:admin, event_ticket], engine: true) do |f|
   = f.hidden_field :event_id
 
-  /= f.number_field :capacity, hint: 'The number of online purchases will be loosely limited to capacity.'
-  = render 'effective/event_tickets/fields', f: f
+  = f.text_field :title
+  = 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
+
+  - 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

@@ -3,20 +3,35 @@
     = render 'admin/events/form_event', event: event
 
   - if event.persisted?
-    = tab 'Registrants' do
-      - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
-      = render_inline_datatable(datatable)
-
     = tab 'Content' do
       = 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)
 
-    = tab 'Registration' do
+    = tab 'Products' do
+      %h2 Products
+      - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
+      = render_inline_datatable(datatable)
+
+    = tab 'Registrations' do
+      %h2 Registrations
+      - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
+      .mb-4= render_inline_datatable(datatable)
+
+    = tab 'Registrants' do
+      %h2 Registrants
+      - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
+      .mb-4= 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
 
     = tab 'Access' do

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/_registrants.html.haml

@@ -1,10 +1,9 @@
-.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?
+= card do
+  .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)
+  - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
+  .mb-4= render_simple_datatable(datatable)

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/addons.html.haml

@@ -0,0 +1,17 @@
+= render 'layout' do
+  = render 'effective/event_registrations/content', resource: resource
+
+  %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.
+
+  .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

@@ -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

@@ -17,7 +17,9 @@ EffectiveEvents::Engine.routes.draw do
   namespace :admin do
     resources :events, except: [:show]
     resources :event_tickets, except: [:show]
+    resources :event_products, except: [:show]
     resources :event_registrants, 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,6 +14,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :early_bird_end_at
 
       t.integer :event_registrants_count, default: 0
+      t.integer :event_addons_count, default: 0
 
       t.integer :roles_mask
       t.boolean :authenticate_user, default: false
@@ -21,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
@@ -37,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
 
@@ -65,7 +67,42 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_registrations do |t|
+    create_table <%= @event_products_table_name %> do |t|
+      t.integer :event_id
+
+      t.string :title
+      t.integer :capacity
+
+      t.integer :price
+
+      t.string :qb_item_name
+      t.boolean :tax_exempt, default: false
+
+      t.integer :position
+      t.boolean :archived, default: false
+
+      t.timestamps
+    end
+
+    create_table <%= @event_addons_table_name %> do |t|
+      t.integer :event_id
+      t.integer :event_product_id
+
+      t.integer :owner_id
+      t.string :owner_type
+
+      t.integer :event_registration_id
+      t.string :event_registration_type
+
+      t.text :notes
+
+      t.integer :purchased_order_id
+      t.integer :price
+
+      t.timestamps
+    end
+
+    create_table <%= @event_registrations_table_name %> do |t|
       t.string :token
 
       t.integer :event_id
@@ -90,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.4'.freeze
+  VERSION = '0.1.8'.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.4
+  version: 0.1.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,25 +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_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_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_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_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_registrants/_form.html.haml
 - app/views/admin/event_tickets/_form.html.haml
 - app/views/admin/events/_form.html.haml
@@ -205,7 +214,9 @@ 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_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
@@ -213,13 +224,13 @@ files:
 - app/views/effective/event_registrations/_orders.html.haml
 - app/views/effective/event_registrations/_registrants.html.haml
 - app/views/effective/event_registrations/_summary.html.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/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_tickets/_fields.html.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_tickets/_fields.html.haml

@@ -1,4 +0,0 @@
-= f.text_field :title
-= f.price_field :regular_price
-= f.price_field :early_bird_price
-= f.check_box :tax_exempt