effective_events 3.2.6 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dd9d2e095415c1c44eeee3cda056411251c6f6e977a7d5f54443b44347fa21d
-  data.tar.gz: 2a9d544a0b69ead3a42483b7eada7807f863d011e45c4b677fadb2d4c985275b
+  metadata.gz: 46913e76651e2102a3b21c683ecb52055affc0c86e008155cda5ee8529cb7580
+  data.tar.gz: 343225b74a55187d7020f0079b00a34465440faa5f297eae48f3af8f30830e1f
 SHA512:
-  metadata.gz: 6ffb6b9f7cca907c767eff88b2bccbdcd0cfd14961b482cc97e61d44f39bbf12bd059d11e35a0c0d2e9a9a3989df9c7017881a98ddbfe86dac5f9488098eb9a9
-  data.tar.gz: 26758d8de02ad9e4a68f870e12ae5303cbf1f780795e535b6c06676a253135209f6483e7f38c2bb9343ef391a2a5679921ddd1182bb59774b80cd799ff98865f
+  metadata.gz: 2b306aabce0f0b8c3860930bacc6e9ffd0bdc0cd3f8760e6f530ab2b44dae25f90989c30e82aa371e13165d17d519dbaf9fbc272ea39c633fd479fa2665cc022
+  data.tar.gz: 7e47158527a7e61ef293ee31d8a90530efa79d76ed7ffef92a9990bcc5560f8cfed0db604914304ca0f58c5e6c1c2c659033c44d595355cc61edb9cf25b0751c

data/app/models/concerns/effective_events_event_registration.rb

@@ -411,7 +411,7 @@ module EffectiveEventsEventRegistration
         existing = event_registrants.find { |er| er.persisted? && er.waitlisted_not_promoted? }
         capacity = event.capacity_available(event_ticket: event_ticket, event_registration: self)
 
-        event_registrants.each_with_index { |er, index| er.assign_attributes(waitlisted: (existing || index >= capacity)) }
+        event_registrants.reject(&:registered?).each_with_index { |er, index| er.assign_attributes(waitlisted: (existing || index >= capacity)) }
       else
         event_registrants.each { |er| er.assign_attributes(waitlisted: false) }
       end

data/app/models/effective/event_registrant.rb

@@ -256,6 +256,7 @@ module Effective
     def member?
       return false if event.blank?
       return false if event_ticket.blank?
+      return false if (user.try(:membership_disabled?) || organization.try(:membership_disabled?))
 
       user.try(:membership_present?) || organization.try(:membership_present?)
     end
@@ -265,6 +266,7 @@ module Effective
       return false if event.blank?
       return false if event_ticket.blank?
       return false unless event_ticket.guest_of_member?
+      return false if !member? && owner.try(:membership_disabled?)
 
       !member? && owner.try(:membership_present?)
     end
@@ -508,9 +510,9 @@ module Effective
 
       if early_bird?
         event_ticket.early_bird_price
-      elsif blank_registrant? && owner.try(:membership_present?)
+      elsif blank_registrant? && owner.try(:membership_present?) && !owner.try(:membership_disabled?)
         event_ticket.blank_registrant_member_price
-      elsif blank_registrant? && !owner.try(:membership_present?)
+      elsif blank_registrant?
         event_ticket.blank_registrant_non_member_price
       elsif member?
         event_ticket.member_price

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

@@ -1,2 +1,7 @@
 - if resource.submitted? && resource.event&.delayed_payment_date_upcoming?
   .alert.alert-warning.mb-4 Please note: you must submit each step and checkout for your ticket changes to be saved. You will receive a new confirmation email.
+
+- if resource.display_countdown?
+  .alert.alert-warning.mb-4
+    Your tickets are reserved until #{resource.selected_expires_at.strftime("%l:%M%P %Z")}.
+    If you have not checked out by this time, your tickets will be released.

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

@@ -1,11 +1,3 @@
 .row
-  .col-lg-3.mb-3
-    = render_wizard_sidebar(resource)
-
-    - if resource.display_countdown?
-      .mt-4
-    
-      .alert.alert-warning
-        Your tickets are reserved until #{resource.selected_expires_at.strftime("%l:%M%P %Z")}
-
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
   .col-lg-9.mb-3= yield

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

@@ -5,7 +5,7 @@
 
 - all_members_tickets = tickets.all? { |ticket| ticket.members? }
 - any_members_tickets = tickets.any? { |ticket| ticket.members? }
-- is_member = current_user.try(:membership_present?)
+- is_member = (current_user.try(:membership_present?) || current_user.is_any?(:member)) && !current_user.try(:membership_disabled?)
 
 - if event.early_bird?
   .alert.alert-warning.mb-3
@@ -42,7 +42,7 @@
                 = price_to_currency(ticket.member_price)
                 .badge.badge-secondary Member
 
-              - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
+              - if ticket.guest_of_member? && is_member
                 %li
                   = price_to_currency(ticket.guest_of_member_price)
                   .badge.badge-secondary Guest of Member
@@ -58,7 +58,7 @@
                   = price_to_currency(ticket.member_price)
                   .badge.badge-secondary Member
 
-                - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
+                - if ticket.guest_of_member? && is_member
                   %li
                     = price_to_currency(ticket.guest_of_member_price)
                     .badge.badge-secondary Guest of Member

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.2.6'.freeze
+  VERSION = '3.2.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails