effective_events 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f91b10984338119e096e1d4e0b783a0a17267342e0323f511fdd105374f3fbe
-  data.tar.gz: 0c5df12892710b0e5cb80fc23a4e077594bc07fb9352d0c40b5bcaa651bab20c
+  metadata.gz: a72f25c5582cd504f0c3c486d18cbf4980271f83c42a1f4fb859e0cfdbdeee05
+  data.tar.gz: 3ffa275a580807a9c15bc8b7b7f5af4700121e915dff3aa4d960347fdf0f6f64
 SHA512:
-  metadata.gz: b988cdfe2cd4d6b69ae69a58b3d8c35f4ed6be63ca1dd483d81b5337084695739bbe63757e7ebd891161e18b4edf1de3cdcd46c752f346a29ecf2ec2c20a658a
-  data.tar.gz: c33c40aae8312259f32cf5eab48f7b1acca56e78026b445813e48747cc77829d3dda213706901efd60e0db8f55033ae0b7e0b66588020e4bc505836f64893976
+  metadata.gz: ac9451988420547d6fe212bce3d5134592da7e3fcdcf743e1a39df985a3f0e1011c15d5e3218cdcb7fd71ccd21eb4f2da5c1419cde8b40970223e99bd55c957c
+  data.tar.gz: c01e5b8b9772649b9de54acc04313d243845297aa11055619b6c27890fef430be91ac15740b601006701a94c760484cea975d8607716c78db2245d3e0e9b7f5d

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -22,6 +22,10 @@ module Admin
 
       col :purchased_order
       col :owner
+
+      col :first_name
+      col :last_name
+      col :email
       col :notes, label: 'Notes'
 
       actions_col

data/app/datatables/effective_event_addons_datatable.rb

@@ -3,7 +3,11 @@
 class EffectiveEventAddonsDatatable < Effective::Datatable
   datatable do
 
-    col :event_product, search: :string, label: 'Product' do |er|
+    col :name do |er|
+      "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
+    end
+
+    col :event_product, search: :string, label: 'Add-on' do |er|
       [
         er.event_product.to_s,
         (content_tag(:span, 'Archived', class: 'badge badge-warning') if er.event_product&.archived?)
@@ -12,9 +16,12 @@ class EffectiveEventAddonsDatatable < Effective::Datatable
 
     col :price, as: :price
 
+    col :first_name, visible: false
+    col :last_name, visible: false
+    col :email, visible: false
+
     col :archived, visible: false
 
-    # col :notes
     # no actions_col
   end
 

data/app/datatables/effective_event_registrants_datatable.rb

@@ -3,6 +3,10 @@
 class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
 
+    col :name do |er|
+      "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
+    end
+
     col :event_ticket, search: :string, label: 'Ticket' do |er|
       [
         er.event_ticket.to_s,
@@ -10,19 +14,16 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
       ].compact.join('<br>').html_safe
     end
 
-    col :name do |er|
-      "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
-    end
-
     col :first_name, visible: false
     col :last_name, visible: false
     col :email, visible: false
     col :company, visible: false
     col :number, visible: false, label: 'Designations'
 
-    col :price, as: :price
     col :notes
 
+    col :price, as: :price
+
     col :archived, visible: false
 
     # no actions_col

data/app/datatables/effective_event_registrations_datatable.rb

@@ -11,7 +11,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
     end
 
     col :event, search: :string do |er|
-      er.event.to_s
+      link_to(er.event.to_s, effective_events.event_path(er.event))
     end
 
     col :owner, visible: false, search: :string
@@ -26,6 +26,13 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
         dropdown_link_to('Delete', effective_events.event_event_registration_path(er.event, er), 'data-confirm': "Really delete #{er}?", 'data-method': :delete)
       else
         dropdown_link_to('Show', effective_events.event_event_registration_path(er.event, er))
+
+        # Register Again
+        if er.event.registerable?
+          url = er.event.external_registration_url.presence || effective_events.new_event_event_registration_path(er.event)
+          dropdown_link_to('Register Again', url)
+        end
+
       end
     end
   end

data/app/models/concerns/effective_events_event_registration.rb

@@ -142,25 +142,43 @@ module EffectiveEventsEventRegistration
   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)
