effective_events 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57fb08028ca5c75662cf3f9725a0c2013b7a1ecee708260e0276800d83e7d20
-  data.tar.gz: e2692018ccc4aebe701a2618db941741d3886d5a95900a3fdeee428dd76e1860
+  metadata.gz: 9aac5034e09f95d3f0352c0ad6639e01639192040efe7fb639fa8ed2e6706a33
+  data.tar.gz: 86291f38c4e28437e6e854144924c38008ece0638f7cdc74f672470c3286ce2a
 SHA512:
-  metadata.gz: 8b75f9ce8c9b062ebf278c53817e0636224ccf5f33fdcd3c6e0190f2b5136b4f166c167786c29bf03f793f131f77ba8f69d817e4cc3da262b9b6985cc96cdcf3
-  data.tar.gz: 0ef55cbbb6092b70c627c73b5490ff962021b0ef31a0b1267c0100bf1022c8823e2ba62199550e64d28d57ef4c5baa9724eab1cf12a3785b476826e7b2cd84a1
+  metadata.gz: 7606a91e5c9119a1380ea90beb7c9cc838cd1e82b2cbefa6bdc9714ed7dfacc3ee05243a186fcb67f7c48e4f7188925a1032cada4a173385f0b57e236dc9c060
+  data.tar.gz: 5a0061c1046ab5e40781d8d5e767f2ec959daf2fe3f929cdcd47c50be7f1a76849b45ddd1ab1de3f53decc82d542e38cbebd6cd2ddfed4f45804a04fd3a4d7bd

data/app/controllers/effective/event_registrations_controller.rb

@@ -1,6 +1,9 @@
 module Effective
   class EventRegistrationsController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
+
+    if defined?(Devise)
+      before_action :authenticate_user!, unless: -> { action_name == 'new' || (action_name == 'show' && params[:id] == 'start') }
+    end
 
     include Effective::WizardController
 

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -2,6 +2,8 @@ module Admin
   class EffectiveEventAddonsDatatable < Effective::Datatable
     filters do
       scope :unarchived, label: "All"
+      scope :purchased
+      scope :deferred
       scope :archived
     end
 
@@ -32,7 +34,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.purchased.includes(:purchased_order, :owner)
+      scope = Effective::EventAddon.deep.purchased_or_deferred.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -2,6 +2,8 @@ module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
     filters do
       scope :unarchived, label: "All"
+      scope :purchased
+      scope :deferred
       scope :archived
     end
 
@@ -34,7 +36,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventRegistrant.deep.purchased
+      scope = Effective::EventRegistrant.deep.purchased_or_deferred.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/models/effective/event_registrant.rb

@@ -38,7 +38,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:last_name) }
-    scope :deep, -> { all }
+    scope :deep, -> { includes(:event, :event_ticket) }
 
     validates :first_name, presence: true
     validates :last_name, presence: true

data/app/models/effective/event_ticket.rb

@@ -31,7 +31,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:position) }
-    scope :deep, -> { with_rich_text_body.includes(:purchased_event_registrants) }
+    scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
     scope :archived, -> { where(archived: true) }
     scope :unarchived, -> { where(archived: false) }

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

@@ -2,7 +2,12 @@
   = f.hidden_field :event_id
 
   - if f.object.new_record?
-    = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
+    -# User
+    - klass = (f.object.owner || current_user).class
+    - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
+    = f.hidden_field :owner_type, value: klass.name
+    = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
   - else
     = f.static_field :owner
 

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

@@ -2,7 +2,12 @@
   = f.hidden_field :event_id
 
   - if f.object.new_record?
-    = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
+    -# User
+    - klass = (f.object.owner || current_user).class
+    - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
+    = f.hidden_field :owner_type, value: klass.name
+    = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
   - else
     = f.static_field :owner
 

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

@@ -7,33 +7,25 @@
       = render '/admin/events/form_content', event: event
 
   - if event.persisted? && !event.external_registration?
-    = tab 'Tickets' do
+    = tab 'Tickets & Products' do
       %h2 Tickets
       - datatable = Admin::EffectiveEventTicketsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
-    = tab 'Products' do
       %h2 Products
       - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
-    = tab 'Email' do
-      %p Click New to add one or more emails.
-
-      - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
-      = render_datatable(datatable, inline: true, simple: true)
-
-    = tab 'Registrations' do
-      %h2 Registrations
-      - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
-      .mb-4= 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
+    = tab 'Registrants & Addons' 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)
@@ -41,7 +33,12 @@
     = tab 'Wizard' do
       = render '/admin/events/form_event_registration_content', event: event
 
-  - if event.persisted?
+    = tab 'Email' do
+      %p Click New to add one or more emails.
+
+      - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
+      = render_datatable(datatable, inline: true, simple: true)
+
     = tab 'Access' do
       = render '/admin/events/form_access', event: event
 

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

@@ -1,18 +1,37 @@
 = render 'layout' do
   = render 'effective/event_registrations/content', resource: resource
 
-  .card
-    .card-body
-      %p Welcome #{current_user}!
+  - # Signed out
+  - if resource.owner.blank?
+    .card
+      .card-body
+        %p Welcome!
 
-      %p You are registering for #{resource.event}.
+        %p You are about to register for #{resource.event}.
 
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+        %p 
+          Please 
+          = link_to 'sign in', '/users/sign_in'
+          or
+          = link_to 'sign up', '/users/sign_up'
+          to continue.
+          
+        %p= link_to 'Sign In to Continue', '/users/sign_in', class: 'btn btn-primary'
 
-        = f.hidden_field :event_id
+  - # Signed in
+  - if resource.owner.present?
+    .card
+      .card-body
+        %p Welcome #{current_user}!
 
-        = f.hidden_field :owner_type
-        = f.hidden_field :owner_id
+        %p You are registering for #{resource.event}.
 
-        = f.save 'Save and Continue'
+        = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+          = f.hidden_field :id
+
+          = f.hidden_field :event_id
+
+          = f.hidden_field :owner_type
+          = f.hidden_field :owner_id
+
+          = f.save 'Save and Continue'

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.6.9'.freeze
+  VERSION = '0.6.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails