effective_events 0.20.5 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b8633a6d61dfd2916934dff65ecbfe5df1ced40cfcff2ee4b49f2138ae2b30
-  data.tar.gz: 8b843be43da82c2e4127e3a77ecb4fb2eb4f4f503743749e817375db9d3420e2
+  metadata.gz: 920f3a46308fd2041e22efd8b92605424f83308d8cab8d825ea382196d7307b5
+  data.tar.gz: bd039692d81798c984c5e2d89ecc5bb4ce3f2c98c9e3cd8a94ac36b2da97fa9e
 SHA512:
-  metadata.gz: 3c65f032ed10d4164d1e774af03b9b491a50ea8b7016dc8337c9ccb8d76edb556f3483a6c15766f8a8492f05a3b072a96db56f7b857ac102d9adcb3d30467c24
-  data.tar.gz: 7ad25cf506e1ea2867cbc47fdadecb0370d3cd7598c0424d34cb04d83ddc3f0a0acd0103fa9945341a0dc83eb2ec129113068a79e5dfb4a10387a6b33a76c7f8
+  metadata.gz: 35104d5d711d51a01d30e2c17731f6f6dbcf80e4c49a4a36c7d2e2adf86e88d35329a78284cebf3d8a70c95849e1c39ea3fc1461271c0e4ca5e54a835bb8ea4a
+  data.tar.gz: d99668168b29c7159aaf5fd120fb0426b05617a97e917d4fe64b1950179c100ba16818d737c126e27d6b0a59b17bca22f95eb40b383c9c21ca93fb3e3636dcf6

data/app/controllers/effective/event_registrations_controller.rb

@@ -23,7 +23,7 @@ module Effective
       return if resource.event.registerable? && !resource.event.sold_out?(except: resource)
 
       flash[:danger] = "Your selected event is no longer available for registration. This event registration is no longer available."
-      return redirect_to('/dashboard')
+      return redirect_to(view_context.return_to_dashboard_path)
     end
 
     def expire_ticket_selection_window

data/app/helpers/effective_events_helper.rb

@@ -45,7 +45,7 @@ module EffectiveEventsHelper
 
     # Allow an admin to assign archived tickets
     authorized = (namespace == :admin)
-    member = current_user.try(:is_any?, :member)
+    member = current_user.try(:membership_present?)
 
     tickets = (authorized ? event.event_tickets : event.event_tickets.reject(&:archived?))
     tickets = tickets.reject { |ticket| ticket.member_only? } unless (authorized || member)

data/app/models/effective/event_registrant.rb

@@ -204,7 +204,7 @@ module Effective
     end
 
     def member_present?
-      user.try(:is?, :member) || organization.try(:is?, :member)
+      user.try(:membership_present?) || organization.try(:membership_present?)
     end
 
     def member_ticket?

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

@@ -10,7 +10,7 @@
   - if f.object.new_record?
     -# 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?
+    - ajax_url = (effective_resources.users_effective_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'

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

@@ -9,7 +9,7 @@
   - if f.object.new_record?
     -# User
     - klass = (f.object.owner || current_user).class
-    - ajax_url = (effective_resources.users_admin_select2_ajax_index_path unless Rails.env.test?)
+    - ajax_url = (effective_resources.users_effective_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: 'Registration User'

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

@@ -1,6 +1,6 @@
 .event-registrant-user-fields
   - user_klass = (f.object.user || current_user).class
-  - ajax_url = (effective_events.users_event_registrants_select2_ajax_index_path unless Rails.env.test?)
+  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
   - disabled = (f.object.user.present? && f.object.user.persisted? && f.object.user.errors.blank?)
   - event_ticket = f.object.event_ticket
 

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

@@ -5,7 +5,7 @@
 
 - all_member_only_tickets = tickets.all? { |ticket| ticket.member_only? }
 - any_member_only_tickets = tickets.any? { |ticket| ticket.member_only? }
-- is_member = current_user.try(:is?, :member) 
+- is_member = current_user.try(:membership_present?)
 
 - if event.early_bird?
   .alert.alert-warning.mb-3

data/config/routes.rb

@@ -24,11 +24,6 @@ EffectiveEvents::Engine.routes.draw do
         put :update_blank_registrants, on: :member
       end
     end
-
-    resources :event_registrants_select2_ajax, only: [] do
-      get :users, on: :collection
-      get :organizations, on: :collection
-    end
   end
 
   namespace :admin do

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.5'.freeze
+  VERSION = '0.21.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.21.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,7 +229,6 @@ files:
 - app/controllers/admin/event_registrations_controller.rb
 - app/controllers/admin/event_tickets_controller.rb
 - app/controllers/admin/events_controller.rb
-- app/controllers/effective/event_registrants_select2_ajax_controller.rb
 - app/controllers/effective/event_registrations_controller.rb
 - app/controllers/effective/events_controller.rb
 - app/datatables/admin/effective_event_addons_datatable.rb

data/app/controllers/effective/event_registrants_select2_ajax_controller.rb

@@ -1,61 +0,0 @@
-module Effective
-  class EventRegistrantsSelect2AjaxController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-
-    include Effective::Select2AjaxController
-
-    def users
-      authorize! :users, Effective::EventRegistrant
-
-      with_organizations = current_user.class.try(:effective_memberships_organization_user?)
-
-      collection = current_user.class.all
-      collection = collection.includes(:organizations) if with_organizations
-
-      respond_with_select2_ajax(collection, skip_authorize: true) do |user|
-        data = { first_name: user.first_name, last_name: user.last_name, email: user.email }
-
-        if with_organizations
-          data[:company] = user.organizations.first.try(:to_s)
-          data[:organization_id] = user.organizations.first.try(:id)
-          data[:organization_type] = user.organizations.first.try(:class).try(:name)
-        end
-
-        { 
-          id: user.to_param, 
-          text: to_select2(user, with_organizations),
-          data: data
-        }
-      end
-    end
-
-    def organizations
-      raise('expected EffectiveEvents.organization_enabled?') unless EffectiveEvents.organization_enabled?
-
-      klass = EffectiveMemberships.Organization
-      raise('an EffectiveMemberships.Organization is required') unless klass.try(:effective_memberships_organization?)
-
-      collection = klass.all
-
-      # Authorize
-      EffectiveResources.authorize!(self, :member_organizations, collection.klass)
-
-      respond_with_select2_ajax(collection, skip_authorize: true) do |organization|
-        { id: organization.to_param, text: organization.to_s }
-      end
-    end
-
-    private
-
-    def to_select2(resource, with_organizations)
-      organizations = Array(resource.try(:organizations)).join(', ') if with_organizations
-
-      [
-        "<span>#{resource}</span>",
-        "<small>&lt;#{resource.try(:public_email).presence || resource.email}&gt;</small>",
-        ("<small>#{organizations}</small>" if organizations.present?)
-      ].compact.join(' ')
-    end
-
-  end
-end