effective_events 2.29.0 → 2.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd4cccf384770e4b061ff775b4b897c374ea9682dc3da142bf96b5d3660e0b6
-  data.tar.gz: b14016ffa7febad385aa03e53ef3d2b66cc04a3acaf1cd7c08922f69c0cbe906
+  metadata.gz: 1c5cab2a4f52670bdb757aadfb5e3d0d8c2c2fcc5ace2a4767d0493c89c245b3
+  data.tar.gz: eb553379563b38a9d25a90169a443ad100c29f2ded09331763c0472ed3596e90
 SHA512:
-  metadata.gz: 98f1052081b05189b102c2d971f5e5b620a448980ba1725178aad152ed73619490f9249d648939717642609faad2f6418a9b45d1f75ed1cbd3ee6f323a54cd73
-  data.tar.gz: eaedb7ff8cfef0be586b3dd26f0da550201b5f65a1f5742ba0c4df8a5cc59137e15bb8e40b9d90b76c62fa7761b6a40cbfa8b0e8510620341f77a78de86e26f4
+  metadata.gz: 17da816f22e61e8a3d3235aeab9e737c60b6ab94c6616a9ad394da62996e4aff9d17e69409fdebc3da719b0514156e3cb19941838d6a612a61878fa47908f5c6
+  data.tar.gz: 0b5191245dd117b9a5b1a5f9fb1350d839f6a56053116fbfbe098315fcf6dd40a82be974f9c8be2a56912b40bd33f9f59ae1cddd410fd623ce173843afb0343d

data/app/controllers/effective/event_registrations_controller.rb

@@ -22,7 +22,7 @@ module Effective
       return if resource.submit_order&.deferred?
       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."
+      flash[:danger] = "Your selected event is not available for registration. This event registration not available."
       return redirect_to(view_context.return_to_dashboard_path)
     end
 

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -2,6 +2,7 @@ module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
     filters do
       scope :registered
+      scope :not_registered
       scope :purchased_or_created_by_admin, label: 'Purchased'
       scope :deferred
       scope :not_purchased_not_created_by_admin, label: 'Not Purchased'
@@ -21,9 +22,15 @@ module Admin
 
       col :event
 
-      col :owner
+      col :owner, visible: false
       col :event_registration, visible: false
 
+      if defined?(EffectiveMemberships) && EffectiveMemberships.Organization.respond_to?(:sponsors)
+        col :sponsorship, search: EffectiveMemberships.Organization::SPONSORSHIPS do |er|
+          (er.owner || er.user).try(:sponsorship)
+        end
+      end
+
       if attributes[:event_id]
         col :event_ticket, search: Effective::EventTicket.where(event: event).all
       else

data/app/models/effective/event.rb

@@ -139,9 +139,6 @@ module Effective
     validates :end_at, presence: true
     validates :external_registration_url, url: true
 
-    validates :registration_start_at, presence: true, unless: -> { external_registration? }
-    validates :registration_end_at, presence: true, unless: -> { external_registration? }
-
     validates :delayed_payment, inclusion: { in: [false], message: "cannot be used for external registration events" }, if: -> { external_registration? }
     validates :delayed_payment_date, presence: true, if: -> { delayed_payment? }
     validates :delayed_payment_date, absence: true, unless: -> { delayed_payment? }
@@ -194,10 +191,15 @@ module Effective
     # No longer includes sold_out? we check that separately
     def registerable?
       return false unless published?
-      return false if closed?
+      return false unless registration_available?
       (external_registration? && external_registration_url.present?) || event_tickets.present?
     end
 
+    def registration_available?
+      return false if registration_start_at.blank? || registration_end_at.blank?
+      (registration_start_at..registration_end_at).cover?(Time.zone.now)
+    end
+
     def closed?
       return false if registration_end_at.blank?
       registration_end_at < Time.zone.now

data/app/models/effective/event_addon.rb

@@ -44,7 +44,7 @@ module Effective
 
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:event, :event_product) }
-    scope :registered, -> { purchased_or_deferred.or(where(created_by_admin: true)) }
+    scope :registered, -> { unarchived.purchased_or_deferred.or(where(created_by_admin: true)) }
     scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
     scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 

data/app/models/effective/event_registrant.rb

@@ -72,6 +72,7 @@ module Effective
     scope :sorted, -> { order(:event_ticket_id, :id) }
     scope :deep, -> { includes(:event, :event_ticket, :owner) }
     scope :registered, -> { unarchived.where.not(registered_at: nil) }
+    scope :not_registered, -> { archived.or(where(registered_at: nil)) }
     scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
     scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 

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

@@ -2,10 +2,10 @@
   .effective-event
     .row
       - if EffectiveEvents.categories.length > 1
-        .col-lg-3
+        .col-lg-3.order-2.order-lg-1
           = render('effective/events/sidebar')
 
-      .col
+      .col.order-1.order-lg-2
         %h1.effective-event-title.mb-4= @page_title
 
         - if @event.sold_out?

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.29.0'.freeze
+  VERSION = '2.29.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.29.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails