effective_events 3.2.5 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d475cd1a16f38eed2a72935a248ebc01ceccfec154b0263ed16f198f29ce644f
-  data.tar.gz: c2dea87b4e98cbe3fba60d4af4eefb59636f75f00782032a3310ca3513c158ee
+  metadata.gz: c91b434d747f10bcbec7340c8bfbee4e755e3a72896c44a0fde8304e46c9ff39
+  data.tar.gz: 562fbb1b148b2c31e308ca0db490a478d7b1b86fc14e680d0c497d3e2455daf0
 SHA512:
-  metadata.gz: 8ca0edd8fbd5e9abd4bb1e9e4c7ca061babe2810b9ac8d03e524e4fadf44b3307a728297e60d9e83fcdd08848a8b97be2611fa756788347bf9658f8366a9b7f1
-  data.tar.gz: 7199be6de1ceff1e3e4a4a6125330180dc48cd5e0400e23a97a3169e68cd4b867e4350e47d959f992db5a2f47585629d0fe2b3e929f7fa28d43c9191f88cff04
+  metadata.gz: cb2290e526506a0e3343ed09d6a925cc53197fcae387fe0506421ca34561c7519a755b47fac08f0c2af81491ac3d7e05e7ddfa3b3ac73a19c357f9e010c37996
+  data.tar.gz: 98f0d6df5d153deed1bb5e713f47b8ea00dbc9a586eef2e064ebda8279f5c8b86d7fe11322de490ae1de7c9d296555e1979f9666bbf8632b40ff3b4e43b38a86

data/app/helpers/effective_events_helper.rb

@@ -86,7 +86,7 @@ module EffectiveEventsHelper
 
       price = effective_events_ticket_prices(event, ticket)
 
-      label = [title, price].compact.join(' - ')
+      label = [title, price].compact.join(' - ').html_safe
 
       disabled = { disabled: :disabled } unless (authorized || ticket.waitlist? || event.event_ticket_available?(ticket, quantity: 1))
 

data/app/models/effective/event_registrant.rb

@@ -116,6 +116,10 @@ module Effective
       assign_price()
     end
 
+    before_validation(if: -> { event_ticket_id_changed? && event_ticket_id_was.present? && event_ticket_id.present? }) do
+      assign_attributes(waitlisted: false, promoted: false) unless event_ticket.waitlist?
+    end
+
     validate(if: -> { event_ticket.present? }, unless: -> { purchased? }) do
       errors.add(:waitlisted, 'is not permitted for a non-waitlist event ticket') if waitlisted? && !event_ticket.waitlist?
     end
@@ -252,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
@@ -261,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
@@ -504,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/_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.5'.freeze
+  VERSION = '3.2.7'.freeze
 end

metadata

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