effective_events 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe22059403401435f15bb3de7a04e64d5f6d66d67b5fa538e552f743bc80657
-  data.tar.gz: 9dde412444e3898074f38c5b4c8cb845bb7b22afce81b2af11d46ec9fe9f22db
+  metadata.gz: 6e0eded3c712c018bb91f9c90eebe522030fa7d02d5d73b9de4001bda7c5dbcf
+  data.tar.gz: 3dc20c280ef92ebc93dad4cfe57df506e6a283bd4433a4792f07a236b3fb5ebc
 SHA512:
-  metadata.gz: 8a9b73d87d24d66c537427daf7a5f23d4be354eaaf24f34f35646bebd5527727d6236e2a7d8cd8728c9e00d96a061783ba7d772c5c4ab97662ab7bc8a96afdd2
-  data.tar.gz: 6f84878e674939ad1843be2a35ee6d4946a1dc1a4a2dd05a6c477a9453d1ac04ada9903fe31e5c65e7c60cfd1d447f30c1ad3c4f5c0b2bc6ccd83b55c19c01e4
+  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/models/concerns/effective_events_event_registration.rb

@@ -77,7 +77,13 @@ module EffectiveEventsEventRegistration
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, :event_registrants, :event_addons, event: [:event_products, :event_tickets]) }
+    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/views/effective/event_registrations/_dashboard.html.haml

@@ -1,5 +1,5 @@
 -# 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)
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.10.1'.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.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails