effective_events 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d470360f476ba5b09c2f4acd803fa110b24f2897d93786f7590c57fa6cdb7456
-  data.tar.gz: cd7f329fa1a2eb7408eadff743089caa9bb35dd0bd9a2d133df826dd7632354c
+  metadata.gz: 6e0eded3c712c018bb91f9c90eebe522030fa7d02d5d73b9de4001bda7c5dbcf
+  data.tar.gz: 3dc20c280ef92ebc93dad4cfe57df506e6a283bd4433a4792f07a236b3fb5ebc
 SHA512:
-  metadata.gz: 0c75dc24831325d021992b156f74efaea4f19d296080d3d9468745c80a099c4cacdc8a1dab03d938b68c917533f455930ce9f70b65d53a16dbb0e0e324decdbf
-  data.tar.gz: f57f397116d450ff4646e908843a1f3c155a94563eafe3a7c7956b662abb42c1a761c5cb545584fd1440527796c282990a4693825029337b8c0ac15c82527778
+  metadata.gz: 43fcaa469c42cf91dcb5ac3f6c52509372a4d8983c91cac727d350f4c9a3a797f04d4cd1f4ee6793502a5eb868dbc1c660e51862b3a0ad299f1ad416a69c7220
+  data.tar.gz: e7fe84b88841792c065bd307a80656ab4248b60306c2cfecaeb007ba09aa3b2bc782ee13512a91640e02c5b39156bb923bcd6683e889d51b36f99b2bd349bc67

data/app/controllers/effective/event_registrations_controller.rb

@@ -1,12 +1,13 @@
 module Effective
   class EventRegistrationsController < ApplicationController
-
     if defined?(Devise)
       before_action :authenticate_user!, unless: -> { action_name == 'new' || (action_name == 'show' && params[:id] == 'start') }
     end
 
     include Effective::WizardController
 
+    before_action :redirect_unless_registerable, only: [:new, :show]
+
     resource_scope -> {
       event = Effective::Event.find(params[:event_id])
       EffectiveEvents.EventRegistration.deep.where(owner: current_user, event: event)
@@ -26,5 +27,16 @@ module Effective
       resource.ready!
     end
 
+    # If the event is no longer registerable, do not let them continue
+    def redirect_unless_registerable
+      return if resource.blank?
+      return if resource.event.blank?
+      return if resource.event.registerable?
+      return if resource.submitted?
+
+      flash[:danger] = "Your selected event is no longer available for registration. This event registration is no longer available."
+      return redirect_to('/dashboard')
+    end
+
   end
 end

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -37,7 +37,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventRegistrant.deep.purchased_or_deferred.includes(:purchased_order, :owner)
+      scope = Effective::EventRegistrant.deep.purchased_or_deferred
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/models/concerns/effective_events_event_registration.rb

@@ -77,7 +77,13 @@ module EffectiveEventsEventRegistration
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, :event, :event_registrants) }
+    scope :deep, -> { 
+      includes(:owner)
+      .includes(event: [:rich_texts, event_products: :purchased_event_addons, event_tickets: :purchased_event_registrants])
+      .includes(event_registrants: [event_ticket: :purchased_event_registrants])
+      .includes(event_addons: [event_product: :purchased_event_addons])
+    }
+
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:submitted]) }

data/app/models/effective/event.rb

@@ -6,7 +6,6 @@ module Effective
 
     if defined?(PgSearch)
       include PgSearch::Model
-
       multisearchable against: [:body]
     end
 
@@ -43,7 +42,6 @@ module Effective
     acts_as_tagged if respond_to?(:acts_as_tagged)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
-
     effective_resource do
       title                  :string
 
@@ -72,7 +70,12 @@ module Effective
     end
 
     scope :sorted, -> { order(start_at: :desc) }
-    scope :deep, -> { includes(:event_registrants, :event_tickets) }
+
+    scope :deep, -> { 
+      base = includes(:event_registrants, :event_tickets, :rich_texts) 
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
 
     scope :published, -> { where(draft: false).where(arel_table[:published_at].lt(Time.zone.now)) }
     scope :unpublished, -> { where(draft: true).where(arel_table[:published_at].gteq(Time.zone.now)) }

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

@@ -45,6 +45,7 @@
     = tab 'Access' do
       = render '/admin/events/form_access', event: event
 
-    - if event.respond_to?(:log_changes_datatable)
+  - if event.persisted?
+    - if event.respond_to?(:logs_datatable)
       = tab "Logs" do
-        = render_inline_datatable(event.log_changes_datatable)
+        = render_inline_datatable(event.logs_datatable)

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

@@ -1,4 +1,4 @@
-= effective_form_with(model: event, url: event.persisted? ? effective_events.admin_event_path(event.id) : effective_events.admin_events_path) do |f|
+= effective_form_with(model: [:admin, event], engine: true) do |f|
   = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this event', hint: 'Sign up is required to register for any event'
 
   - if EffectiveEvents.use_effective_roles

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

@@ -1,5 +1,6 @@
 -# In progress registration
-- registration = EffectiveEvents.EventRegistration.in_progress.for(current_user).first
+- registration = EffectiveEvents.EventRegistration.in_progress.includes(event: :event_products).for(current_user).first
+
 - datatable = EffectiveResources.best('EffectiveEventRegistrationsDatatable').new(self, namespace: :effective)
 
 - if registration.present?

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.2'.freeze
 end

metadata

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