+  def event_addon(event_product:, first_name:, last_name:, email:)
+    addon = event_addons.find { |er| er.event_product == event_product && er.first_name == first_name && er.last_name == last_name && er.email == email }
+    addon || event_addons.build(event: event, event_product: event_product, owner: owner, first_name: first_name, last_name: last_name, email: email)
   end
 
   # This builds the default event registrants used by the wizard form
   def build_event_registrants
     if event_registrants.blank?
       raise('expected owner and event to be present') unless owner && event
+
       event_registrants.build(
         first_name: owner.try(:first_name),
         last_name: owner.try(:last_name),
-        email: owner.try(:email)
+        email: owner.try(:email),
+        company: owner.try(:company),
+        number: owner.try(:membership).try(:number) || owner.try(:number)
       )
     end
 
     event_registrants
   end
 
+  # This builds the default event addons used by the wizard form
+  def build_event_addons
+    if event_addons.blank?
+      raise('expected owner and event to be present') unless owner && event
+
+      event_addons.build(
+        first_name: owner.try(:first_name),
+        last_name: owner.try(:last_name),
+        email: owner.try(:email)
+      )
+    end
+
+    event_addons
+  end
+
   private
 
   def present_event_registrants

data/app/models/effective/event_addon.rb

@@ -22,6 +22,10 @@ module Effective
     belongs_to :event_registration, polymorphic: true, optional: true
 
     effective_resource do
+      first_name        :string
+      last_name         :string
+      email             :string
+
       notes             :text
 
       archived          :boolean
@@ -46,8 +50,25 @@ module Effective
       self.price ||= event_product.price
     end
 
+    validates :first_name, presence: true
+    validates :last_name, presence: true
+    validates :email, email: true
+
     def to_s
-      persisted? ? event_product.to_s : 'product'
+      persisted? ? title : 'addon'
+    end
+
+    def title
+      return event_product.to_s unless first_name.present? && last_name.present?
+      "#{event_product} - #{last_first_name}"
+    end
+
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def last_first_name
+      "#{last_name}, #{first_name}"
     end
 
     def tax_exempt

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

@@ -3,6 +3,13 @@
     - 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.select :event_product_id, effective_events_event_products_collection(event), label: 'Add-on'
+
+    .row
+      .col-lg= f.text_field :first_name
+      .col-lg= f.text_field :last_name
+
+    .row
+      .col-lg= f.email_field :email
 
     -# = f.text_area :notes, label: 'Notes'

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

@@ -11,7 +11,7 @@
     .row
       .col-lg= f.text_field :first_name
       .col-lg= f.text_field :last_name
-      .col-lg= f.text_field :number, label: 'Professional Designations', hint: 'Include member or registrant number, if applicable.'
+      .col-lg= f.text_field :number, label: 'Professional Designations', hint: 'member or registrant number'
 
     .row
       .col-lg= f.email_field :email

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

@@ -13,7 +13,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.has_many :event_addons do |fp|
+        = f.has_many :event_addons, f.object.build_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/submitted.html.haml

@@ -7,7 +7,8 @@
   .alert.alert-warning.mb-4
     Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+  .mb-4
+    = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = render 'effective/event_registrations/summary', event_registration: resource
   = render 'effective/event_registrations/event_registration', event_registration: resource

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

@@ -1,6 +1,8 @@
-.card{class: "effective-events-#{event.category.parameterize}"}
+.card.mb-4{class: "effective-events-#{event.category.to_s.parameterize}"}
   .card-body
-    = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-event mb-2 effective-events-#{event.category.parameterize}")
+    - if event.category.present?
+      = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-event mb-2 effective-events-#{event.category.parameterize}")
+
     %h2.mt-1= link_to event.title, effective_events.event_path(event)
     .effective-events-schedule= effective_events_event_schedule(event)
     .effective-events-excerpt= event.excerpt.to_s

data/config/effective_events.rb

@@ -11,7 +11,7 @@ EffectiveEvents.setup do |config|
   # config.layout = { application: 'application', admin: 'admin' }
 
   # Event Settings
-  # config.event_registrations_class_name = 'Effective::EventRegistration'
+  # config.event_registration_class_name = 'Effective::EventRegistration'
 
   # Pagination length on the Events#index page
   config.per_page = 10

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

@@ -102,6 +102,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :event_registration_id
       t.string :event_registration_type
 
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+
       t.text :notes
 
       t.integer :purchased_order_id

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails